From 055ca5559c4e0e235456e6957a8ea2c0fb876713 Mon Sep 17 00:00:00 2001
From: Robert Dodier <robert_dodier@users.sourceforge.net>
Date: Sat, 21 Jan 2023 22:14:18 -0800
Subject: [PATCH] In share package mathml, revise test script, and general
 cleanup.

Revise test script mathmltest:

 * get script running again
 * format input and output expressions as MathML
 * output file is now tmp-mathmltest-output.xml
 * new minimal example.mac to serve as input for test script
 * cut out stuff about Internet Explorer from test script
 * remove file containing XML entity data for Internet Explorer

General cleanup:

 * extract Texinfo from patch file into new, minimal Texinfo file
 * remove patch file (ignoring changes to other parts of Maxima)
 * update README to remove obsolete text
---
 share/contrib/lurkmathml/README                 |  21 +-
 share/contrib/lurkmathml/example.mac            |   5 +
 share/contrib/lurkmathml/mathml.texi            |  80 ++++++
 share/contrib/lurkmathml/mathml_ref_list_for_IE |  44 ---
 share/contrib/lurkmathml/mathmltest             | 120 ++++----
 share/contrib/lurkmathml/maximadiffs.txt        | 351 ------------------------
 6 files changed, 143 insertions(+), 478 deletions(-)
 rewrite share/contrib/lurkmathml/README (85%)
 create mode 100644 share/contrib/lurkmathml/example.mac
 create mode 100644 share/contrib/lurkmathml/mathml.texi
 delete mode 100644 share/contrib/lurkmathml/mathml_ref_list_for_IE
 rewrite share/contrib/lurkmathml/mathmltest (70%)
 delete mode 100644 share/contrib/lurkmathml/maximadiffs.txt

diff --git a/share/contrib/lurkmathml/README b/share/contrib/lurkmathml/README
dissimilarity index 85%
index 80411e449..da03cdcdd 100644
--- a/share/contrib/lurkmathml/README
+++ b/share/contrib/lurkmathml/README
@@ -1,15 +1,6 @@
-This is David Drysdale's mathml package for Maxima,
-based off of mactex.lisp
-
-License: GPL
-
-The diffs in the .txt file are against the 5.9.0rc3 code,
-and may not be current.
-
-Instructions:
- At the maxima command prompt, type mathml(<expression>);  
- or mathml(<label>); or mathml(<expr-or-label>, <file-name>);  
- In the case of a label, an equation-number will also be produced.
- in case a file-name is supplied, the output will be sent
- (perhaps appended) to that file.
-
+This is David Drysdale's mathml package for Maxima,
+based on mactex.lisp.
+
+License: GPL
+
+Documentation in mathml.texi.
diff --git a/share/contrib/lurkmathml/example.mac b/share/contrib/lurkmathml/example.mac
new file mode 100644
index 000000000..2fdde9b1a
--- /dev/null
+++ b/share/contrib/lurkmathml/example.mac
@@ -0,0 +1,5 @@
+foo: 3^5;
+bar: 3^5 + x^5 $
+baz: expand ((2 - a)^4) $
+baz - bar*foo;
+abc^(foo + bar + baz) $
diff --git a/share/contrib/lurkmathml/mathml.texi b/share/contrib/lurkmathml/mathml.texi
new file mode 100644
index 000000000..d94b2168e
--- /dev/null
+++ b/share/contrib/lurkmathml/mathml.texi
@@ -0,0 +1,80 @@
+\input texinfo
+
+@setfilename mathml.info
+@settitle Package mathml
+
+@ifinfo
+@macro var {expr}
+<\expr\>
+@end macro
+@end ifinfo
+
+@dircategory Mathematics/Maxima
+@direntry
+* Package mathml: (maxima)Maxima share package mathml to generate Presentation MathML.
+@end direntry
+
+@node Top, Definitions for package mathml, (dir), (dir)
+@top
+@menu
+* Definitions for package mathml::
+@end menu
+@chapter Package mathml
+
+@node Definitions for package mathml, Top, Top, Top
+@section Definitions for package mathml
+
+@defun mathml (@var{expr})
+@defunx mathml (@var{expr}, @var{filename})
+@defunx mathml (@var{label}, @var{filename})
+
+Convert an expression to Presentation MathML (version 2).
+
+When the first argument is a label,
+the label and its associated value are printed verbatim,
+not typeset as MathML.
+
+When the optional argument @var{filename} is supplied,
+any output will be appended to the file.
+
+@code{load("mathml");} loads this package.
+
+Examples:
+
+@example
+(%i1) load ("mathml") $
+(%i2) mathml (integrate (sin(x), x));
+<math xmlns="http://www.w3.org/1998/Math/MathML"> <mo>-</mo>
+ <mi>cos</mi> <mi>x</mi> </math>
+(%o2)                         false
+(%i3) integrate (1/(1 + x^3), x);
+                                   2 x - 1
+                2             atan(-------)
+           log(x  - x + 1)         sqrt(3)    log(x + 1)
+(%o3)   (- ---------------) + ------------- + ----------
+                  6              sqrt(3)          3
+(%i4) mathml (%o3);
+<pre>
+(%O3) (-log(x^2-x+1)/6)+atan((2*x-1)/sqrt(3))/sqrt(3)+log(x+1)/3;
+</pre>
+(%o4)                         (%o3)
+(%i5) mathml (''%o3);
+
+ <math xmlns="http://www.w3.org/1998/Math/MathML"> <mo>-</mo>
+ <mfrac><mrow><mi>log</mi> <mfenced separators=""><msup><mrow>
+ <mi>x</mi> </mrow> <mn>2</mn> </msup> <mo>-</mo> <mi>x</mi> 
+ <mo>+</mo> <mn>1</mn> </mfenced> </mrow> <mrow><mn>6</mn> 
+ </mrow></mfrac> <mo>+</mo> <mfrac><mrow><mi>arctan</mi> 
+ <mfenced separators=""><mfrac><mrow><mn>2</mn> 
+ <mspace width="thinmathspace"/><mi>x</mi> <mo>-</mo> <mn>1</mn> 
+ </mrow> <mrow><msqrt><mn>3</mn> </msqrt></mrow></mfrac> </mfenced> 
+ </mrow> <mrow><msqrt><mn>3</mn> </msqrt></mrow></mfrac> <mo>+</mo> 
+ <mfrac><mrow><mi>log</mi> <mfenced separators=""><mi>x</mi> 
+ <mo>+</mo> <mn>1</mn> </mfenced> </mrow> <mrow><mn>3</mn> 
+ </mrow></mfrac> </math>
+(%o5)                         false
+(%i6) mathml (''%o3, "/tmp/tmp.xml");
+(%o6)                         false
+@end example
+@end defun
+@bye
diff --git a/share/contrib/lurkmathml/mathml_ref_list_for_IE b/share/contrib/lurkmathml/mathml_ref_list_for_IE
deleted file mode 100644
index fdc405912..000000000
--- a/share/contrib/lurkmathml/mathml_ref_list_for_IE
+++ /dev/null
@@ -1,44 +0,0 @@
-<!ENTITY alpha    "&#945;" ><!-- greek small letter alpha, U+03B1 ISOgrk3 -->
-<!ENTITY and      "&#8743;" ><!-- logical and = wedge, U+2227 ISOtech -->
-<!ENTITY beta     "&#946;" ><!-- greek small letter beta, U+03B2 ISOgrk3 -->
-<!ENTITY chi      "&#967;" ><!-- greek small letter chi, U+03C7 ISOgrk3 -->
-<!ENTITY ctdot            "&#x022EF;" ><!--/cdots, three dots, centered -->
-<!ENTITY delta    "&#948;" ><!-- greek small letter delta, U+03B4 ISOgrk3 -->
-<!ENTITY DifferentialD    "&#x02146;" ><!--d for use in differentials, e.g., within integrals -->
-<!ENTITY epsilon  "&#949;" ><!-- greek small letter epsilon, U+03B5 ISOgrk3 -->
-<!ENTITY eta      "&#951;" ><!-- greek small letter eta, U+03B7 ISOgrk3 -->
-<!ENTITY ExponentialE     "&#x02147;" ><!--e use for the exponential base of the natural logarithms -->
-<!ENTITY gamma    "&#947;" ><!-- greek small letter gamma, U+03B3 ISOgrk3 -->
-<!ENTITY Gamma    "&#915;" ><!-- greek capital letter gamma, U+0393 ISOgrk3 -->
-<!ENTITY ge       "&#8805;" ><!-- greater-than or equal to, U+2265 ISOtech -->
-<!ENTITY gt      "&#62;" ><!-- greater-than sign, U+003E ISOnum -->
-<!ENTITY ImaginaryI       "&#x02148;" ><!--i for use as a square root of -1 -->
-<!ENTITY infin    "&#8734;" ><!-- infinity, U+221E ISOtech -->
-<!ENTITY int      "&#8747;" ><!-- integral, U+222B ISOtech -->
-<!ENTITY iota     "&#953;" ><!-- greek small letter iota, U+03B9 ISOgrk3 -->
-<!ENTITY isin     "&#8712;" ><!-- element of, U+2208 ISOtech -->
-<!ENTITY kappa    "&#954;" ><!-- greek small letter kappa, U+03BA ISOgrk3 -->
-<!ENTITY lambda   "&#955;" ><!-- greek small letter lambda, U+03BB ISOgrk3 -->
-<!ENTITY Laplacetrf       "&#x02112;" ><!--Laplace transform -->
-<!ENTITY le       "&#8804;" ><!-- less-than or equal to, U+2264 ISOtech -->
-<!ENTITY mu       "&#956;" ><!-- greek small letter mu, U+03BC ISOgrk3 -->
-<!ENTITY not    "&#172;" ><!-- not sign, U+00AC ISOnum -->
-<!ENTITY nu       "&#957;" ><!-- greek small letter nu, U+03BD ISOgrk3 -->
-<!ENTITY omega    "&#969;" ><!-- greek small letter omega, U+03C9 ISOgrk3 -->
-<!ENTITY or       "&#8744;" ><!-- logical or = vee, U+2228 ISOtech -->
-<!ENTITY PartialD         "&#x02202;" ><!--alias ISOTECH part -->
-<!ENTITY phi      "&#966;" ><!-- greek small letter phi, U+03C6 ISOgrk3 -->
-<!ENTITY pi       "&#960;" ><!-- greek small letter pi, U+03C0 ISOgrk3 -->
-<!ENTITY prod     "&#8719;" ><!-- n-ary product = product sign, U+220F ISOamsb -->
-<!ENTITY psi      "&#968;" ><!-- greek small letter psi, U+03C8 ISOgrk3 -->
-<!ENTITY rarr     "&#8594;" ><!-- rightwards arrow, U+2192 ISOnum -->
-<!ENTITY rho      "&#961;" ><!-- greek small letter rho, U+03C1 ISOgrk3 -->
-<!ENTITY rightarrow       "&#x02192;" ><!--alias ISONUM rarr -->
-<!ENTITY sigma    "&#963;" ><!-- greek small letter sigma, U+03C3 ISOgrk3 -->
-<!ENTITY sum      "&#8721;" ><!-- n-ary sumation, U+2211 ISOamsb -->
-<!ENTITY tau      "&#964;" ><!-- greek small letter tau, U+03C4 ISOgrk3 -->
-<!ENTITY theta    "&#952;" ><!-- greek small letter theta, U+03B8 ISOgrk3 -->
-<!ENTITY times  "&#215;" ><!-- multiplication sign, U+00D7 ISOnum -->
-<!ENTITY upsilon  "&#965;" ><!-- greek small letter upsilon, U+03C5 ISOgrk3 -->
-<!ENTITY xi       "&#958;" ><!-- greek small letter xi, U+03BE ISOgrk3 -->
-<!ENTITY zeta     "&#950;" ><!-- greek small letter zeta, U+03B6 ISOgrk3 -->
diff --git a/share/contrib/lurkmathml/mathmltest b/share/contrib/lurkmathml/mathmltest
dissimilarity index 70%
index 414999480..ce5400249 100755
--- a/share/contrib/lurkmathml/mathmltest
+++ b/share/contrib/lurkmathml/mathmltest
@@ -1,68 +1,52 @@
-#!/bin/sh
-
-if [ $# -lt 1 ]; then
-  echo "Need to pass in names of Maxima test files to use"
-  exit 1
-fi
-
-# First, build up the Maxima batch file
-rm -f mathmltest.mac
-for i in $@
-do
-  # The following is easy but does not cope with multiline test output
-  # sed 's/.*\$$/tmp:%;mathml(tmp,"mathmltest.xml");tmp;/' $i >> mathmltest.mac
-
-  echo "/* $i */" >> mathmltest.mac
-  awk '{line[count]=$0; count++;}
-       /; *$/ {lastsemicolonline=NR; 
-               for (i=0; i < count; i++) print line[i];
-               delete line;
-               count=0;}
-       /\$ *$/ {lastdollarline=NR; 
-                count=0;
-                print "tmp:%;mathml(tmp,\"mathmltest.xml\");tmp;"}' $i >> mathmltest.mac
-done
-
-# Now run Maxima over the test file, to produce mathmltest.xml
-rm -f mathmltest.xml mathmltest_ie.xml
-../maxima-local -b mathmltest.mac
-
-# Now insert some paragraph breaks
-sed 's/<pre>/<p\/><pre>/' mathmltest.xml > tmp$$
-sed 's/<math/<p\/><math/' tmp$$ > mathmltest.xml
-rm tmp$$
-
-# Put in XHTML epilog
-echo "</body>
-</html>" >> mathmltest.xml
-
-# Make into XHTML for IE 
-echo "<?xml version=\"1.0\"?>
-<?xml-stylesheet type=\"text/xsl\" href=\"pmathml.xsl\"?>
-<!DOCTYPE html 
-[
-  <!ENTITY mathml \"http://www.w3.org/1998/Math/MathML\">" >> mathmltest_ie.xml
-cat mathml_ref_list >> mathmltest_ie.xml
-echo "]>  
-<html xmlns=\"http://www.w3.org/1999/xhtml\" lang=\"en\" xml:lang=\"en\">
-<head>
-<title>Maxima MathML Output Test Page</title>
-</head>
-<body>" >> mathmltest_ie.xml
-cat mathmltest.xml >> mathmltest_ie.xml
-
-# Make into XHTML for normal browsers
-echo "<?xml version=\"1.0\"?>
-<?xml-stylesheet type=\"text/xsl\" href=\"pmathml.xsl\"?>
-<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1 plus MathML 2.0//EN\"
-               \"http://www.w3.org/TR/MathML2/dtd/xhtml-math11-f.dtd\"
-[
-  <!ENTITY mathml \"http://www.w3.org/1998/Math/MathML\">
-]>  
-<html xmlns=\"http://www.w3.org/1999/xhtml\" lang=\"en\" xml:lang=\"en\">
-<head>
-<title>Maxima MathML Output Test Page</title>
-</head>
-<body>" > tmp$$.xml
-cat mathmltest.xml >> tmp$$.xml
-mv tmp$$.xml mathmltest.xml
+#!/bin/sh
+
+if [ $# -lt 1 ]; then
+  echo "$0: no Maxima input files specified."
+  exit 1
+fi
+
+# First, build up the Maxima batch file
+rm -f tmp-mathmltest-input.mac
+echo "load (mathml);" > tmp-mathmltest-input.mac
+for i in $@
+do
+  echo "/* $i */" >> tmp-mathmltest-input.mac
+  awk 'BEGIN { count = 0; }
+       { line[count] = $0; count++; }
+       /; *$/ || /\$ *$/ { for (i=0; i < count; i++) print line[i];
+                           print "(tmp: %, block ([simp: false], mathml (_, \"tmp-mathmltest-output.xml\")));"
+                           print "mathml (tmp, \"tmp-mathmltest-output.xml\");"
+                           print "tmp;"
+                           delete line;
+                           count=0;
+                         }' $i >> tmp-mathmltest-input.mac
+done
+
+# Now run Maxima over the test file, to produce tmp-mathmltest-output.xml
+rm -f tmp-mathmltest-output.xml
+../../../maxima-local -b tmp-mathmltest-input.mac
+
+# Now insert some paragraph breaks
+sed 's/<pre>/<p\/><pre>/' tmp-mathmltest-output.xml > tmp$$
+sed 's/<math/<p\/><math/' tmp$$ > tmp-mathmltest-output.xml
+rm tmp$$
+
+# Make into XHTML
+echo "<?xml version=\"1.0\"?>
+<?xml-stylesheet type=\"text/xsl\" href=\"pmathml.xsl\"?>
+<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1 plus MathML 2.0//EN\"
+               \"http://www.w3.org/TR/MathML2/dtd/xhtml-math11-f.dtd\"
+[
+  <!ENTITY mathml \"http://www.w3.org/1998/Math/MathML\">
+]>  
+<html xmlns=\"http://www.w3.org/1999/xhtml\" lang=\"en\" xml:lang=\"en\">
+<head>
+<title>Maxima MathML Output Test Page</title>
+</head>
+<body>" > tmp$$.xml
+cat tmp-mathmltest-output.xml >> tmp$$.xml
+mv tmp$$.xml tmp-mathmltest-output.xml
+
+echo "</body>
+</html>" >> tmp-mathmltest-output.xml
+
diff --git a/share/contrib/lurkmathml/maximadiffs.txt b/share/contrib/lurkmathml/maximadiffs.txt
deleted file mode 100644
index b8c889b10..000000000
--- a/share/contrib/lurkmathml/maximadiffs.txt
+++ /dev/null
@@ -1,351 +0,0 @@
-diff -r -c -C 5 maxima-5.9.0rc3_orig/doc/info/Input.texi maxima-5.9.0rc3/doc/info/Input.texi
-*** maxima-5.9.0rc3_orig/doc/info/Input.texi	Sat Mar 30 06:49:22 2002
---- maxima-5.9.0rc3/doc/info/Input.texi	Sun Jan  5 17:17:20 2003
-***************
-*** 682,691 ****
---- 682,733 ----
-  the LOADFILE command is used; 'AUTOLOAD means print only when a file
-  is automatically loaded in (e.g. the integration file SIN FASL); FALSE
-  means never print the loading message.
-  
-  @end defvar
-+ @defun MATHML (expr)
-+ @defunx MATHML (expr,filename)
-+ @defunx MATHML (label,filename)
-+ 
-+ Convert an expression to Presentation MathML (v2).
-+ 
-+ In the case of a label,
-+ an equation-number will be produced.
-+ in case a file-name is supplied, the output will be appended to the
-+ file.
-+ 
-+ @example
-+ (C1) integrate(1/(1+x^3),x);
-+ 
-+ 					 2 x - 1
-+ 		       2	    ATAN(-------)
-+ 		  LOG(x  - x + 1)	 SQRT(3)    LOG(x + 1)
-+ (D1) 	        - --------------- + ------------- + ----------
-+ 			 6	       SQRT(3)	        3
-+ (C2) mathml(d1);
-+ <math xmlns="http://www.w3.org/1998/Math/MathML"> -<mfrac><mrow>
-+  <mi>log</mi> <mfenced separators=""><msup><mrow><mi>x</mi> </mrow> 
-+  <mn>2</mn> </msup> <mo>-</mo> <mi>x</mi> <mo>+</mo> <mn>1</mn> 
-+  </mfenced> </mrow> <mrow><mn>6</mn> </mrow></mfrac> <mo>+</mo> 
-+  <mfrac><mrow><mi>arctan</mi> <mfenced separators=""><mfrac><mrow>
-+  <mn>2</mn> <mspace width="thinmathspace"/><mi>x</mi> <mo>-</mo> 
-+  <mn>1</mn> </mrow> <mrow><msqrt><mn>3</mn> </msqrt></mrow></mfrac> 
-+  </mfenced> </mrow> <mrow><msqrt><mn>3</mn> </msqrt></mrow></mfrac> 
-+  <mo>+</mo> <mfrac><mrow><mi>log</mi> <mfenced separators="">
-+  <mi>x</mi> <mo>+</mo> <mn>1</mn> </mfenced> </mrow> <mrow>
-+  <mn>3</mn> </mrow></mfrac> <mspace width="verythickmathspace"/> 
-+  <mtext>(D1)</mtext> </math>
-+ (D2) 				     (D1)
-+ (C6) mathml(integrate(sin(x),x));
-+ <math xmlns="http://www.w3.org/1998/Math/MathML"> -<mi>cos</mi> 
-+  <mi>x</mi> </math>
-+ (D6) 				     FALSE
-+ (C7) mathml(d1,"/tmp/jo.xml");
-+ (D7) 				     (D1)
-+ @end example
-+ where the last expression will be appended to the file @file{/tmp/jo.xml}
-+ @end defun
-  @c @node NOSTRING, OBASE, LOADPRINT, Input and Output
-  @c @unnumberedsec phony
-  @defun NOSTRING (arg)
-  displays all input lines when playing back rather than
-  STRINGing them.  If arg is GRIND then the display will be in a more
-diff -r -c -C 5 maxima-5.9.0rc3_orig/src/Makefile.am maxima-5.9.0rc3/src/Makefile.am
-*** maxima-5.9.0rc3_orig/src/Makefile.am	Sun Oct 27 21:16:27 2002
---- maxima-5.9.0rc3/src/Makefile.am	Fri Nov 29 16:58:31 2002
-***************
-*** 191,200 ****
---- 191,201 ----
-  macsys.lisp \
-  mactex.lisp \
-  marray.lisp \
-  mat.lisp \
-  matcom.lisp \
-+ mathml.lisp \
-  matrix.lisp \
-  matrun.lisp \
-  max_ext.lisp \
-  maxima-package.lisp \
-  maxmac.lisp \
-diff -r -c -C 5 maxima-5.9.0rc3_orig/src/Makefile.in maxima-5.9.0rc3/src/Makefile.in
-*** maxima-5.9.0rc3_orig/src/Makefile.in	Tue Oct 29 22:06:15 2002
---- maxima-5.9.0rc3/src/Makefile.in	Fri Nov 29 17:01:00 2002
-***************
-*** 159,168 ****
---- 159,169 ----
-  macsys.lisp \
-  mactex.lisp \
-  marray.lisp \
-  mat.lisp \
-  matcom.lisp \
-+ mathml.lisp \
-  matrix.lisp \
-  matrun.lisp \
-  max_ext.lisp \
-  maxima-package.lisp \
-  maxmac.lisp \
-diff -r -c -C 5 maxima-5.9.0rc3_orig/src/clisp-depends.mk maxima-5.9.0rc3/src/clisp-depends.mk
-*** maxima-5.9.0rc3_orig/src/clisp-depends.mk	Sun Oct 27 19:49:39 2002
---- maxima-5.9.0rc3/src/clisp-depends.mk	Fri Nov 29 17:01:00 2002
-***************
-*** 238,247 ****
---- 238,248 ----
-  binary-clisp/maxima.mem : invert.lisp
-  binary-clisp/maxima.mem : hypgeo.lisp
-  binary-clisp/maxima.mem : hyp.lisp
-  binary-clisp/maxima.mem : todd-coxeter.lisp
-  binary-clisp/maxima.mem : mactex.lisp
-+ binary-clisp/maxima.mem : mathml.lisp
-  binary-clisp/maxima.mem : plot.lisp
-  binary-clisp/maxima.mem : autol.lisp
-  binary-clisp/maxima.mem : max_ext.lisp
-  binary-clisp/maxima.mem : autoconf-variables.lisp
-  binary-clisp/maxima.mem : init-cl.lisp
-diff -r -c -C 5 maxima-5.9.0rc3_orig/src/cmucl-depends.mk maxima-5.9.0rc3/src/cmucl-depends.mk
-*** maxima-5.9.0rc3_orig/src/cmucl-depends.mk	Sun Oct 27 19:49:37 2002
---- maxima-5.9.0rc3/src/cmucl-depends.mk	Fri Nov 29 16:57:24 2002
-***************
-*** 238,247 ****
---- 238,248 ----
-  binary-cmucl/maxima.core : invert.lisp
-  binary-cmucl/maxima.core : hypgeo.lisp
-  binary-cmucl/maxima.core : hyp.lisp
-  binary-cmucl/maxima.core : todd-coxeter.lisp
-  binary-cmucl/maxima.core : mactex.lisp
-+ binary-cmucl/maxima.core : mathml.lisp
-  binary-cmucl/maxima.core : plot.lisp
-  binary-cmucl/maxima.core : autol.lisp
-  binary-cmucl/maxima.core : max_ext.lisp
-  binary-cmucl/maxima.core : autoconf-variables.lisp
-  binary-cmucl/maxima.core : init-cl.lisp
-diff -r -c -C 5 maxima-5.9.0rc3_orig/src/gcl-depends.mk maxima-5.9.0rc3/src/gcl-depends.mk
-*** maxima-5.9.0rc3_orig/src/gcl-depends.mk	Sun Oct 27 19:49:31 2002
---- maxima-5.9.0rc3/src/gcl-depends.mk	Fri Nov 29 16:57:11 2002
-***************
-*** 237,246 ****
---- 237,247 ----
-  binary-gcl/maxima : invert.lisp
-  binary-gcl/maxima : hypgeo.lisp
-  binary-gcl/maxima : hyp.lisp
-  binary-gcl/maxima : todd-coxeter.lisp
-  binary-gcl/maxima : mactex.lisp
-+ binary-gcl/maxima : mathml.lisp
-  binary-gcl/maxima : plot.lisp
-  binary-gcl/maxima : autol.lisp
-  binary-gcl/maxima : max_ext.lisp
-  binary-gcl/maxima : autoconf-variables.lisp
-  binary-gcl/maxima : init-cl.lisp
-Only in maxima-5.9.0rc3/src: mathml.lisp
-diff -r -c -C 5 maxima-5.9.0rc3_orig/src/max_ext.lisp maxima-5.9.0rc3/src/max_ext.lisp
-*** maxima-5.9.0rc3_orig/src/max_ext.lisp	Mon Sep 23 23:32:55 2002
---- maxima-5.9.0rc3/src/max_ext.lisp	Fri Nov 29 17:00:52 2002
-***************
-*** 1,9 ****
---- 1,10 ----
-  ;;Autoloads for maxima
-  (in-package "MAXIMA")
-  
-  (AUTO-MSPEC '$TEX '|mactex|)
-+ (AUTO-MSPEC '$MATHML '|mathml|)
-  (AUTOF '$FUNCSOL '|nusum|)
-  ;(AUTOF '$NUSUML '|nusum|)
-  (AUTOF '$RFORM '|nusum|)
-  ;(AUTOF '$RFORN '|nusum|)
-  ;(AUTOF '$PRODSHIFT '|nusum|)
-diff -r -c -C 5 maxima-5.9.0rc3_orig/src/maxima.system maxima-5.9.0rc3/src/maxima.system
-*** maxima-5.9.0rc3_orig/src/maxima.system	Tue Oct 22 23:52:03 2002
---- maxima-5.9.0rc3/src/maxima.system	Fri Nov 29 17:00:19 2002
-***************
-*** 397,406 ****
---- 397,407 ----
-  			 (:file "invert")
-  			 (:file "hypgeo")
-  			 (:file "hyp")
-  			 (:file "todd-coxeter")
-  			 (:file "mactex")
-+ 			 (:file "mathml")
-  			 (:file "plot")))
-  	       (:module final :source-pathname ""
-  			;; These are not compiled, for whatever reason
-  			:load-only t
-  			:components ((:file "autol")
-Only in maxima-5.9.0rc3/tests: mathml_ref_list
-Only in maxima-5.9.0rc3/tests: mathmltest
-diff -r -c -C 5 maxima-5.9.0rc3_orig/tests/rtest11.mac maxima-5.9.0rc3/tests/rtest11.mac
-*** maxima-5.9.0rc3_orig/tests/rtest11.mac	Mon May  8 07:09:42 2000
---- maxima-5.9.0rc3/tests/rtest11.mac	Sat Jan  4 11:14:58 2003
-***************
-*** 23,37 ****
-  EXP2:diff(EXP1,X);
-  1/(3*((2*X-2^(1/3))^2/(3*2^(2/3))+1))-(2*X-2^(1/3))
-                                 /(6*2^(2/3)*(X^2-2^(1/3)*X+2^(2/3)))
-                                +1/(3*2^(2/3)*(X+2^(1/3)))$  
-  				
-! /* was 1/(3*((2*2^(2/3)*X-2)^2/12+1))-2^(1/3)*(2*2^(2/3)*X-2)
-! 			       /(12*(2^(2/3)*X^2-2*X+2*2^(1/3)))
-! 			      +2^(1/3)/(6*(X+2^(1/3)))$
-! 				which is equal
-! */				
-  radcan(EXP2);
-  1/(X^3+2)$
-  reveal(EXP1:-LOG(X^2-2^(1/3)*X+2^(2/3))/(6*2^(2/3))+ATAN((2*X-2^(1/3))/(2^(1/3)*SQRT(3)))
-  					/(2^(2/3)*SQRT(3))
-  				       +LOG(X+2^(1/3))/(3*2^(2/3)),2);
---- 23,36 ----
-  EXP2:diff(EXP1,X);
-  1/(3*((2*X-2^(1/3))^2/(3*2^(2/3))+1))-(2*X-2^(1/3))
-                                 /(6*2^(2/3)*(X^2-2^(1/3)*X+2^(2/3)))
-                                +1/(3*2^(2/3)*(X+2^(1/3)))$  
-  				
-! /* was 1/(3*((2*2^(2/3)*X-2)^2/12+1))-2^(1/3)*(2*2^(2/3)*X-2) */
-! /* 			       /(12*(2^(2/3)*X^2-2*X+2*2^(1/3))) */
-! /* 			      +2^(1/3)/(6*(X+2^(1/3)))$ */
-! /* 				which is equal */
-  radcan(EXP2);
-  1/(X^3+2)$
-  reveal(EXP1:-LOG(X^2-2^(1/3)*X+2^(2/3))/(6*2^(2/3))+ATAN((2*X-2^(1/3))/(2^(1/3)*SQRT(3)))
-  					/(2^(2/3)*SQRT(3))
-  				       +LOG(X+2^(1/3))/(3*2^(2/3)),2);
-diff -r -c -C 5 maxima-5.9.0rc3_orig/tests/rtest13.mac maxima-5.9.0rc3/tests/rtest13.mac
-*** maxima-5.9.0rc3_orig/tests/rtest13.mac	Mon May  8 07:09:42 2000
---- maxima-5.9.0rc3/tests/rtest13.mac	Sat Jan  4 11:13:49 2003
-***************
-*** 50,87 ****
-  'DIFF(G(X),X,2) = 'DIFF(F(X),X,1)-COS(X)$
-  ATVALUE('DIFF(G(X),X),X = 0,A);
-  A$
-  ATVALUE(F(X),X = 0,1);
-  1$
-! /* The matchfix stuff seems to work but is difficult for batch to parse and check
-!  MATCHFIX("{","}");
-! "{"$
-! INFIX("|");
-! "|"$
-! EXP1:{X | X > 0};
-! {X | X > 0}$
-! EXP2:{X | X < 2};
-! {X | X < 2}$
-! INFIX("OU");
-! OU$
-! INFIX("OI");
-! OI$
-! EXP1 OU EXP2;
-! {X | X > 0} OU {X | X < 2}$
-! EXP1 OU EXP2;
-! {X | X > 0} OU {X | X < 2}$
-! EXP1:{1,2,3};
-! {1,2,3}$
-! {3,4,5};
-! {3,4,5}$
-! EXP1 OU EXP1 OU %;
-! {1,2,3} OU {1,2,3} OU {3,4,5}$
-! INFIX("ou",100,100);
-! OU$
-! EXP2:INFIX("OI",120,120);
-! OI$
-! EXP1 OU EXP1 OU %;
-! {1,2,3} OU {1,2,3} OU OI$
-! REMOVE("ou",OPERATOR);
-! DONE$
-! ERRCATCH(EXP1 OU EXP2);
-! [{1,2,3} OU OI]$  */
---- 50,87 ----
-  'DIFF(G(X),X,2) = 'DIFF(F(X),X,1)-COS(X)$
-  ATVALUE('DIFF(G(X),X),X = 0,A);
-  A$
-  ATVALUE(F(X),X = 0,1);
-  1$
-! /* The matchfix stuff seems to work but is difficult for batch to parse and check */
-! /* MATCHFIX("{","}"); */
-! /* "{"$ */
-! /* INFIX("|"); */
-! /* "|"$ */
-! /* EXP1:{X | X > 0}; */
-! /* {X | X > 0}$ */
-! /* EXP2:{X | X < 2}; */
-! /* {X | X < 2}$ */
-! /* INFIX("OU"); */
-! /* OU$ */
-! /* INFIX("OI"); */
-! /* OI$ */
-! /* EXP1 OU EXP2; */
-! /* {X | X > 0} OU {X | X < 2}$ */
-! /* EXP1 OU EXP2; */
-! /* {X | X > 0} OU {X | X < 2}$ */
-! /* EXP1:{1,2,3}; */
-! /* {1,2,3}$ */
-! /* {3,4,5}; */
-! /* {3,4,5}$ */
-! /* EXP1 OU EXP1 OU %; */
-! /* {1,2,3} OU {1,2,3} OU {3,4,5}$ */
-! /* INFIX("ou",100,100); */
-! /* OU$ */
-! /* EXP2:INFIX("OI",120,120); */
-! /* OI$ */
-! /* EXP1 OU EXP1 OU %; */
-! /* {1,2,3} OU {1,2,3} OU OI$ */
-! /* REMOVE("ou",OPERATOR); */
-! /* DONE$ */
-! /* ERRCATCH(EXP1 OU EXP2); */
-! /* [{1,2,3} OU OI]$  */ 
-\ No newline at end of file
-diff -r -c -C 5 maxima-5.9.0rc3_orig/tests/rtest9a.mac maxima-5.9.0rc3/tests/rtest9a.mac
-*** maxima-5.9.0rc3_orig/tests/rtest9a.mac	Mon May  8 07:09:42 2000
---- maxima-5.9.0rc3/tests/rtest9a.mac	Sat Jan  4 11:17:05 2003
-***************
-*** 29,41 ****
-  SIN(X+(O+1/2)*%PI);
-  -COS(X)$
-  (linel:500,DIFF(EXP(X^2+Y)/(X+Y),X,2));
-  4*X^2*%E^(Y+X^2)/(Y+X)+2*%E^(Y+X^2)/(Y+X)-4*X*%E^(Y+X^2)/(Y+X)^2
-  		      +2*%E^(Y+X^2)/(Y+X)^3$
-! /* we use sconcat here, because it is not possible to compare the
-!   output from optimize which involves gensyms with something we read.
-! */
-  sconcat(OPTIMIZE(%));
-  sconcat("BLOCK([%1,%2,%3,%4],%1:Y+X,%2:X^2,%3:%E^(Y+%2),%4:1/%1,4*%2*%4*%3+2*%4*%3-4*X*%3/%1^2+2*%3/%1^3)")$
-  linel:79;
-  79$
-  LAPLACE(%E^(2*T+A)*SIN(T)*T,T,S);
---- 29,40 ----
-  SIN(X+(O+1/2)*%PI);
-  -COS(X)$
-  (linel:500,DIFF(EXP(X^2+Y)/(X+Y),X,2));
-  4*X^2*%E^(Y+X^2)/(Y+X)+2*%E^(Y+X^2)/(Y+X)-4*X*%E^(Y+X^2)/(Y+X)^2
-  		      +2*%E^(Y+X^2)/(Y+X)^3$
-! /* we use sconcat here, because it is not possible to compare the */
-! /* output from optimize which involves gensyms with something we read. */
-  sconcat(OPTIMIZE(%));
-  sconcat("BLOCK([%1,%2,%3,%4],%1:Y+X,%2:X^2,%3:%E^(Y+%2),%4:1/%1,4*%2*%4*%3+2*%4*%3-4*X*%3/%1^2+2*%3/%1^3)")$
-  linel:79;
-  79$
-  LAPLACE(%E^(2*T+A)*SIN(T)*T,T,S);
-***************
-*** 46,55 ****
-  B*LAPLACE(F(T),T,S)+A*LAPLACE(F(T),T,S)/(S^2-A^2) = 2/S^3$
-  LINSOLVE([%],['LAPLACE(F(T),T,S)]);
-  exp:['LAPLACE(F(T),T,S) = (2*S^2-2*A^2)/(B*S^5+(A-A^2*B)*S^3)]$
-  
-  /* This is ok but needs a response */
-! /*
-! ("respond POSITIVE to a*b(a*b-1) positive,negative,or zero", ILT(EV(exp[1]),S,T));
-! F(T) = -2*COSH(SQRT(A*B*(A*B-1))*T/B)/(A^3*B^2-2*A^2*B+A)
-!      +A*T^2/(A*B-1)+2/(A^3*B^2-2*A^2*B+A)$
-! */
-\ No newline at end of file
---- 45,52 ----
-  B*LAPLACE(F(T),T,S)+A*LAPLACE(F(T),T,S)/(S^2-A^2) = 2/S^3$
-  LINSOLVE([%],['LAPLACE(F(T),T,S)]);
-  exp:['LAPLACE(F(T),T,S) = (2*S^2-2*A^2)/(B*S^5+(A-A^2*B)*S^3)]$
-  
-  /* This is ok but needs a response */
-! /* ("respond POSITIVE to a*b(a*b-1) positive,negative,or zero", ILT(EV(exp[1]),S,T)); */
-! /* F(T) = -2*COSH(SQRT(A*B*(A*B-1))*T/B)/(A^3*B^2-2*A^2*B+A) */
-! /*      +A*T^2/(A*B-1)+2/(A^3*B^2-2*A^2*B+A)$ */
-\ No newline at end of file
-- 
2.11.4.GIT