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.
- [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
Add org-hugo-external-file-extensions-allowed-for-copying,
org-hugo-default-static-subdirectory-for-externals.
Copy external files to Hugo static only if they are newer or don't
exist in the destination dir.
Earlier, the images/ directory was given too much prominence... all
users might not have just an "images/" dir in the "static/" dir. A
user could have multiple dirs inside their static/ dir.. but earlier
the rewrite only used to happen to static/<HUGO_STATIC_IMAGE>. That
did not look right.
This commit fixes that.
Now ox-hugo tries to be smarter in figuring out where to copy the
outside-Hugo-static-dir files to.
- Now the <!--listend--> and <!--quoteend--> comments are not inserted
unless needed.
- Fix the "example-site/content/posts/equation-latex-frag.md" example.
User can still override this default by using:
#+OPTIONS: ':t
The default smart-quoting by Blackfriday is good enough. As a side the
Markdown files are much more human-readable with the
single and double quote characters used instead of rsquo, lsquo, rdquo
and ldquo.
* ox-hugo.el (org-hugo-link): Update the type=="file" case in the
final t case of the cond. Now the file:// prefix is not added if
the raw-path begins with "/images/" (or "/HUGO_STATIC_IMAGES/").
Cleanup:
- Move raw-path to the first let form in org-hugo-link; no need to get
that value multiple times in the fn.
- Get value of :hugo-static-images from info
- Replace occurrences of:
(if (not foo) bar
baz)
with
(if foo
baz
bar)
- Misc code consistency edits
Kaushal Modi
Matt Price
