[Maxima-commits] [git] Maxima CAS branch rtoy-highlightjs-example-maxima-blocks-texi-dev updated. branch-5_48-base-342-g7ae65db92

[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, rtoy-highlightjs-example-maxima-blocks-texi-dev has been updated
       via  7ae65db9239f3325615db30dc57cf3d57197a5e3 (commit)
       via  e55407b86daed075159cdc331b8980abf6dc831f (commit)
       via  76ebed3a3fdfe8850b46db8913cea5d7ec22fa0a (commit)
      from  362e9ff9084001b6e7953073700ef11402f6f09d (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 7ae65db9239f3325615db30dc57cf3d57197a5e3
Author: Raymond Toy <toy...@gm...>
Date:   Fri Nov 21 06:21:57 2025 -0800

    Use HERE docs for variables and fix a typo
    
    To make it easier to read and modify the values for HIGHLIGHT1,
    HIGHLIGHT2, and CUSTOM_PYGMENTS_CSS use a HERE document.  Then use
    `tr` to replace the newlines with spaces.
    
    Finally fix a typo in the filenames for the pygments css files.  Also
    set the appropriate media values for the light and dark modes.

diff --git a/configure.ac b/configure.ac
index 4bfd9cf40..555c8dc0a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -916,12 +916,38 @@ if test x"${enable_build_docs}" = xtrue ; then
            dnl Make sure HIGHLIGHT1 and HIGHLIGHT2 are all on one line
            dnl because these variables are placed in the Makefile and
            dnl make doesn't support multiple-line variable
-           dnl assignments.
-           HIGHLIGHT1=$(cat <<EOF
-<link rel="stylesheet" media="(prefers-color-scheme: light)" href="$CDN/$HIGHLIGHT_VER/styles/$LIGHTMODE" integrity="$LIGHTMODECSS_HASH"  crossorigin="anonymous"> <link rel="stylesheet" media="(prefers-color-scheme: dark)" href="$CDN/$HIGHLIGHT_VER/styles/$DARKMODE" integrity="$DARKMODECSS_HASH" crossorigin="anonymous"> <script src="$CDN/$HIGHLIGHT_VER/highlight.min.js" integrity="$HIGHLIGHTJS_HASH"  crossorigin="anonymous"></script> <script src="$CDN/$HIGHLIGHT_VER/languages/maxima.min.js" integrity="$MAXIMAJS_HASH" crossorigin="anonymous"></script>
+           dnl assignments.  Hence, use tr to remove newlines from the
+           dnl HERE document.  The HERE document makes it easier to read
+           dnl and understand what's being done.
+           HIGHLIGHT1="$(cat | tr -s '\n' ' ' <<EOF
+<link rel="stylesheet"
+      media="(prefers-color-scheme: light)"
+      href="$CDN/$HIGHLIGHT_VER/styles/$LIGHTMODE"
+      integrity="$LIGHTMODECSS_HASH"
+      crossorigin="anonymous">
+<link rel="stylesheet"
+      media="(prefers-color-scheme: dark)"
+      href="$CDN/$HIGHLIGHT_VER/styles/$DARKMODE"
+      integrity="$DARKMODECSS_HASH"
+      crossorigin="anonymous">
+<script src="$CDN/$HIGHLIGHT_VER/highlight.min.js"
+        integrity="$HIGHLIGHTJS_HASH"
+        crossorigin="anonymous">
+</script>
+<script src="$CDN/$HIGHLIGHT_VER/languages/maxima.min.js"
+        integrity="$MAXIMAJS_HASH"
+        crossorigin="anonymous">
+</script>
 EOF
-)
-           HIGHLIGHT2="<script> hljs.configure({languages: [['Maxima']], cssSelector: ${HLJS_CSS_SELECTOR}}); hljs.highlightAll(); </script>"
+)"
+           HIGHLIGHT2="$(cat | tr -s '\n' ' ' <<EOF
+<script>
+  hljs.configure({languages: [['Maxima']],
+                  cssSelector: ${HLJS_CSS_SELECTOR}});
+  hljs.highlightAll();
+</script>
+EOF
+)"
         fi
         if test x${syntax_highlighting} = xpygments; then
            if test ${makeinfo_version} -ge 70200; then
@@ -945,7 +971,15 @@ EOF
              dnl
              dnl Change "default" and "rrt" to choose different styles
              dnl for light and dark modes, respectively.
-             CUSTOM_PYGMENTS_CSS='<link rel="stylesheet" href="pgyments.light.css"><link rel="stylesheet" href="pgyments.dark.css">'
+             CUSTOM_PYGMENTS_CSS="$(cat | tr -s '\n' ' ' <<EOF
+<link rel="stylesheet"
+      href="pygments.light.css"
+      media="(prefers-color-scheme: light)">
+<link rel="stylesheet"
+      href="pygments.dark.css"
+      media="(prefers-color-scheme: dark)">
+EOF
+)"
            fi
         fi
         AC_SUBST(TEXI_EXTRA_HEAD)

commit e55407b86daed075159cdc331b8980abf6dc831f
Author: Raymond Toy <toy...@gm...>
Date:   Fri Nov 21 06:21:10 2025 -0800

    Remove debugging statements
    
    We had an extra `set -x` and and `echo` for debugging.  Remove these.

diff --git a/doc/info/build_html.sh.in b/doc/info/build_html.sh.in
index 8668090c9..318dacdf6 100755
--- a/doc/info/build_html.sh.in
+++ b/doc/info/build_html.sh.in
@@ -218,9 +218,7 @@ fi
 # There should be no errors in the texi files so don't use "--force -e
 # 10000" to force building the docs.  We want to fail building if
 # there are errors now.
-set -x
 TEXIOPT="$FORCE --html -c OUTPUT_ENCODING_NAME=UTF-8 -e 10000 --document-lang=$language -I . -I $languagedir --css-ref=manual.css -I ../.. -I @abs_srcdir@/figures --init-file $texiinitfile ${SET_HTML_MATH} ${SET_HIGHLIGHT}"
-echo $TEXIOPT
 # Show the commands. 
 set -x
 # NOTE: We need to do the SET_CUSTOM here instead of putting it in

commit 76ebed3a3fdfe8850b46db8913cea5d7ec22fa0a
Author: Raymond Toy <toy...@gm...>
Date:   Fri Nov 21 05:48:33 2025 -0800

    Forgot to AC_SUBST CUSTOM_PYGMENTS_CSS

diff --git a/configure.ac b/configure.ac
index b1cb8d232..4bfd9cf40 100644
--- a/configure.ac
+++ b/configure.ac
@@ -955,6 +955,7 @@ EOF
         AC_SUBST(USE_PYGMENTS)
         AC_SUBST(USE_CUSTOM_HILITE)
         AC_SUBST(CUSTOM_PYGMENTS)
+        AC_SUBST(CUSTOM_PYGMENTS_CSS)
         TEXI2HTML=texi2html.init
         AC_SUBST(TEXI2HTML)
 

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

Summary of changes:
 configure.ac              | 47 +++++++++++++++++++++++++++++++++++++++++------
 doc/info/build_html.sh.in |  2 --
 2 files changed, 41 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
Maxima CAS