From 2de9c928817e46f3187998147cad66d77b16a652 Mon Sep 17 00:00:00 2001
From: not manx <boku@plum.moe>
Date: Sun, 9 May 2021 20:16:21 +0100
Subject: [PATCH] Render non-fuzzy links without content correctly

If a link was non-fuzzy (points at a known URI scheme) and also
had no description, the parser would incorrectly wrap the text
in an <em> tag instead of displaying the link as the content.
---
 ox-plumhtml-tests.el |  5 +++++
 ox-plumhtml.el       | 15 ++++++++-------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/ox-plumhtml-tests.el b/ox-plumhtml-tests.el
index c53d8e0..84b8304 100644
--- a/ox-plumhtml-tests.el
+++ b/ox-plumhtml-tests.el
@@ -61,6 +61,11 @@
    "<h1 id=\"org[[:alnum:]]\\{7\\}\">mwee</h1>"
    "* mwee" '(:export-header-ids t)))
 
+(ert-deftest link-without-content ()
+  (should-render-as
+   "<p><a href=\"https://flanchan.moe\">https://flanchan.moe</a></p>"
+   "[[https://flanchan.moe]]"))
+
 ;; Links and IDs
 (ert-deftest link ()
   (should-render-as
diff --git a/ox-plumhtml.el b/ox-plumhtml.el
index b09b0e8..c46db3e 100644
--- a/ox-plumhtml.el
+++ b/ox-plumhtml.el
@@ -3,7 +3,7 @@
 
 ;; Author: Plum <boku@plum.moe>
 ;; Created: June 2020
-;; Package-Version: 1.2.0
+;; Package-Version: 1.2.1
 ;; Keywords: files
 ;; URL: https://words.plum.moe/ox-plumhtml.html
 ;; Package-Requires: ((emacs "26.1") (ox-slimhtml "0.4.5"))
@@ -120,20 +120,18 @@ INFO is a plist holding contextual information."
   (cond
    ((ox-slimhtml--immediate-child-of-p link 'link)
     (org-element-property :raw-link link))
-   ((not contents)
-    (format "<em>%s</em>" (org-element-property :path link)))
    (t (let ((link-type (org-element-property :type link))
             (href (org-element-property :raw-link link))
             (attributes (if (ox-slimhtml--immediate-child-of-p link 'paragraph)
                             (ox-slimhtml--attr (org-export-get-parent link))
                           ""))
-            (element "<a href=\"%s\"%s>%s</a>"))
+            (element "<a href=\"%s\"%s>%s</a>")
+            (path (or (org-element-property :path link) "")))
         (cond
          ((string= "file" link-type)
           (let ((html-extension (or (plist-get info :html-extension) ""))
                 (use-abs-url (plist-get info :html-link-use-abs-url))
-                (link-org-files-as-html (plist-get info :html-link-org-as-html))
-                (path (or (org-element-property :path link) "")))
+                (link-org-files-as-html (plist-get info :html-link-org-as-html)))
             (format element
                     (concat (if (and use-abs-url (file-name-absolute-p path)) "file:" "")
                             (if (and link-org-files-as-html (string= "org" (downcase (or (file-name-extension path) ""))))
@@ -142,12 +140,15 @@ INFO is a plist holding contextual information."
                                   (file-name-sans-extension path))
                               path))
                     attributes contents)))
+         ((and (string= "fuzzy" link-type)
+               (not contents))
+          (format "<em>%s</em>" path))
          ((and (string= "fuzzy" link-type)
                (plist-get info :export-header-ids))
           (format "<a href=\"#%s\"%s>%s</a>"
                   (org-export-get-reference (org-export-resolve-fuzzy-link link info) info)
                   attributes contents))
-         (t (format element href attributes contents)))))))
+         (t (format element href attributes (or contents href))))))))
 
 ;; org-export backend and export/publish functions
 (org-export-define-derived-backend 'plumhtml