diff --git a/ox-hugo.el b/ox-hugo.el index 3587a59..2439939 100644 --- a/ox-hugo.el +++ b/ox-hugo.el @@ -1592,7 +1592,8 @@ and rewrite link paths to make blogging more seamless." (mapconcat #'number-to-string (org-export-get-headline-number destination info) ".")) - (t title)) + (t + title)) ;; Reference (or (org-element-property :CUSTOM_ID destination) (org-hugo-slug title) @@ -1605,15 +1606,19 @@ and rewrite link paths to make blogging more seamless." destination info nil #'org-html--has-caption-p))) (cond - ((not number) nil) - ((atom number) (number-to-string number)) - (t (mapconcat #'number-to-string number "."))))))) + ((not number) + nil) + ((atom number) + (number-to-string number)) + (t + (mapconcat #'number-to-string number "."))))))) ;; (message "[ox-hugo-link DBG] link description: %s" description) (when description (format "[%s](#%s)" description (org-export-get-reference destination info)))))))) ((org-export-inline-image-p link org-html-inline-image-rules) + ;; (message "[ox-hugo-link DBG] Inline image: %s" raw-path) ;; (message "[org-hugo-link DBG] processing an image: %s" contents) (let* ((path (org-hugo--attachment-rewrite-maybe raw-path info)) (parent (org-export-get-parent link)) @@ -1703,13 +1708,23 @@ and rewrite link paths to make blogging more seamless." (link-param-str (org-string-nw-p (org-trim link-param-str)))) (if contents (progn - ;; (message "[ox-hugo DBG org-hugo-link: contents=%s path=%s" contents path) - (if link-param-str - (format "%s" - (org-html-encode-plain-text path) - link-param-str - (org-link-unescape contents)) - (format "[%s](%s)" contents path))) + ;; (message "[ox-hugo-link DBG] contents=%s path=%s" contents path) + ;; (message "[ox-hugo-link DBG] link-param-str=%s" link-param-str) + (cond + (;; If `contents' is a `figure' shortcode but doesn't + ;; already have the `link' parameter set. + (and (string-match-p "\\`{{<\\s-*figure\\s-+" contents) + (not (string-match-p "\\`{{<\\s-*figure\\s-+.*link=" contents))) + (replace-regexp-in-string "\\s-*>}}\\'" + (format " link=\"%s\"\\&" path) + contents)) + (link-param-str + (format "%s" + (org-html-encode-plain-text path) + link-param-str + (org-link-unescape contents))) + (t + (format "[%s](%s)" contents path)))) (if link-param-str (let ((path (org-html-encode-plain-text path))) (format "%s" diff --git a/test/site/content-org/all-posts.org b/test/site/content-org/all-posts.org index b303eb4..3ba1405 100644 --- a/test/site/content-org/all-posts.org +++ b/test/site/content-org/all-posts.org @@ -2228,16 +2228,23 @@ as it is annotated with ~target="_blank"~. [[https://orgmode.org/manual/Hyperlinks.html][Here's the same link]] but with ~target="_self"~ annotation. So clicking it will open that link in this same tab! +[[https://orgmode.org/manual/Hyperlinks.html][Here's the same link again]], but this time there is no =#+ATTR_HTML= +annotation. So the behavior of clicking this link will depend on the +browser (typically an external link will open in a new tab +automatically). +*** Image linked to image with =target= attribute + #+ATTR_HTML: :width 10% :target _self [[https://orgmode.org/img/org-mode-unicorn-logo.png][https://orgmode.org/img/org-mode-unicorn-logo.png]] Above is a link to an image. The =width= attribute of /10%/ though -must apply *only* to the image, and not to the link, and the =target= -attribute must apply *only* to the link, and not to the image. +must apply *only* to the image, and not to the link. -[[https://orgmode.org/manual/Hyperlinks.html][Here's the same link again]], but this time there is no =#+ATTR_HTML= -annotation. So the behavior will depend on the browser (typically an -external link will open in a new tab automatically). +- Note :: The =target= attribute is discarded though in this case + because of the Hugo =figure= shortcode limitation.. there is + no way to pass the =target= or any other attribute to the + == element inside the =
= element that the + =figure= shortcode constructs. ** Within the same post (Internal links) :internal_links: *** Link to headings by name :toc:headings:export_option: :PROPERTIES: diff --git a/test/site/content/bundles/page-bundle-a/index.md b/test/site/content/bundles/page-bundle-a/index.md index d23a674..9f492ba 100644 --- a/test/site/content/bundles/page-bundle-a/index.md +++ b/test/site/content/bundles/page-bundle-a/index.md @@ -46,7 +46,7 @@ the copied location inside the bundle: #### Same image, but hyperlinked to itself {#same-image-but-hyperlinked-to-itself} -[{{
}}](copy-2-of-unicorn-logo.png) +{{
}} #### Page Bundles with images in the same dir as content Org file {#page-bundles-with-images-in-the-same-dir-as-content-org-file} diff --git a/test/site/content/images-in-content/page-bundle-images-in-same-dir/index.md b/test/site/content/images-in-content/page-bundle-images-in-same-dir/index.md index c374749..991991c 100644 --- a/test/site/content/images-in-content/page-bundle-images-in-same-dir/index.md +++ b/test/site/content/images-in-content/page-bundle-images-in-same-dir/index.md @@ -5,9 +5,9 @@ draft = false ## Link to an image in the same dir as this Org file {#link-to-an-image-in-the-same-dir-as-this-org-file} -[{{
}}](gnu.png) +{{
}} ## Link to an image in a subdir in the same dir as this Org file {#link-to-an-image-in-a-subdir-in-the-same-dir-as-this-org-file} -[{{
}}](images/org-copy-1.png) +{{
}} diff --git a/test/site/content/posts/image-links.md b/test/site/content/posts/image-links.md index 832ee94..48ad4e9 100644 --- a/test/site/content/posts/image-links.md +++ b/test/site/content/posts/image-links.md @@ -45,7 +45,7 @@ tag and look the same size. ## Clickable image that opens the image (works!) {#clickable-image-that-opens-the-image--works} Click below image to jump to the unicorn image. -[{{
}}](/images/org-mode-unicorn-logo.png) +{{
}} NOTE : `file:` has to be used in the **Description component** of the @@ -57,8 +57,8 @@ NOTE Here's the same link with `#+NAME` specified.. which should also be clickable. - -[{{
}}](/images/org-mode-unicorn-logo.png) + +{{
}} ### Same link with `file:` in "link" portion of the Org link too {#same-link-with-file-in-link-portion-of-the-org-link-too} @@ -68,7 +68,7 @@ create a hyperlinked image that links to an image. But having `file:` in the "link" portion of the Org link too shouldn't hurt._ Click below image to jump to the unicorn image. -[{{
}}](/images/org-mode-unicorn-logo.png) +{{
}} ## Link to image outside of standard Hugo `static` directory {#link-to-image-outside-of-standard-hugo-static-directory} @@ -106,4 +106,4 @@ Note #### Same image, but hyperlinked to itself {#same-image-but-hyperlinked-to-itself} -[{{
}}](/ox-hugo/copy-2-of-unicorn-logo.png) +{{
}} diff --git a/test/site/content/posts/links-with-target-attribute.md b/test/site/content/posts/links-with-target-attribute.md index ae4da70..845fd73 100644 --- a/test/site/content/posts/links-with-target-attribute.md +++ b/test/site/content/posts/links-with-target-attribute.md @@ -12,12 +12,22 @@ as it is annotated with `target="_blank"`. Here's the same link but with `target="_self"` annotation. So clicking it will open that link in this same tab! -{{
}} +[Here's the same link again](https://orgmode.org/manual/Hyperlinks.html), but this time there is no `#+ATTR_HTML` +annotation. So the behavior of clicking this link will depend on the +browser (typically an external link will open in a new tab +automatically). + + +## Image linked to image with `target` attribute {#image-linked-to-image-with-target-attribute} + +{{
}} Above is a link to an image. The `width` attribute of _10%_ though -must apply **only** to the image, and not to the link, and the `target` -attribute must apply **only** to the link, and not to the image. +must apply **only** to the image, and not to the link. -[Here's the same link again](https://orgmode.org/manual/Hyperlinks.html), but this time there is no `#+ATTR_HTML` -annotation. So the behavior will depend on the browser (typically an -external link will open in a new tab automatically). +Note +: The `target` attribute is discarded though in this case + because of the Hugo `figure` shortcode limitation.. there is + no way to pass the `target` or any other attribute to the + `` element inside the `
` element that the + `figure` shortcode constructs.