This reverts commit 654dba0838.
That commit wasn't the cleanest way to make the HTML valid. Actually
the HTML will never be valid because of the div hack.. I guess we just
live with it till Hugo/Blackfriday adds support for wrapping Markdown
elements in div tags.
Fixes https://github.com/kaushalmodi/ox-hugo/issues/141
Regular page weight setting is same as before:
Manual:
#+hugo_weight: 100
Auto:
#+hugo_weight: auto
Taxonomy weight setting:
Manual:
#+hugo_weight: :tags 100 :categories 100 :series 100
Auto:
#+hugo_weight: :tags auto :categories auto :series auto
Regular page weight and Taxonomy weights together:
#+hugo_weight: 50 :tags 100 :categories 100 :series 100
or if *not* specifying the page weight in the very beginning, use the
:page keyword:
#+hugo_weight: :tags 100 :categories 100 :page 50 :series 100
The syntax for specifying nested map values custom front-matter is:
Using property drawer (in subtrees):
:EXPORT_HUGO_CUSTOM_FRONT_MATTER: :PARENT_KEY{} '((KEY1 . VAL1) (KEY2 . VAL2) (KEY3 . VAL3) ..)
Using keyword:
#+hugo_custom_front_matter: :PARENT_KEY{} '((KEY1 . VAL1) (KEY2 . VAL2) (KEY3 . VAL3) ..)
The "{}" at the end of the key name is what tells ox-hugo that this is
a nested map.
Only 1 level of nested keys is supported.
Fixes https://github.com/kaushalmodi/ox-hugo/issues/139.
This fixes the earlier generated invalid HTML.
---
Details:
Earlier, a figure with #+name:
#+name: fig__unicorn
[[/images/org-mode-unicorn-logo.png][file:/images/org-mode-unicorn-logo.png]]
would export as:
<a id="org55ede7e"></a>
{{< figure src="/images/org-mode-unicorn-logo.png" link="/images/org-mode-unicorn-logo.png" >}}
In HTML, that would look like:
<p><a id="org55ede7e"></a>
<figure>
<a href="http://localhost:5555/images/org-mode-unicorn-logo.png">
<img src="http://localhost:5555/images/org-mode-unicorn-logo.png" />
</a>
</figure>
</p>
This resulted in invalid HTML as per the HTML5 validator.. because
figure is a block level element, and it cannot be put inside the p
tag.
The fix was to insert a blank line after the a tag so that it would be
in its own <p> element, and the following figure element would live
outside that.
With the fix in this commit,
#+name: fig__unicorn
[[/images/org-mode-unicorn-logo.png][file:/images/org-mode-unicorn-logo.png]]
now exports as:
<a id="org55ede7e"></a>
{{< figure src="/images/org-mode-unicorn-logo.png" link="/images/org-mode-unicorn-logo.png" >}}
In HTML, that now looks like:
<p><a id="org55ede7e"></a></p>
<figure>
<a href="http://localhost:5555/images/org-mode-unicorn-logo.png">
<img src="http://localhost:5555/images/org-mode-unicorn-logo.png" />
</a>
</figure>
.. which now is valid HTML.
If an attachment path contains "/static/", that attachment is copied
to the site's static/ dir *even in page bundles*.
This allows one to have links to files in the static/ dir as well as
within the bundle dir, in the case of page bundles.
Use plist-put and plist-get instead of passing the description value
via a global variable.
To my surprise, the plist-put and plist-get works across functions!
Add new attribute #+ATTR_SHORTCODE: to specify positional arguments
for the shortcode following ":args".
Example:
#+attr_shortcode: warning
#+begin_alert
This is a warning!
#+end_alert
Above exports as (given HUGO_PAIRED_SHORTCODES is set as "%alert"):
{{% alert warning %}}
This is a warning!
{{% /alert %}}
https://github.com/kaushalmodi/ox-hugo/issues/119
---
This commit is a refinement over
74cb3c2ec8:
- It gets rid of the requirement to use ":args" for positional
arguments.
- Removes unnecessary duplicate syntax (use of :class with
attr_html). If someone wants to have the Org document compatible
with more exporters they should simply *not* use
HUGO_PAIRED_SHORTCODE, and instead rely on the default Special
Blocks behavior (wrapping the text with div or HTML5 tags).
Add new attribute #+ATTR_SHORTCODE: to specify positional arguments
for the shortcode following ":args".
Example:
#+attr_shortcode: :args warning
#+begin_alert
This is a warning!
#+end_alert
Above exports as (given HUGO_PAIRED_SHORTCODES is set as "%alert"):
{{% alert warning %}}
This is a warning!
{{% /alert %}}
For re-usability of Org document with ox-html, below will also result
in the exact same ox-hugo export:
#+attr_html: :class warning
#+begin_alert
This is a warning!
#+end_alert
Simply: #+attr_shortcode -> #+attr_html
:args -> :class
https://github.com/kaushalmodi/ox-hugo/issues/119
Also, now the target and rel attr are once again passed on to the
figure shortcode (a better solution to straightaway discarding those
as done in
e92fcf0037).
Those attributes will still be ineffective as the internal figure
shortcode does not recognize those. But this can be fixed if Hugo adds
the support for those, or if a user simply overrides the internal
shortcode with their custom figure shortcode with that support added.
- [X] Inlined non-hyperlinked images, no meta or only alt -- Use Markdown image syntax
- [X] Inlined hyperlinked images, no meta or only alt -- Use Markdown image syntax
- [X] Inlined non-hyperlinked images, meta other than alt -- Use HTML img
- [X] Inlined hyperlinked images, meta other than alt -- Use HTML img
https://github.com/kaushalmodi/ox-hugo/issues/125
It's conventional to write a shortcode with a space after the starting
"{{<" (or "{{%") characters and a space before the ending pairs.
So do:
{{< SHORTCODE >}}
Not:
{{<SHORTCODE>}}
This commit makes that space insertion consistent for the exported
figure and highlight shortcodes.
The Markdown form [{{< figure .. >}}](some link) results in wrapping
the <figure> in <a> in the final HTML, which is invalid.
- [X] Non-inlined hyperlinked images -- Use link in figure
https://github.com/kaushalmodi/ox-hugo/issues/125
One minor behavior change: Now <a> tag attributes like "target" and
"rel" cannot be applied *only to* the links that images hyperlink
to. The reason is to make the exported Markdown generate valid HTML,
and with how the "figure" shortcode is designed in HTML, those
parameters are not passed onto the <a> element in the generated
<figure> element.
Fixes https://github.com/kaushalmodi/ox-hugo/issues/124
Remove the logic clutter that tried to preserve "file:" before
links.. "file:" does not make sense for web pages (may be need to
revisit this in future, but for now all existing tests pass).
- Add tests for images linked to images when the linked image needs to
be copied to static.
- Another test similar to above but when the page is a bundle and the
linked image needs to be copied to the bundle dir.
- Also update test site theme
It's used in the Hugo-internal template "opengraph":
2fa70c9344/tpl/tplimpl/template_embedded.go (L205)
Added new keywords HUGO_WITH_LOCALE (defaults to nil) and HUGO_LOCALE.
With HUGO_WITH_LOCALE non-nil, and HUGO_LOCALE nil, the locale is
auto-detected from the system env vars LANGUAGE, LC_ALL or LANG.
User can also choose to manually specify the locale instead using
HUGO_LOCALE using a "language_TERRITORY" type string.
Note that the auto-detected/manually specified locale will be exported
to the "locale" front-matter only if HUGO_WITH_LOCALE is set to a
non-nil value (like t).
https://github.com/kaushalmodi/ox-hugo/issues/122
Org keywords: #+HUGO_TAGS, #+HUGO_CATEGORIES, #+KEYWORDS
or
Org properties: :EXPORT_HUGO_TAGS:, :EXPORT_HUGO_CATEGORIES:, :EXPORT_KEYWORDS:
!! This is a breaking change !!
Earlier, strings with spaces in those keywords had to be written as
abc__def. Now strings with spaces need to be written as "abc def"
instead, which is more intuitive.
This *does not* change the abc__def style required in Org
tags (e.g. :abc__def:), because Org tags cannot contain spaces. Note
that the same applies to the #+FILETAGS keyword too! In the
abc__def.
For many keywords like #+HUGO_TAGS, it is useful to merge multiple
values when this is done:
#+HUGO_TAGS: value1
#+HUGO_TAGS: value2
This merging did not happen as expected for these keywords; this
commit fixes that.
#+AUTHOR:
#+HUGO_CUSTOM_FRONT_MATTER:
#+HUGO_BLACKFRIDAY:
#+HUGO_MENU:
#+HUGO_MENU_OVERRIDE:
#+HUGO_OUTPUTS:
#+HUGO_RESOURCES:
Add test case for the same.
(Note that this fix was needed only for Org keyword values merging, not
subtree property merging.)
Kaushal Modi
