Merge branch 'master' into rsw

Author: rswgnu

ChangeLog

@@ -1,3 +1,36 @@
+2025-11-02  Mats Lidell  <[email protected]>
+
+* test/hywiki-tests.el
+    (hywiki-tests--wikiword-step-check-edit-wikiword-in-emacs-lisp-mode):
+    Add test.
+    (hywiki-tests--wikiword-identified-in-emacs-lisp-mode): Update test to
+    verify WikiWord face.
+
+2025-10-31  Mats Lidell  <[email protected]>
+
+* test/hywiki-tests.el (hywiki-tests--publish-special-cases): Add test
+    that triggers problems in publishing. Test is constructed to work by
+    verifying what is produced. Comments point to what is the expected
+    result.
+
+2025-10-29  Mats Lidell  <[email protected]>
+
+* test/hywiki-tests.el (hywiki-tests--org-link-export): Add environment
+    and mock call to hywiki--org-link-html-format.
+    (hywiki-tests--search-section): Helper for finding id strings in
+    generated html.
+    (hywiki-tests--published-html-links-to-word-and-section): Use
+    hywiki-tests--search-section.
+
+* hywiki.el (hywiki-org-link-export): Add info parameter for getting the environment.
+   (hywiki-org-link-export): Use hywiki--org-link-html-format.
+   (hywiki-publish-to-html): Simplify function since advice has been removed.
+   (hywiki--org-link-html-format): Add method for link formating in html.
+
+   (hywiki--org-format-reference):
+   (hywiki--org-export-new-title-reference):
+   (hywiki--org-export-get-reference): Not used, removed.
+
 2025-10-26  Bob Weiner  <[email protected]>
 
 * hycontrol.el (hycontrol-frame-zoom): Fix to check for an autoloaded function, 'zoom-frm-in'.

hywiki.el

@@ -3,7 +3,7 @@
 ;; Author:       Bob Weiner
 ;;
 ;; Orig-Date:    21-Apr-24 at 22:41:13
-;; Last-Mod:     26-Oct-25 at 11:48:45 by Bob Weiner
+;; Last-Mod:      2-Nov-25 at 17:09:25 by Mats Lidell
 ;;
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 ;;
@@ -2845,11 +2845,29 @@ If not found, set it up and return the new project properties."
      (concat hywiki-org-link-type ":"))
    (hywiki-word-read)))
 
+(defun hywiki--org-link-html-format (path-stem suffix desc info)
+  "Format an html link using Org ids."
+  (let* ((heading (and suffix (not (string-empty-p suffix)) (substring suffix 1)))
+         (link-obj (org-element-create
+                    'link
+                    (list
+                     :type "file"
+                     :path (concat path-stem ".org")
+                     :search-option (and heading (concat "*" heading))
+                     :format 'bracket)))
+         ;; Export as HTML
+         (exported (org-export-data link-obj info))
+         ;; Extract the href
+         (href (if (string-match "href=\"\\([^\"]+\\)\"" exported)
+                   (match-string 1 exported)
+                 exported)))
+    (format "<a href=\"%s\">%s</a>" href desc)))
+
 ;;; Next two functions derived from the denote package.
 ;;;###autoload
-(defun hywiki-org-link-export (link description format)
+(defun hywiki-org-link-export (link description format info)
   "Export a HyWikiWord Org-format `hy:' link to various formats.
-The LINK, DESCRIPTION, and FORMAT are provided by the export
+The LINK, DESCRIPTION, FORMAT and INFO are provided by the export
 backend."
   (let* ((path-word-suffix (hywiki-reference-to-referent link :full-data))
          (path (when path-word-suffix
@@ -2866,11 +2884,7 @@ backend."
     (if path
 	(pcase format
 	  (`ascii (format "[%s] <%s:%s>" hywiki-org-link-type desc path))
-	  (`html (format "<a href=\"%s.html%s\">%s</a>"
-			 path-stem
-			 (hpath:spaces-to-dashes-markup-anchor
-			  (or suffix ""))
-			 desc))
+	  (`html (hywiki--org-link-html-format path-stem suffix desc info))
 	  (`latex (format "\\href{%s.latex}{%s}" (replace-regexp-in-string "[\\{}$%&_#~^]" "\\\\\\&" path-stem) desc))
 	  (`md (format "[%s](%s.md%s)" desc path-stem
 		       (hpath:spaces-to-dashes-markup-anchor
@@ -2983,12 +2997,7 @@ Customize this directory with:
   ;; Export Org to html with useful link ids.
   ;; Instead of random ids like "orga1b2c3", use heading titles with
   ;; spaces replaced with dashes, made unique when necessary.
-  (unwind-protect
-      (progn
-	;; (advice-add #'org-export-get-reference :override #'hywiki--org-export-get-reference)
-	(org-publish-project "hywiki" all-pages-flag))
-    ;; (advice-remove #'org-export-get-reference #'hywiki--org-export-get-reference)
-    nil))
+  (org-publish-project "hywiki" all-pages-flag))
 
 (defun hywiki-referent-exists-p (&optional word start end)
   "Return the HyWikiWord at point or optional HyWiki WORD, if has a referent.
@@ -3798,121 +3807,6 @@ This must be called within a `save-excursion' or it may move point."
     (goto-char (1- (point))))
   (hywiki-maybe-highlight-between-page-names))
 
-;;; ************************************************************************
-;;; Private Org export override functions
-;;; ************************************************************************
-
-;; Thanks to alphapapa for the GPLed code upon which these hywiki--org
-;; functions are based.  These change the html ids that Org export
-;; generates to use the text of headings rather than randomly
-;; generated ids.
-
-(require 'cl-extra) ;; for `cl-some'
-(require 'ox)       ;; for `org-export-get-reference'
-(require 'url-util) ;; for `url-hexify-string'
-
-(defun hywiki--org-export-get-reference (datum info)
-  "Return a unique reference for DATUM, as a string.
-Like `org-export-get-reference' but uses modified heading strings as
-link ids rather than generated ids.  To form an id, spaces in headings
-are replaced with dashes and to make each id unique, heading parent
-ids are prepended separated by '--'.
-
-DATUM is either an element or an object.  INFO is the current
-export state, as a plist.
-
-References for the current document are stored in the
-`:internal-references' property.  Its value is an alist with
-associations of the following types:
-
-  (REFERENCE . DATUM) and (SEARCH-CELL . ID)
-
-REFERENCE is the reference string to be used for object or
-element DATUM.  SEARCH-CELL is a search cell, as returned by
-`org-export-search-cells'.  ID is a number or a string uniquely
-identifying DATUM within the document.
-
-This function also checks `:crossrefs' property for search cells
-matching DATUM before creating a new reference."
-  (let ((cache (plist-get info :internal-references)))
-    (or (car (rassq datum cache))
-        (let* ((crossrefs (plist-get info :crossrefs))
-               (cells (org-export-search-cells datum))
-               ;; Preserve any pre-existing association between
-               ;; a search cell and a reference, i.e., when some
-               ;; previously published document referenced a location
-               ;; within current file (see
-               ;; `org-publish-resolve-external-link').
-               ;;
-               ;; However, there is no guarantee that search cells are
-               ;; unique, e.g., there might be duplicate custom ID or
-               ;; two headings with the same title in the file.
-               ;;
-               ;; As a consequence, before reusing any reference to
-               ;; an element or object, we check that it doesn't refer
-               ;; to a previous element or object.
-               (new (or (when (org-element-property :raw-value datum)
-                          ;; Heading with a title
-                          (hywiki--org-export-new-title-reference datum cache))
-			(cl-some
-                         (lambda (cell)
-                           (let ((stored (cdr (assoc cell crossrefs))))
-                             (when stored
-                               (let ((old (org-export-format-reference stored)))
-                                 (and (not (assoc old cache)) stored)))))
-                         cells)
-			(org-export-format-reference
-                         (org-export-new-reference cache))))
-	       (reference-string new))
-          ;; Cache contains both data already associated to
-          ;; a reference and in-use internal references, so as to make
-          ;; unique references.
-          (dolist (cell cells) (push (cons cell new) cache))
-          ;; Retain a direct association between reference string and
-          ;; DATUM since (1) not every object or element can be given
-          ;; a search cell (2) it permits quick lookup.
-          (push (cons reference-string datum) cache)
-          (plist-put info :internal-references cache)
-          reference-string))))
-
-(defun hywiki--org-export-new-title-reference (datum cache)
-  "Return new heading title reference for DATUM that is unique in CACHE."
-  (let* ((title (org-element-property :raw-value datum))
-         (ref (hywiki--org-format-reference title))
-         (parent (org-element-property :parent datum))
-	 raw-parent)
-    (while (cl-some (lambda (elt) (equal ref (car elt)))
-                    cache)
-      ;; Title not unique: make it so.
-      (if parent
-          ;; Append ancestor title.
-          (setq raw-parent (org-element-property :raw-value parent)
-		title (if (and (stringp raw-parent) (not (string-empty-p raw-parent)))
-			  (concat raw-parent "--" title)
-			title)
-                ref (hywiki--org-format-reference title)
-                parent (org-element-property :parent parent))
-        ;; No more ancestors: add and increment a number.
-        (when (string-match "\\`\\([[:unibyte:]]\\)+?\\(--\\([0-9]+\\)\\)?\\'"
-			    ref)
-          (let ((num (match-string 3 ref)))
-            (setq parent (match-string 1 ref)
-		  parent (if (stringp parent) (concat parent "--") "")
-		  num (if num
-                          (string-to-number num)
-                        0)
-		  num (1+ num)
-		  ref (format "%s%s" parent num))))))
-    ref))
-
-(defun hywiki--org-format-reference (title)
-  "Format TITLE string as an html id."
-  (url-hexify-string
-   (replace-regexp-in-string "\\[\\[\\([a-z]+:\\)?\\|\\]\\[\\|\\]\\]" ""
-			     (subst-char-in-string
-			      ?\  ?- 
-			      (substring-no-properties title)))))
-
 ;;; ************************************************************************
 ;;; Private initializations
 ;;; ************************************************************************