[Maxima-commits] [git] Maxima CAS branch master updated. branch-5_48-base-198-ge69e26d61

[rtoy <rt...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Maxima CAS".

The branch, master has been updated
       via  e69e26d612924d67caecee2e33572217a4b88ba7 (commit)
      from  3c5e3255a9be6a84aaeaeb779bbb2e83809f46c3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e69e26d612924d67caecee2e33572217a4b88ba7
Author: Raymond Toy <toy...@gm...>
Date:   Fri Sep 19 07:43:43 2025 -0700

    PARSE-TEXINFO-VERSION handles texinfo dev version
    
    Texinfo dev versions produces version strings like "7.2dev".  Update
    `parse-texinfo-version` to handle this by handling the "dev" part by
    treating it as a patch version of 99.  This assumes there will never
    be 99 patches for any texinfo version.
    
    This isn't perfect and could be made a lot more robust, but for now
    it's good enough to handle all of the texinfo versions I've run
    across.

diff --git a/doc/info/build-html-index.lisp b/doc/info/build-html-index.lisp
index ffd5f2d12..049cc3e70 100644
--- a/doc/info/build-html-index.lisp
+++ b/doc/info/build-html-index.lisp
@@ -320,7 +320,10 @@
 
 ;; Parse the texinfo version string.  It should look something like
 ;; "M.m.p", where M and m are a sequence of (base 10) digits and ".p"
-;; is the optional patch version.
+;; is the optional patch version.  However, development versions of
+;; texinfo look like "M.mdev" where there patch version is "dev"
+;; instead of ".p".  In this case, set the patch version to be 99 on
+;; the assumption there will never be that many patches.
 (defun parse-texinfo-version (string)
   (when string
     (let ((posn 0)
@@ -332,6 +335,21 @@
 	      (parse-integer string
 			     :start posn
 			     :junk-allowed t)
+            ;; Debugging print to show parsing steps
+            #+nil
+            (format t "k = ~D: start ~D end ~d substring ~S~%"
+                    k posn end (subseq string posn end))
+            (when (null digits)
+              ;; If there were no digits in the substring, and we're
+              ;; looking for the patch version (k = 2), assume we have
+              ;; a texinfo dev version and set digits to 99.
+              ;; Otherwise signal an error that we can't parse the
+              ;; texinfo version.
+              (if (= k 2)
+                  (setf digits 99)
+                  (error "Can't parse texinfo version string ~A for part ~D"
+                         (subseq string posn)
+                         k)))
 	    (push digits version)
 	    (setf posn (1+ end)))))
       (apply #'texinfo-version-number (nreverse version)))))

-----------------------------------------------------------------------

Summary of changes:
 doc/info/build-html-index.lisp | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
Maxima CAS