[elpa] externals/org 065af4b42a 1/2: ox-html: Use non-number footnote names as link anchors

[ELPA Syncer]

branch: externals/org
commit 065af4b42a48862110b8c6f45d1ae9b0e4aad69c
Author: Ihor Radchenko <yantar92@posteo.net>
Commit: Ihor Radchenko <yantar92@posteo.net>

    ox-html: Use non-number footnote names as link anchors
    
    * lisp/ox-html.el (org-html-footnote-section):
    * lisp/ox-html.el (org-html-footnote-reference): When footnote has a
    non-number name, build link anchors using this name.
    * etc/ORG-NEWS (=ox-html=: When exporting footnotes with custom
    non-number names, the names are used as link anchors): Announce the
    change.
    
    Link: https://orgmode.org/list/875xwngiwx.fsf@protesilaos.com
    
    Co-authored-by: Protesilaos Stavrou <info@protesilaos.com>
---
 etc/ORG-NEWS    |  8 ++++++
 lisp/ox-html.el | 80 ++++++++++++++++++++++++++++++++++-----------------------
 2 files changed, 56 insertions(+), 32 deletions(-)

diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index c735a67a35..0b764af43d 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -13,6 +13,14 @@ Please send Org bug reports to mailto:emacs-orgmode@gnu.org.
 
 * Version 9.7 (not released yet)
 ** Important announcements and breaking changes
+*** =ox-html=: When exporting footnotes with custom non-number names, the 
names are used as link anchors
+
+Previously, link anchors for footnote references and footnote
+definitions were based on the footnote number: =fn.1=, =fnr.15=, etc.
+
+Now, when the footnote has a non-number name, it is used as an anchor:
+=fn.name=, =fnr.name=.
+
 *** Underline syntax now takes priority over subscript when both are applicable
 
 Previously, Org mode interpreted =(_text_)= as subscript.
diff --git a/lisp/ox-html.el b/lisp/ox-html.el
index 1db65de480..5095cae2eb 100644
--- a/lisp/ox-html.el
+++ b/lisp/ox-html.el
@@ -1873,36 +1873,43 @@ INFO is a plist used as a communication channel."
   (pcase (org-export-collect-footnote-definitions info)
     (`nil nil)
     (definitions
+     (format
+      (plist-get info :html-footnotes-section)
+      (org-html--translate "Footnotes" info)
       (format
-       (plist-get info :html-footnotes-section)
-       (org-html--translate "Footnotes" info)
-       (format
-       "\n%s\n"
-       (mapconcat
-        (lambda (definition)
-          (pcase definition
-            (`(,n ,_ ,def)
-             ;; `org-export-collect-footnote-definitions' can return
-             ;; two kinds of footnote definitions: inline and blocks.
-             ;; Since this should not make any difference in the HTML
-             ;; output, we wrap the inline definitions within
-             ;; a "footpara" class paragraph.
-             (let ((inline? (not (org-element-map def org-element-all-elements
-                                   #'identity nil t)))
-                   (anchor (org-html--anchor
-                            (format "fn.%d" n)
-                            n
-                            (format " class=\"footnum\" href=\"#fnr.%d\" 
role=\"doc-backlink\"" n)
-                            info))
-                   (contents (org-trim (org-export-data def info))))
-               (format "<div class=\"footdef\">%s %s</div>\n"
-                       (format (plist-get info :html-footnote-format) anchor)
-                       (format "<div class=\"footpara\" 
role=\"doc-footnote\">%s</div>"
-                               (if (not inline?) contents
-                                 (format "<p class=\"footpara\">%s</p>"
-                                         contents))))))))
-        definitions
-        "\n"))))))
+       "\n%s\n"
+       (mapconcat
+       (lambda (definition)
+         (pcase definition
+           (`(,n ,label ,def)
+             ;; Do not assign number labels as they appear in Org mode
+             ;; - the footnotes are re-numbered by
+             ;; `org-export-get-footnote-number'.  If the label is not
+             ;; a number, keep it.
+             (when (and (stringp label)
+                        (equal label (number-to-string (string-to-number 
label))))
+               (setq label nil))
+            ;; `org-export-collect-footnote-definitions' can return
+            ;; two kinds of footnote definitions: inline and blocks.
+            ;; Since this should not make any difference in the HTML
+            ;; output, we wrap the inline definitions within
+            ;; a "footpara" class paragraph.
+            (let ((inline? (not (org-element-map def org-element-all-elements
+                                #'identity nil t)))
+                  (anchor (org-html--anchor
+                            (format "fn.%s" (or label n))
+                           n
+                           (format " class=\"footnum\" href=\"#fnr.%s\" 
role=\"doc-backlink\"" (or label n))
+                           info))
+                  (contents (org-trim (org-export-data def info))))
+              (format "<div class=\"footdef\">%s %s</div>\n"
+                      (format (plist-get info :html-footnote-format) anchor)
+                      (format "<div class=\"footpara\" 
role=\"doc-footnote\">%s</div>"
+                              (if (not inline?) contents
+                                (format "<p class=\"footpara\">%s</p>"
+                                        contents))))))))
+       definitions
+       "\n"))))))
 
 
 ;;; Template
@@ -2741,8 +2748,17 @@ CONTENTS is nil.  INFO is a plist holding contextual 
information."
      (when (org-element-type-p prev 'footnote-reference)
        (plist-get info :html-footnote-separator)))
    (let* ((n (org-export-get-footnote-number footnote-reference info))
-         (id (format "fnr.%d%s"
-                     n
+          (label (org-element-property :label footnote-reference))
+          ;; Do not assign number labels as they appear in Org mode -
+          ;; the footnotes are re-numbered by
+          ;; `org-export-get-footnote-number'.  If the label is not a
+          ;; number, keep it.
+          (label (if (and (stringp label)
+                          (equal label (number-to-string (string-to-number 
label))))
+                          nil
+                   label))
+         (id (format "fnr.%s%s"
+                     (or label n)
                      (if (org-export-footnote-first-reference-p
                           footnote-reference info)
                          ""
@@ -2750,7 +2766,7 @@ CONTENTS is nil.  INFO is a plist holding contextual 
information."
      (format
       (plist-get info :html-footnote-format)
       (org-html--anchor
-       id n (format " class=\"footref\" href=\"#fn.%d\" role=\"doc-backlink\"" 
n) info)))))
+       id n (format " class=\"footref\" href=\"#fn.%s\" role=\"doc-backlink\"" 
(or label n)) info)))))
 
 ;;;; Headline