Menu
▾
▴
[Maxima-commits] [git] Maxima CAS branch rtoy-highlightjs-example-maxima-blocks-texi-dev updated. branch-5_48-base-330-g64c9bd227
|
From: rtoy <rt...@us...> - 2025-11-20 20:31:44
|
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 64c9bd227da5822e631ee775c30998b1018c9006 (commit)
via be0d865610f38b5f899f5e10405e1e9df8957bb4 (commit)
via 239481fe3c322f170a9115fcc5ba5983dd3f0c02 (commit)
via 0e236a206511a3bac31a0d187b88b8590207f3ff (commit)
via ac0376da85fda136023af3994be85bd543a85323 (commit)
via eb7932cc762ae3232b141208c8a13e605325510a (commit)
from 8776caa54f9260b1fe16b969e48c95f72fdf50e2 (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 64c9bd227da5822e631ee775c30998b1018c9006
Author: Raymond Toy <toy...@gm...>
Date: Thu Nov 20 12:30:21 2025 -0800
Document custom-pygments for the syntax-highlighting option
Let user's know about the custom-pygments value when enabling
syntax-highlighting.
diff --git a/configure.ac b/configure.ac
index 64e57d620..7c374dcc0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -658,7 +658,7 @@ AC_ARG_ENABLE(build-docs,
AC_ARG_ENABLE(syntax-highlighting,
[AS_HELP_STRING([--enable-syntax-highlighting],
[Enable syntax highlighting for the HTML manual (default = no).
- Set to "highlightjs" to use highlightjs or "pygments" to use pygments. No value implies highlightjs])],
+ Set to "highlightjs" to use highlightjs, "pygments" to use pygments or "custom-pygments" to use custom pygments styling. No value implies highlightjs])],
[case "${enableval}" in
yes|highlightjs) syntax_highlighting=highlightjs ;;
pygments) syntax_highlighting=pygments ;;
commit be0d865610f38b5f899f5e10405e1e9df8957bb4
Author: Raymond Toy <toy...@gm...>
Date: Thu Nov 20 12:26:16 2025 -0800
Don't include the patch number if it's 0 for the version string
When setting the version string, don't include the patch version if
it's 0. If we did, for texinfo 7.2, we get a version string of
"7.20" (or "7.2.0") which would be confusing because texinfo
identifies itself as "7.2".
diff --git a/configure.ac b/configure.ac
index e4522949b..64e57d620 100644
--- a/configure.ac
+++ b/configure.ac
@@ -828,7 +828,12 @@ if test x"${enable_build_docs}" = xtrue ; then
makeinfo_patch=99
makeinfo_version_string="${makeinfo_version_string}${VERSION_SUFFIX}"
else
- makeinfo_version_string="${makeinfo_version_string}${VERSION_P}"
+ dnl Don't include the patch version if it's 0.
+ if test "${VERSION_P}" = "0"; then
+ makeinfo_version_string="${makeinfo_version_string}"
+ else
+ makeinfo_version_string="${makeinfo_version_string}${VERSION_P}"
+ fi
fi
dnl echo string ${makeinfo_version_string}
@@ -892,18 +897,22 @@ EOF
fi
fi
if test x${syntax_highlighting} = "xcustom-pygments"; then
- dnl This tells build_html.sh to use a custom call to
- dnl pgymentize so that we can use the style sheets we want.
- USE_CUSTOM_HILITE=true
-
- dnl To create these style sheets, do
- dnl
- dnl pygmentize -S default -f html > pygments.light.css
- dnl pygmentize -S rrt -f html > pygments.dark.css
- 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">'
+ if test ${makeinfo_version} -le 70200; then
+ AC_MSG_ERROR([Makeinfo version (${makeinfo_version_string}) too old to use custom-pygments for syntax highlighting. Disable or use highlightjs or pygments])
+ else
+ dnl This tells build_html.sh to use a custom call to
+ dnl pgymentize so that we can use the style sheets we want.
+ USE_CUSTOM_HILITE=true
+
+ dnl To create these style sheets, do
+ dnl
+ dnl pygmentize -S default -f html > pygments.light.css
+ dnl pygmentize -S rrt -f html > pygments.dark.css
+ 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">'
+ fi
fi
AC_SUBST(TEXI_EXTRA_HEAD)
AC_SUBST(TEXI_EXTRA_TAIL)
commit 239481fe3c322f170a9115fcc5ba5983dd3f0c02
Author: Raymond Toy <toy...@gm...>
Date: Thu Nov 20 12:18:59 2025 -0800
Put back SET_HIGHLIGHT
We accidentally deleted SET_HIGHLIGHT from TEXIOPT. Put it back so
that when pygments is selected, we use texinfo's pygments style.
diff --git a/doc/info/build_html.sh.in b/doc/info/build_html.sh.in
index 52224d8c0..8668090c9 100755
--- a/doc/info/build_html.sh.in
+++ b/doc/info/build_html.sh.in
@@ -219,7 +219,7 @@ fi
# 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}"
+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
commit 0e236a206511a3bac31a0d187b88b8590207f3ff
Author: Raymond Toy <toy...@gm...>
Date: Thu Nov 20 12:15:28 2025 -0800
Remove pygments inline CSS from manual.css
The pygments CSS in pygments.light.css and pygments.dark.css files.
Remove the styles we had previously in manual.css
Of course, add the new files pygments.light.css and pygments.dark.css.
diff --git a/doc/info/manual.css b/doc/info/manual.css
index 59103443c..c65a29667 100644
--- a/doc/info/manual.css
+++ b/doc/info/manual.css
@@ -164,173 +164,3 @@ dd { margin-left: 0.5em }
*/
line-height: normal !important;
}
-
-/*
- * CSS from pygmentize -S default -f html
- */
-@media (prefers-color-scheme: light) {
- pre { line-height: 125%; }
- td.linenos .normal { color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px; }
- span.linenos { color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px; }
- td.linenos .special { color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px; }
- span.linenos.special { color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px; }
- .hll { background-color: #ffffcc }
- .c { color: #3D7B7B; font-style: italic } /* Comment */
- .err { border: 1px solid #F00 } /* Error */
- .k { color: #008000; font-weight: bold } /* Keyword */
- .o { color: #666 } /* Operator */
- .ch { color: #3D7B7B; font-style: italic } /* Comment.Hashbang */
- .cm { color: #3D7B7B; font-style: italic } /* Comment.Multiline */
- .cp { color: #9C6500 } /* Comment.Preproc */
- .cpf { color: #3D7B7B; font-style: italic } /* Comment.PreprocFile */
- .c1 { color: #3D7B7B; font-style: italic } /* Comment.Single */
- .cs { color: #3D7B7B; font-style: italic } /* Comment.Special */
- .gd { color: #A00000 } /* Generic.Deleted */
- .ge { font-style: italic } /* Generic.Emph */
- .ges { font-weight: bold; font-style: italic } /* Generic.EmphStrong */
- .gr { color: #E40000 } /* Generic.Error */
- .gh { color: #000080; font-weight: bold } /* Generic.Heading */
- .gi { color: #008400 } /* Generic.Inserted */
- .go { color: #717171 } /* Generic.Output */
- .gp { color: #000080; font-weight: bold } /* Generic.Prompt */
- .gs { font-weight: bold } /* Generic.Strong */
- .gu { color: #800080; font-weight: bold } /* Generic.Subheading */
- .gt { color: #04D } /* Generic.Traceback */
- .kc { color: #008000; font-weight: bold } /* Keyword.Constant */
- .kd { color: #008000; font-weight: bold } /* Keyword.Declaration */
- .kn { color: #008000; font-weight: bold } /* Keyword.Namespace */
- .kp { color: #008000 } /* Keyword.Pseudo */
- .kr { color: #008000; font-weight: bold } /* Keyword.Reserved */
- .kt { color: #B00040 } /* Keyword.Type */
- .m { color: #666 } /* Literal.Number */
- .s { color: #BA2121 } /* Literal.String */
- .na { color: #687822 } /* Name.Attribute */
- .nb { color: #008000 } /* Name.Builtin */
- .nc { color: #00F; font-weight: bold } /* Name.Class */
- .no { color: #800 } /* Name.Constant */
- .nd { color: #A2F } /* Name.Decorator */
- .ni { color: #717171; font-weight: bold } /* Name.Entity */
- .ne { color: #CB3F38; font-weight: bold } /* Name.Exception */
- .nf { color: #00F } /* Name.Function */
- .nl { color: #767600 } /* Name.Label */
- .nn { color: #00F; font-weight: bold } /* Name.Namespace */
- .nt { color: #008000; font-weight: bold } /* Name.Tag */
- .nv { color: #19177C } /* Name.Variable */
- .ow { color: #A2F; font-weight: bold } /* Operator.Word */
- .w { color: #BBB } /* Text.Whitespace */
- .mb { color: #666 } /* Literal.Number.Bin */
- .mf { color: #666 } /* Literal.Number.Float */
- .mh { color: #666 } /* Literal.Number.Hex */
- .mi { color: #666 } /* Literal.Number.Integer */
- .mo { color: #666 } /* Literal.Number.Oct */
- .sa { color: #BA2121 } /* Literal.String.Affix */
- .sb { color: #BA2121 } /* Literal.String.Backtick */
- .sc { color: #BA2121 } /* Literal.String.Char */
- .dl { color: #BA2121 } /* Literal.String.Delimiter */
- .sd { color: #BA2121; font-style: italic } /* Literal.String.Doc */
- .s2 { color: #BA2121 } /* Literal.String.Double */
- .se { color: #AA5D1F; font-weight: bold } /* Literal.String.Escape */
- .sh { color: #BA2121 } /* Literal.String.Heredoc */
- .si { color: #A45A77; font-weight: bold } /* Literal.String.Interpol */
- .sx { color: #008000 } /* Literal.String.Other */
- .sr { color: #A45A77 } /* Literal.String.Regex */
- .s1 { color: #BA2121 } /* Literal.String.Single */
- .ss { color: #19177C } /* Literal.String.Symbol */
- .bp { color: #008000 } /* Name.Builtin.Pseudo */
- .fm { color: #00F } /* Name.Function.Magic */
- .vc { color: #19177C } /* Name.Variable.Class */
- .vg { color: #19177C } /* Name.Variable.Global */
- .vi { color: #19177C } /* Name.Variable.Instance */
- .vm { color: #19177C } /* Name.Variable.Magic */
- .il { color: #666 } /* Literal.Number.Integer.Long */
-}
-
-/*
- * CSS from pygmentize -S rrt -f html
- */
-@media (prefers-color-scheme: dark) {
- pre { line-height: 125%; }
- td.linenos .normal { color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px; }
- span.linenos { color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px; }
- td.linenos .special { color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px; }
- span.linenos.special { color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px; }
- .hll { background-color: #0000ff }
- .c { color: #0F0 } /* Comment */
- .err { color: #DDD } /* Error */
- .esc { color: #DDD } /* Escape */
- .g { color: #DDD } /* Generic */
- .k { color: #F00 } /* Keyword */
- .l { color: #DDD } /* Literal */
- .n { color: #DDD } /* Name */
- .o { color: #DDD } /* Operator */
- .x { color: #DDD } /* Other */
- .p { color: #DDD } /* Punctuation */
- .ch { color: #0F0 } /* Comment.Hashbang */
- .cm { color: #0F0 } /* Comment.Multiline */
- .cp { color: #E5E5E5 } /* Comment.Preproc */
- .cpf { color: #0F0 } /* Comment.PreprocFile */
- .c1 { color: #0F0 } /* Comment.Single */
- .cs { color: #0F0 } /* Comment.Special */
- .gd { color: #DDD } /* Generic.Deleted */
- .ge { color: #DDD } /* Generic.Emph */
- .ges { color: #DDD } /* Generic.EmphStrong */
- .gr { color: #DDD } /* Generic.Error */
- .gh { color: #DDD } /* Generic.Heading */
- .gi { color: #DDD } /* Generic.Inserted */
- .go { color: #DDD } /* Generic.Output */
- .gp { color: #DDD } /* Generic.Prompt */
- .gs { color: #DDD } /* Generic.Strong */
- .gu { color: #DDD } /* Generic.Subheading */
- .gt { color: #DDD } /* Generic.Traceback */
- .kc { color: #F00 } /* Keyword.Constant */
- .kd { color: #F00 } /* Keyword.Declaration */
- .kn { color: #F00 } /* Keyword.Namespace */
- .kp { color: #F00 } /* Keyword.Pseudo */
- .kr { color: #F00 } /* Keyword.Reserved */
- .kt { color: #EE82EE } /* Keyword.Type */
- .ld { color: #DDD } /* Literal.Date */
- .m { color: #F0F } /* Literal.Number */
- .s { color: #87CEEB } /* Literal.String */
- .na { color: #DDD } /* Name.Attribute */
- .nb { color: #DDD } /* Name.Builtin */
- .nc { color: #DDD } /* Name.Class */
- .no { color: #7FFFD4 } /* Name.Constant */
- .nd { color: #DDD } /* Name.Decorator */
- .ni { color: #DDD } /* Name.Entity */
- .ne { color: #DDD } /* Name.Exception */
- .nf { color: #FF0 } /* Name.Function */
- .nl { color: #DDD } /* Name.Label */
- .nn { color: #DDD } /* Name.Namespace */
- .nx { color: #DDD } /* Name.Other */
- .py { color: #DDD } /* Name.Property */
- .nt { color: #DDD } /* Name.Tag */
- .nv { color: #EEDD82 } /* Name.Variable */
- .ow { color: #F00 } /* Operator.Word */
- .pm { color: #DDD } /* Punctuation.Marker */
- .w { color: #DDD } /* Text.Whitespace */
- .mb { color: #F0F } /* Literal.Number.Bin */
- .mf { color: #F0F } /* Literal.Number.Float */
- .mh { color: #F0F } /* Literal.Number.Hex */
- .mi { color: #F0F } /* Literal.Number.Integer */
- .mo { color: #F0F } /* Literal.Number.Oct */
- .sa { color: #87CEEB } /* Literal.String.Affix */
- .sb { color: #87CEEB } /* Literal.String.Backtick */
- .sc { color: #87CEEB } /* Literal.String.Char */
- .dl { color: #87CEEB } /* Literal.String.Delimiter */
- .sd { color: #87CEEB } /* Literal.String.Doc */
- .s2 { color: #87CEEB } /* Literal.String.Double */
- .se { color: #87CEEB } /* Literal.String.Escape */
- .sh { color: #87CEEB } /* Literal.String.Heredoc */
- .si { color: #87CEEB } /* Literal.String.Interpol */
- .sx { color: #87CEEB } /* Literal.String.Other */
- .sr { color: #87CEEB } /* Literal.String.Regex */
- .s1 { color: #87CEEB } /* Literal.String.Single */
- .ss { color: #87CEEB } /* Literal.String.Symbol */
- .bp { color: #DDD } /* Name.Builtin.Pseudo */
- .fm { color: #FF0 } /* Name.Function.Magic */
- .vc { color: #EEDD82 } /* Name.Variable.Class */
- .vg { color: #EEDD82 } /* Name.Variable.Global */
- .vi { color: #EEDD82 } /* Name.Variable.Instance */
- .vm { color: #EEDD82 } /* Name.Variable.Magic */
- .il { color: #F0F } /* Literal.Number.Integer.Long */
-}
diff --git a/doc/info/pygments.dark.css b/doc/info/pygments.dark.css
new file mode 100644
index 000000000..e18586d29
--- /dev/null
+++ b/doc/info/pygments.dark.css
@@ -0,0 +1,84 @@
+pre { line-height: 125%; }
+td.linenos .normal { color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px; }
+span.linenos { color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px; }
+td.linenos .special { color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px; }
+span.linenos.special { color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px; }
+.hll { background-color: #0000ff }
+.c { color: #0F0 } /* Comment */
+.err { color: #DDD } /* Error */
+.esc { color: #DDD } /* Escape */
+.g { color: #DDD } /* Generic */
+.k { color: #F00 } /* Keyword */
+.l { color: #DDD } /* Literal */
+.n { color: #DDD } /* Name */
+.o { color: #DDD } /* Operator */
+.x { color: #DDD } /* Other */
+.p { color: #DDD } /* Punctuation */
+.ch { color: #0F0 } /* Comment.Hashbang */
+.cm { color: #0F0 } /* Comment.Multiline */
+.cp { color: #E5E5E5 } /* Comment.Preproc */
+.cpf { color: #0F0 } /* Comment.PreprocFile */
+.c1 { color: #0F0 } /* Comment.Single */
+.cs { color: #0F0 } /* Comment.Special */
+.gd { color: #DDD } /* Generic.Deleted */
+.ge { color: #DDD } /* Generic.Emph */
+.ges { color: #DDD } /* Generic.EmphStrong */
+.gr { color: #DDD } /* Generic.Error */
+.gh { color: #DDD } /* Generic.Heading */
+.gi { color: #DDD } /* Generic.Inserted */
+.go { color: #DDD } /* Generic.Output */
+.gp { color: #DDD } /* Generic.Prompt */
+.gs { color: #DDD } /* Generic.Strong */
+.gu { color: #DDD } /* Generic.Subheading */
+.gt { color: #DDD } /* Generic.Traceback */
+.kc { color: #F00 } /* Keyword.Constant */
+.kd { color: #F00 } /* Keyword.Declaration */
+.kn { color: #F00 } /* Keyword.Namespace */
+.kp { color: #F00 } /* Keyword.Pseudo */
+.kr { color: #F00 } /* Keyword.Reserved */
+.kt { color: #EE82EE } /* Keyword.Type */
+.ld { color: #DDD } /* Literal.Date */
+.m { color: #F0F } /* Literal.Number */
+.s { color: #87CEEB } /* Literal.String */
+.na { color: #DDD } /* Name.Attribute */
+.nb { color: #DDD } /* Name.Builtin */
+.nc { color: #DDD } /* Name.Class */
+.no { color: #7FFFD4 } /* Name.Constant */
+.nd { color: #DDD } /* Name.Decorator */
+.ni { color: #DDD } /* Name.Entity */
+.ne { color: #DDD } /* Name.Exception */
+.nf { color: #FF0 } /* Name.Function */
+.nl { color: #DDD } /* Name.Label */
+.nn { color: #DDD } /* Name.Namespace */
+.nx { color: #DDD } /* Name.Other */
+.py { color: #DDD } /* Name.Property */
+.nt { color: #DDD } /* Name.Tag */
+.nv { color: #EEDD82 } /* Name.Variable */
+.ow { color: #F00 } /* Operator.Word */
+.pm { color: #DDD } /* Punctuation.Marker */
+.w { color: #DDD } /* Text.Whitespace */
+.mb { color: #F0F } /* Literal.Number.Bin */
+.mf { color: #F0F } /* Literal.Number.Float */
+.mh { color: #F0F } /* Literal.Number.Hex */
+.mi { color: #F0F } /* Literal.Number.Integer */
+.mo { color: #F0F } /* Literal.Number.Oct */
+.sa { color: #87CEEB } /* Literal.String.Affix */
+.sb { color: #87CEEB } /* Literal.String.Backtick */
+.sc { color: #87CEEB } /* Literal.String.Char */
+.dl { color: #87CEEB } /* Literal.String.Delimiter */
+.sd { color: #87CEEB } /* Literal.String.Doc */
+.s2 { color: #87CEEB } /* Literal.String.Double */
+.se { color: #87CEEB } /* Literal.String.Escape */
+.sh { color: #87CEEB } /* Literal.String.Heredoc */
+.si { color: #87CEEB } /* Literal.String.Interpol */
+.sx { color: #87CEEB } /* Literal.String.Other */
+.sr { color: #87CEEB } /* Literal.String.Regex */
+.s1 { color: #87CEEB } /* Literal.String.Single */
+.ss { color: #87CEEB } /* Literal.String.Symbol */
+.bp { color: #DDD } /* Name.Builtin.Pseudo */
+.fm { color: #FF0 } /* Name.Function.Magic */
+.vc { color: #EEDD82 } /* Name.Variable.Class */
+.vg { color: #EEDD82 } /* Name.Variable.Global */
+.vi { color: #EEDD82 } /* Name.Variable.Instance */
+.vm { color: #EEDD82 } /* Name.Variable.Magic */
+.il { color: #F0F } /* Literal.Number.Integer.Long */
diff --git a/doc/info/pygments.light.css b/doc/info/pygments.light.css
new file mode 100644
index 000000000..8e6fbf1b4
--- /dev/null
+++ b/doc/info/pygments.light.css
@@ -0,0 +1,74 @@
+pre { line-height: 125%; }
+td.linenos .normal { color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px; }
+span.linenos { color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px; }
+td.linenos .special { color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px; }
+span.linenos.special { color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px; }
+.hll { background-color: #ffffcc }
+.c { color: #3D7B7B; font-style: italic } /* Comment */
+.err { border: 1px solid #F00 } /* Error */
+.k { color: #008000; font-weight: bold } /* Keyword */
+.o { color: #666 } /* Operator */
+.ch { color: #3D7B7B; font-style: italic } /* Comment.Hashbang */
+.cm { color: #3D7B7B; font-style: italic } /* Comment.Multiline */
+.cp { color: #9C6500 } /* Comment.Preproc */
+.cpf { color: #3D7B7B; font-style: italic } /* Comment.PreprocFile */
+.c1 { color: #3D7B7B; font-style: italic } /* Comment.Single */
+.cs { color: #3D7B7B; font-style: italic } /* Comment.Special */
+.gd { color: #A00000 } /* Generic.Deleted */
+.ge { font-style: italic } /* Generic.Emph */
+.ges { font-weight: bold; font-style: italic } /* Generic.EmphStrong */
+.gr { color: #E40000 } /* Generic.Error */
+.gh { color: #000080; font-weight: bold } /* Generic.Heading */
+.gi { color: #008400 } /* Generic.Inserted */
+.go { color: #717171 } /* Generic.Output */
+.gp { color: #000080; font-weight: bold } /* Generic.Prompt */
+.gs { font-weight: bold } /* Generic.Strong */
+.gu { color: #800080; font-weight: bold } /* Generic.Subheading */
+.gt { color: #04D } /* Generic.Traceback */
+.kc { color: #008000; font-weight: bold } /* Keyword.Constant */
+.kd { color: #008000; font-weight: bold } /* Keyword.Declaration */
+.kn { color: #008000; font-weight: bold } /* Keyword.Namespace */
+.kp { color: #008000 } /* Keyword.Pseudo */
+.kr { color: #008000; font-weight: bold } /* Keyword.Reserved */
+.kt { color: #B00040 } /* Keyword.Type */
+.m { color: #666 } /* Literal.Number */
+.s { color: #BA2121 } /* Literal.String */
+.na { color: #687822 } /* Name.Attribute */
+.nb { color: #008000 } /* Name.Builtin */
+.nc { color: #00F; font-weight: bold } /* Name.Class */
+.no { color: #800 } /* Name.Constant */
+.nd { color: #A2F } /* Name.Decorator */
+.ni { color: #717171; font-weight: bold } /* Name.Entity */
+.ne { color: #CB3F38; font-weight: bold } /* Name.Exception */
+.nf { color: #00F } /* Name.Function */
+.nl { color: #767600 } /* Name.Label */
+.nn { color: #00F; font-weight: bold } /* Name.Namespace */
+.nt { color: #008000; font-weight: bold } /* Name.Tag */
+.nv { color: #19177C } /* Name.Variable */
+.ow { color: #A2F; font-weight: bold } /* Operator.Word */
+.w { color: #BBB } /* Text.Whitespace */
+.mb { color: #666 } /* Literal.Number.Bin */
+.mf { color: #666 } /* Literal.Number.Float */
+.mh { color: #666 } /* Literal.Number.Hex */
+.mi { color: #666 } /* Literal.Number.Integer */
+.mo { color: #666 } /* Literal.Number.Oct */
+.sa { color: #BA2121 } /* Literal.String.Affix */
+.sb { color: #BA2121 } /* Literal.String.Backtick */
+.sc { color: #BA2121 } /* Literal.String.Char */
+.dl { color: #BA2121 } /* Literal.String.Delimiter */
+.sd { color: #BA2121; font-style: italic } /* Literal.String.Doc */
+.s2 { color: #BA2121 } /* Literal.String.Double */
+.se { color: #AA5D1F; font-weight: bold } /* Literal.String.Escape */
+.sh { color: #BA2121 } /* Literal.String.Heredoc */
+.si { color: #A45A77; font-weight: bold } /* Literal.String.Interpol */
+.sx { color: #008000 } /* Literal.String.Other */
+.sr { color: #A45A77 } /* Literal.String.Regex */
+.s1 { color: #BA2121 } /* Literal.String.Single */
+.ss { color: #19177C } /* Literal.String.Symbol */
+.bp { color: #008000 } /* Name.Builtin.Pseudo */
+.fm { color: #00F } /* Name.Function.Magic */
+.vc { color: #19177C } /* Name.Variable.Class */
+.vg { color: #19177C } /* Name.Variable.Global */
+.vi { color: #19177C } /* Name.Variable.Instance */
+.vm { color: #19177C } /* Name.Variable.Magic */
+.il { color: #666 } /* Literal.Number.Integer.Long */
commit ac0376da85fda136023af3994be85bd543a85323
Author: Raymond Toy <toy...@gm...>
Date: Thu Nov 20 12:14:47 2025 -0800
Add some comments on what we're doing
diff --git a/doc/info/build_html.sh.in b/doc/info/build_html.sh.in
index b01521732..52224d8c0 100755
--- a/doc/info/build_html.sh.in
+++ b/doc/info/build_html.sh.in
@@ -195,10 +195,13 @@ if [ -z "@NEED_MATHJAX@" ]; then
fi
if [ -n "@USE_PYGMENTS@" ]; then
+ # Use texinfo's default pygments highlighting. This prevents any
+ # styling of the highlighting.
SET_HIGHLIGHT="--set-customization-variable HIGHLIGHT_SYNTAX=pygments"
fi
if [ -n "@USE_CUSTOM_HILITE@" ]; then
+ # Tell makeinfo we're using our own highlighting command.
SET_CUSTOM=true
fi
@@ -219,6 +222,11 @@ 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}"
echo $TEXIOPT
# Show the commands.
+set -x
+# NOTE: We need to do the SET_CUSTOM here instead of putting it in
+# TEXIOPT because shell quoting is all wrong that way. Make sure we
+# use the same pygmentize options here and below for the singlepage
+# version.
@MAKEINFO@ $FORCE ${SET_CUSTOM:+-c HIGHLIGHT_SYNTAX='pygmentize -f html -l %l'} --split=chapter --no-node-files --output="$languagedestdir" $TEXIOPT maxima.texi
rc=$?
if [ $rc -ne 0 ]; then
commit eb7932cc762ae3232b141208c8a13e605325510a
Author: Raymond Toy <toy...@gm...>
Date: Thu Nov 20 12:06:41 2025 -0800
If custom-pygments, load up separate CSS files for the styles
If we're using custom-pygments, load up the CSS files for the light
and dark CSS styles to be used with pygments highlighting.
This is done by adding a new variable CUSTOM_PYGMENTS_CSS to
configure.ac to add appropriate HTML link attributes. Then update
texi2html.init.in to recognize CUSTOM_PYGMENTS_CSS so that the links
are included.
diff --git a/configure.ac b/configure.ac
index 10962016d..e4522949b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -892,7 +892,18 @@ EOF
fi
fi
if test x${syntax_highlighting} = "xcustom-pygments"; then
+ dnl This tells build_html.sh to use a custom call to
+ dnl pgymentize so that we can use the style sheets we want.
USE_CUSTOM_HILITE=true
+
+ dnl To create these style sheets, do
+ dnl
+ dnl pygmentize -S default -f html > pygments.light.css
+ dnl pygmentize -S rrt -f html > pygments.dark.css
+ 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">'
fi
AC_SUBST(TEXI_EXTRA_HEAD)
AC_SUBST(TEXI_EXTRA_TAIL)
@@ -900,6 +911,7 @@ EOF
AC_SUBST(HIGHLIGHT2)
AC_SUBST(USE_PYGMENTS)
AC_SUBST(USE_CUSTOM_HILITE)
+ AC_SUBST(CUSTOM_PYGMENTS)
TEXI2HTML=texi2html.init
AC_SUBST(TEXI2HTML)
diff --git a/doc/info/texi2html.init.in b/doc/info/texi2html.init.in
index 2c7fd4ad3..c9e37ad35 100644
--- a/doc/info/texi2html.init.in
+++ b/doc/info/texi2html.init.in
@@ -2,5 +2,6 @@
<link rel="alternate icon" href="figures/favicon.ico">
@HIGHLIGHT1@
@HIGHLIGHT2@
+@CUSTOM_PYGMENTS_CSS@
@NEED_MATHJAX@}
@TEXI_EXTRA_TAIL@;
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 27 ++++++-
doc/info/build_html.sh.in | 10 ++-
doc/info/manual.css | 170 --------------------------------------------
doc/info/pygments.dark.css | 84 ++++++++++++++++++++++
doc/info/pygments.light.css | 74 +++++++++++++++++++
doc/info/texi2html.init.in | 1 +
6 files changed, 192 insertions(+), 174 deletions(-)
create mode 100644 doc/info/pygments.dark.css
create mode 100644 doc/info/pygments.light.css
hooks/post-receive
--
Maxima CAS
|
