|
From: rtoy <rt...@us...> - 2025-11-28 21:44:50
|
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 d931b3374b5d60ebfaaaafda050e042a571c881c (commit)
via 5e51fb893730956af2d7664bfe4950b0c0d7e0e6 (commit)
via 9987caa266f49eb1c2af201880c5d8a5214cf961 (commit)
via 53ae7d628a859fe44f4df908245a270f502c1f97 (commit)
via 1ecb9bcc5643f302b56e5cb87de65245eefee3c7 (commit)
via 4bfce99888373c3a98f28d070b7e03136d446877 (commit)
from a4546c9094c8d35c9d59e5374285652aec63293d (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 d931b3374b5d60ebfaaaafda050e042a571c881c
Author: Raymond Toy <toy...@gm...>
Date: Tue Nov 25 07:27:46 2025 -0800
Remove SCL conditionals
Just removed some of the simpler cases with SCL conditionals. There
are many, many more.
diff --git a/src/command-line.lisp b/src/command-line.lisp
index 16eb423fb..9c7413dff 100644
--- a/src/command-line.lisp
+++ b/src/command-line.lisp
@@ -166,9 +166,6 @@
ext::*command-line-application-arguments*
(rest ext:*command-line-strings*))
- #+scl
- (rest ext:*command-line-strings*)
-
#+sbcl
(rest sb-ext:*posix-argv*)
diff --git a/src/globals.lisp b/src/globals.lisp
index 322961fdb..76644e4d4 100644
--- a/src/globals.lisp
+++ b/src/globals.lisp
@@ -1692,7 +1692,6 @@
(defvar *maxima-lispname*
#+clisp "clisp"
#+cmu "cmucl"
- #+scl "scl"
#+sbcl "sbcl"
#+gcl "gcl"
#+allegro "acl"
@@ -1700,7 +1699,7 @@
#+abcl "abcl"
#+lispworks "lispworks"
#+ecl "ecl"
- #-(or clisp cmu scl sbcl gcl allegro openmcl abcl lispworks ecl) "unknownlisp")
+ #-(or clisp cmu sbcl gcl allegro openmcl abcl lispworks ecl) "unknownlisp")
;;; Locations of various types of files. These variables are discussed
;;; in more detail in the file doc/implementation/dir_vars.txt. Since
diff --git a/src/maxima-build.lisp b/src/maxima-build.lisp
index 817f2dcec..3376886ad 100644
--- a/src/maxima-build.lisp
+++ b/src/maxima-build.lisp
@@ -23,11 +23,10 @@
#+sbcl (sb-ext:save-lisp-and-die "binary-sbcl/maxima.core" :toplevel (symbol-function 'cl-user::run))
#+gcl (si:save-system "binary-gcl/maxima")
#+cmu (extensions:save-lisp "binary-cmucl/maxima.core" :init-function 'cl-user::run)
- #+scl (extensions:save-lisp "binary-scl/maxima.core" :init-function 'cl-user::run)
#+allegro (excl:dumplisp :name "binary-acl/maxima.dxl")
#+lispworks (hcl:save-image "binary-lispworks/maxima" :restart-function 'cl-user::run)
#+(and openmcl (not 64-bit-target)) (ccl:save-application "binary-openmcl/maxima" :toplevel-function 'cl-user::run)
#+(and openmcl 64-bit-target) (ccl:save-application "binary-ccl64/maxima" :toplevel-function 'cl-user::run)
- #-(or clisp sbcl gcl cmu scl allegro lispworks ccl)
+ #-(or clisp sbcl gcl cmu allegro lispworks ccl)
(format t "Sorry, I don't know how to dump an image on this Lisp"))
commit 5e51fb893730956af2d7664bfe4950b0c0d7e0e6
Author: Raymond Toy <toy...@gm...>
Date: Tue Nov 25 07:21:02 2025 -0800
Remove support for scl in configure.ac
Scl has not been available for a long time now. Remove support for
scl from configure.ac.
diff --git a/configure.ac b/configure.ac
index 310fb7070..72e902142 100644
--- a/configure.ac
+++ b/configure.ac
@@ -260,58 +260,6 @@ if test x"${cmucl}" = xtrue ; then
fi
fi
-dnl n.b. scl_default_name is hardcoded in "with" message
-scl_default_name=scl
-SCL_RUNTIME=lisp
-AC_ARG_ENABLE(scl,
- [AS_HELP_STRING([--enable-scl],
- [Use SCL])],
- [case "${enableval}" in
- yes) scl=true
- lisps_enabled="${lisps_enabled} scl"
- explicit_lisp=true ;;
- no) scl=false ;;
- *) AC_MSG_ERROR(bad value ${enableval} for --enable-scl) ;;
- esac
- explicit_lisp=true],
- [scl=false])
-AC_ARG_WITH(scl,
- [AS_HELP_STRING([--with-scl=<prog>],
- [Use SCL executable <prog> (default scl)])],
- [scl=true
- lisps_enabled="${lisps_enabled} scl"
- explicit_lisp=true
- if test "$withval" = "yes"; then
- SCL_NAME="${scl_default_name}"
- else
- SCL_NAME="$withval"
- fi],
- [SCL_NAME=${scl_default_name}])
-AC_ARG_WITH(scl-runtime,
- [AS_HELP_STRING([--with-scl-runtime=<path>],
- [Use SCL runtime <path> (default
- file://library/../bin/lisp)])],
- [scl=true
- lisps_enabled="${lisps_enabled} scl"
- SCL_RUNTIME_PATH="$withval"
- SCL_RUNTIME=`basename ${SCL_RUNTIME_PATH}`],
- [])
-if test x"${scl}" = xtrue ; then
- if test `echo "$SCL_NAME" | sed 's/\(.\).*/\1/'` = "/" ; then
- if test -x "$SCL_NAME" ; then
- scl_found=true
- else
- scl_found=false
- fi
- else
- AC_CHECK_PROG(scl_found,$SCL_NAME,true,false)
- fi
- AC_CHECK_PROG(scl_found,$SCL_NAME,true,false)
- if test x"${scl_found}" = xfalse ; then
- AC_MSG_WARN(scl executable ${SCL_NAME} not found in PATH)
- fi
-fi
-
dnl n.b. sbcl_default_name is hardcoded in "with" message
sbcl_default_name=sbcl
AC_ARG_ENABLE(sbcl,
@@ -1027,7 +975,6 @@ if test x"${explicit_lisp}" = xfalse ; then
AC_CHECK_PROG(clisp_found,${clisp_default_name},true,false)
AC_CHECK_PROG(gcl_found,${gcl_default_name},true,false)
AC_CHECK_PROG(cmucl_found,$CMUCL_NAME,true,false)
- AC_CHECK_PROG(scl_found,$SCL_NAME,true,false)
AC_CHECK_PROG(sbcl_found,$SBCL_NAME,true,false)
AC_CHECK_PROG(acl_found,$ACL_NAME,true,false)
AC_CHECK_PROG(openmcl_found,$OPENMCL_NAME,true,false)
@@ -1046,10 +993,6 @@ if test x"${explicit_lisp}" = xfalse ; then
cmucl=true
lisps_enabled="${lisps_enabled} cmucl"
fi
- if test x"${scl_found}" = xtrue ; then
- scl=true
- lisps_enabled="${lisps_enabled} scl"
- fi
if test x"${sbcl_found}" = xtrue ; then
sbcl=true
lisps_enabled="${lisps_enabled} sbcl"
@@ -1063,7 +1006,7 @@ if test x"${explicit_lisp}" = xfalse ; then
lisps_enabled="${lisps_enabled} ecl"
fi
if test x"${lisps_enabled}" = x; then
- AC_MSG_ERROR(No lisp implementation specified and none of the default executables [${clisp_default_name}(clisp),${gcl_default_name}(GCL),${cmucl_default_name}(CMUCL),${scl_default_name}(SCL),${sbcl_default_name}(SBCL),${acl_default_name}(ACL),${openmcl_default_name}(OpenMCL),${ecl_default_name}(ECL)] were found in PATH)
+ AC_MSG_ERROR(No lisp implementation specified and none of the default executables [${clisp_default_name}(clisp),${gcl_default_name}(GCL),${cmucl_default_name}(CMUCL),${sbcl_default_name}(SBCL),${acl_default_name}(ACL),${openmcl_default_name}(OpenMCL),${ecl_default_name}(ECL)] were found in PATH)
fi
fi
@@ -1073,7 +1016,6 @@ AM_CONDITIONAL(CLISP_EXEC, test x$clisp_exec = xtrue)
AM_CONDITIONAL(GCL, test x$gcl = xtrue)
AM_CONDITIONAL(CMUCL, test x$cmucl = xtrue)
AM_CONDITIONAL(CMUCL_EXEC, test x${cmucl_exec} = xtrue)
-AM_CONDITIONAL(SCL, test x$scl = xtrue)
AM_CONDITIONAL(SBCL, test x$sbcl = xtrue)
AM_CONDITIONAL(SBCL_EXEC, test x$sbcl_exec = xtrue)
AM_CONDITIONAL(ACL, test x$acl = xtrue)
@@ -1137,30 +1079,6 @@ flag.)
fi
fi
-if test x"${scl}" = xtrue; then
- if test x"${SCL_RUNTIME_PATH}" = x"" ; then
- SCL_RUNTIME_PATH=`${SCL_NAME} -noinit -nositeinit -quiet -batch -eval '(progn (enumerate-pathname-translations (pathname "file://library/../bin/lisp") (when (probe-file pathname) (format t "~A~%" (unix-namestring pathname)))) (quit))'`
- fi
- if test -x "${SCL_RUNTIME_PATH}" ; then
- echo "scl runtime is \"${SCL_RUNTIME_PATH}\""
- else
-dnl last chance: find SCL_NAME in path. Use it if it doesn't appear to
-dnl be a shell script.
- scl_path=`type -p "${SCL_NAME}"`
- if test x"`grep -c '#!.*bin.*sh.*' ${scl_path}`" = x"0" ; then
- SCL_RUNTIME_PATH="${scl_path}"
- else
- AC_MSG_ERROR([Unable to determine SCL runtime path.
-The best guess for SCL runtime, "${SCL_RUNTIME_PATH}", is not
-an executable. Use the argument
- --with-scl-runtime=<path>
-to set the actual SCL executable. If the SCL lisp command is a shell
-script the SCL executable is the program exec'd by that shell script.])
- fi
- fi
- SCL_RUNTIME=`basename ${SCL_RUNTIME_PATH}`
-fi
-
if test x"${gcl}" = xtrue; then
AC_MSG_CHECKING([if gcl version >= 2.6.14])
dnl Check gcl version
@@ -1227,13 +1145,6 @@ AC_ARG_WITH(default-lisp,
AC_MSG_ERROR(cmucl not enabled)
fi
;;
- scl)
- if test x"${scl}" = xtrue ; then
- DEFAULTLISP=scl
- else
- AC_MSG_ERROR(scl not enabled)
- fi
- ;;
sbcl)
if test x"${sbcl}" = xtrue ; then
DEFAULTLISP=sbcl
@@ -1291,8 +1202,6 @@ AC_ARG_WITH(default-lisp,
DEFAULTLISP=sbcl
elif test x"${cmucl}" = xtrue ; then
DEFAULTLISP=cmucl
- elif test x"${scl}" = xtrue ; then
- DEFAULTLISP=scl
elif test x"${clisp}" = xtrue ; then
DEFAULTLISP=clisp
elif test x"${gcl}" = xtrue ; then
@@ -1520,18 +1429,6 @@ if test x"${cmucl}" = xtrue ; then
echo Use "--enable-cmucl-exec to build a standalone executable instead."
fi
fi
-if test x"${scl}" = xtrue ; then
- echo "SCL enabled, using \"${SCL_NAME}\""
- echo "SCL runtime is \"${SCL_RUNTIME_PATH}\""
-fi
-if test x"${sbcl}" = xtrue ; then
- echo "Compiling a maxima image using \"${SBCL_NAME}\""
- if test x"${sbcl_exec}" = xtrue ; then
- echo "sbcl executable image enabled for maxima."
- else
- echo Use "--enable-sbcl-exec to build a standalone executable instead."
- fi
-fi
if test x"${gcl}" = xtrue ; then
echo "Compiling a maxima image using \"${GCL_NAME}\""
if test x"${gcl_alt_link}" = xtrue ; then
commit 9987caa266f49eb1c2af201880c5d8a5214cf961
Author: Raymond Toy <toy...@gm...>
Date: Wed Nov 26 07:03:19 2025 -0800
Move pygment CSS stuff together
diff --git a/doc/info/manual.css b/doc/info/manual.css
index 016c5978f..98ffcfbb4 100644
--- a/doc/info/manual.css
+++ b/doc/info/manual.css
@@ -93,15 +93,6 @@ pre.example, pre.example-preformatted {
overflow: auto;
}
-/*
- * For pygments, make the background color of the highlighted code the
- * same as the example background color. Without this, it looks funny.
- */
-
-div.highlight {
- background-color: var(--example-background-color) !important;
-}
-
div.spacerbox { border: none; padding: 2em 0 }
div.image { margin: 0; padding: 1em; text-align: center }
div.categorybox {
@@ -152,14 +143,27 @@ dd { margin-left: 0.5em }
dd { margin-left: 1.5em }
}
-/* CSS for pygment highlighting */
+/*
+ * CSS customizations for pygment highlighting
+ */
+
+/*
+ * For pygments, make the background color of the highlighted code the
+ * same as the example background color. Without this, it looks funny.
+ */
+
+div.highlight {
+ background-color: var(--example-background-color) !important;
+}
+
.example.user-maxima {
overflow-x: auto
}
.highlight.pre {
- /* Lines for highlighted examples are too close by default with
- * pygments. Make it larger.
+ /*
+ * Lines for highlighted examples are too close by default with
+ * pygments. Make it larger.
*/
line-height: normal !important;
}
commit 53ae7d628a859fe44f4df908245a270f502c1f97
Author: Raymond Toy <toy...@gm...>
Date: Wed Nov 26 06:58:54 2025 -0800
Remove @media dark mode CSS that's not used anymore
This has all been replaced with variables for dark-mode colors, so
this @media isn't used. Remove it.
Also add a comment about div.textbox and friends apparently not being
used anywhere. We comment them out for now, but they should
eventually be removed if not used.
diff --git a/doc/info/manual.css b/doc/info/manual.css
index 22b096742..016c5978f 100644
--- a/doc/info/manual.css
+++ b/doc/info/manual.css
@@ -61,6 +61,11 @@ a:hover, span.button:hover {
background-color: var(--hover-background-color);
color: var(--hover-color);
}
+/*
+ * What are these used for? I (rtoy) can't find these anywhere.
+ * Commenting these out for now, but they should be removed if they're
+ * not really used anywhere.
+ */
/*
div.textbox {
border: solid;
@@ -78,6 +83,7 @@ div.synopsisbox {
background: var(--div-synopsisbox-background-color);
}
*/
+
pre.example, pre.example-preformatted {
border: var(--pre-example-border);
color: var(--text-color);
@@ -145,38 +151,6 @@ dd { margin-left: 0.5em }
ul,ol { padding-left: 2em }
dd { margin-left: 1.5em }
}
-@media (prefers-color-scheme: dark) {
-/*
- body {
- background: #444;
- color: #eee
- }
- a:link {
- color: #9df;
- }
- a:visited {color: #9fd }
- a:hover, span.button:hover {
- background-color: #ddd;
- color: #55f;
- }
- div.header, div.nav-panel {
- background-color: #555;
- }
- pre.example, pre.example-preformatted {
- border: 1px solid black;
- color: black;
- background-color: var(--example-background-color);
- }
- div.highlight {
- background-color: var(--example-background-color) !important;
- }
- div.categorybox { background-color: #544 }
-*/
-/*
- div.textbox, div.titlebox, div.synopsisbox {
- color: var(--div-titlebox-background-color);}
-*/
-}
/* CSS for pygment highlighting */
.example.user-maxima {
commit 1ecb9bcc5643f302b56e5cb87de65245eefee3c7
Author: Raymond Toy <toy...@gm...>
Date: Mon Nov 24 13:46:31 2025 -0800
Comment out CSS for textbox, titlebox, and synposisbox
These don't seem to be used anywhere so comment them out.
Also do some minor cleanups and add some comments.
diff --git a/doc/info/manual.css b/doc/info/manual.css
index 2947b0145..22b096742 100644
--- a/doc/info/manual.css
+++ b/doc/info/manual.css
@@ -1,7 +1,7 @@
-/* Define variable for background color for examples */
+/* Define colors for light and dark mode */
:root {
/* Default light mode colors */
- --background-color: #ffffff; /* White background */
+ --background-color: white;
--text-color: black;
--example-background-color: rgb(238,238,255);
--link-color: #00f;
@@ -61,6 +61,7 @@ a:hover, span.button:hover {
background-color: var(--hover-background-color);
color: var(--hover-color);
}
+/*
div.textbox {
border: solid;
border-width: thin;
@@ -76,6 +77,7 @@ div.synopsisbox {
padding-top: 1em 2em;
background: var(--div-synopsisbox-background-color);
}
+*/
pre.example, pre.example-preformatted {
border: var(--pre-example-border);
color: var(--text-color);
commit 4bfce99888373c3a98f28d070b7e03136d446877
Author: Raymond Toy <toy...@gm...>
Date: Mon Nov 24 13:15:11 2025 -0800
Use CSS variables to set the colors for light and dark mode
Instead of having a completely separate @media section for dark mode,
use variables to define the colors for light and dark modes.
This makes the CSS file smaller and hopefully, it will be easier set
colors for the different modes since all the info is in basically one
place instead of duplicating all the different elements into a
separate @media for dark mode.
diff --git a/doc/info/manual.css b/doc/info/manual.css
index 674e23ae7..2947b0145 100644
--- a/doc/info/manual.css
+++ b/doc/info/manual.css
@@ -1,10 +1,36 @@
/* Define variable for background color for examples */
:root {
+ /* Default light mode colors */
+ --background-color: #ffffff; /* White background */
+ --text-color: black;
--example-background-color: rgb(238,238,255);
+ --link-color: #00f;
+ --link-visited-color: #a0a;
+ --hover-background-color: #555753;
+ --hover-color: #cdf;
+ --nav-panel-background-color: #CDCCDD;
+ --div-titlebox-background-color: rgb(200,255,255);
+ --div-synopsisbox-backgraound-color: rgb(255,220,255);
+ --pre-example-border: 1px solid rgb(180,180,180);
+ --div-categorybox-border: 1px solid gray;
+ --div-categorybox-background-color: #fdf6e3;
}
@media (prefers-color-scheme: dark) {
:root {
+ /* Dark Mode Overrides */
+ --background-color: #444;
+ --text-color: #eee;
--example-background-color: #aab;
+ --link-color: #9df;
+ --link-visited-color: #9fd;
+ --hover-background-color: #ddd;
+ --hover-color: #55f;
+ --nav-panel-background-color: #555;
+ --div-titlebox-background-color: black;
+ --div-synopsisbox-backgraound-color: black;
+ --pre-example-border: 1px solid black;
+ --div-categorybox-border: 1px solid gray;
+ --div-categorybox-background-color: #544;
}
}
@@ -17,8 +43,8 @@ div.example {
/* end of overrides */
body {
- color: black;
- background: white;
+ color: var(--text-color);
+ background: var(--background-color);
margin-left: 5px;
margin-right: 5px;
font-family: Arial, Verdana, Helvetica, sans-serif
@@ -28,12 +54,12 @@ h2 { font-size: 125% }
h3 { font-size: 110% }
a:link {
text-decoration: none;
- color: #00f
+ color: var(--link-color);
}
-a:visited {color: #a0a }
+a:visited {color: var(--link-visited-color) }
a:hover, span.button:hover {
- background-color: #555753;
- color: #cdf;
+ background-color: var(--hover-background-color);
+ color: var(--hover-color);
}
div.textbox {
border: solid;
@@ -43,15 +69,16 @@ div.textbox {
div.titlebox {
border: none;
padding-top: 1em 2em;
- background: rgb(200,255,255)
+ background: var(--div-titlebox-background-color);
}
div.synopsisbox {
border: none;
padding-top: 1em 2em;
- background: rgb(255,220,255)
+ background: var(--div-synopsisbox-background-color);
}
pre.example, pre.example-preformatted {
- border: 1px solid rgb(180,180,180);
+ border: var(--pre-example-border);
+ color: var(--text-color);
padding: 5px;
background-color: var(--example-background-color);
/* Add scrollbar for examples for narrow windows */
@@ -70,9 +97,9 @@ div.highlight {
div.spacerbox { border: none; padding: 2em 0 }
div.image { margin: 0; padding: 1em; text-align: center }
div.categorybox {
- border: 1px solid gray;
+ border: var(--div-categorybox-border);
padding: 1em;
- background: #fdf6e3
+ background: var(--div-categorybox-background-color);
}
img {
max-width:80%;
@@ -88,7 +115,7 @@ tt, code { font-family: "Courier New", "DejaVu Sans Mono", monospace }
* Texinfo 7.1 and later uses div.nav-panel. 6.8 uses div.header.
*/
div.header, div.nav-panel {
- background-color: #CDCCDD;
+ background-color: var(--nav-panel-background-color);
padding: 3px 10px;
}
@@ -117,6 +144,7 @@ dd { margin-left: 0.5em }
dd { margin-left: 1.5em }
}
@media (prefers-color-scheme: dark) {
+/*
body {
background: #444;
color: #eee
@@ -141,7 +169,11 @@ dd { margin-left: 0.5em }
background-color: var(--example-background-color) !important;
}
div.categorybox { background-color: #544 }
- div.textbox, div.titlebox, div.synopsisbox { color: black;}
+*/
+/*
+ div.textbox, div.titlebox, div.synopsisbox {
+ color: var(--div-titlebox-background-color);}
+*/
}
/* CSS for pygment highlighting */
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 105 +---------------------------------------------
doc/info/manual.css | 114 ++++++++++++++++++++++++++++----------------------
src/command-line.lisp | 3 --
src/globals.lisp | 3 +-
src/maxima-build.lisp | 3 +-
5 files changed, 66 insertions(+), 162 deletions(-)
hooks/post-receive
--
Maxima CAS
|