Menu
▾
▴
[Stack-cvs] stack-1-0/scripts/maxima multiply_cross.lisp,NONE,1.1 multiply_dot.lisp,NONE,1.1 stackmaxima.mac,1.48,1.49 stacktex.lisp,1.2,1.3
|
From: Chris S. <san...@us...> - 2005-11-17 21:54:27
|
Update of /cvsroot/stack/stack-1-0/scripts/maxima In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22101/scripts/maxima Modified Files: stackmaxima.mac stacktex.lisp Added Files: multiply_cross.lisp multiply_dot.lisp Log Message: Lots of small changes - switching simplification off finally. Changes to help MathML, add the multiplication sign option. Index: stackmaxima.mac =================================================================== RCS file: /cvsroot/stack/stack-1-0/scripts/maxima/stackmaxima.mac,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** stackmaxima.mac 15 Nov 2005 09:38:01 -0000 1.48 --- stackmaxima.mac 17 Nov 2005 21:54:19 -0000 1.49 *************** *** 36,40 **** set_plot_option([run_viewer,false]); set_plot_option([plot_format, gnuplot]); ! set_plot_option([nticks, 20]); set_plot_option([adapt_depth, 20]); --- 36,40 ---- set_plot_option([run_viewer,false]); set_plot_option([plot_format, gnuplot]); ! set_plot_option([nticks, 50]); set_plot_option([adapt_depth, 20]); *************** *** 86,89 **** --- 86,96 ---- make_complexJ(OPT_COMPLEXJ) := if OPT_COMPLEXJ=j then (j:%i,load("complexj.lisp")); + /* Makes multiplication signs look correct */ + make_multsgn(OPT_MULTSGN) := block( + if OPT_MULTSGN=cross then load("multiply_cross.lisp"), + if OPT_MULTSGN=dot then load("multiply_dot.lisp") + ); + + /* ARRGH! */ /* texput("<<",[" {\\color{red} ", " } ", " " ],matchfix); */ *************** *** 153,157 **** str:mathml(expr,false), /* string display */ ! if str="String" then str:string(expr), /* If no correct options have been set */ if str="" then str:string(expr), --- 160,164 ---- str:mathml(expr,false), /* string display */ ! if OPT_OUTPUT="String" then str:string(expr), /* If no correct options have been set */ if str="" then str:string(expr), *************** *** 245,249 **** tfn:concat(TMP_IMAGE_DIR,filename,".plt"), afn:concat("'",IMAGE_DIR,filename,".",ffmt,"'"), ! ufn:concat(" <center><img src='",URL_BASE,filename,".",ffmt,"' alt='STACK autogenerated plot' /></center> "), if OPT_OUTPUT#"MathML" then ufn:concat(" <html>",ufn,"</html> "), --- 252,256 ---- tfn:concat(TMP_IMAGE_DIR,filename,".plt"), afn:concat("'",IMAGE_DIR,filename,".",ffmt,"'"), ! ufn:concat("<center><img src='",URL_BASE,filename,".",ffmt,"' alt='STACK autogenerated plot' /></center>"), if OPT_OUTPUT#"MathML" then ufn:concat(" <html>",ufn,"</html> "), *************** *** 638,642 **** RawMark:0, FeedBack:"", AnswerNote:"Not number", keepfloat:true, /* See pg 23 */ ! ex:trigreduce(trigexpand(trigrat(SA-SB))), if numberp(ex) then if ex>0 then --- 645,649 ---- RawMark:0, FeedBack:"", AnswerNote:"Not number", keepfloat:true, /* See pg 23 */ ! ex:ev(float(trigreduce(trigexpand(trigrat(SA-SB)))),simp), if numberp(ex) then if ex>0 then *************** *** 652,656 **** RawMark:0, FeedBack:"", AnswerNote:"Not number", keepfloat:true, /* See pg 23 */ ! ex:trigreduce(trigexpand(trigrat(SA-SB))), if numberp(ex) then if ex>=0 then --- 659,663 ---- RawMark:0, FeedBack:"", AnswerNote:"Not number", keepfloat:true, /* See pg 23 */ ! ex:ev(float(trigreduce(trigexpand(trigrat(SA-SB)))),simp), if numberp(ex) then if ex>=0 then *************** *** 1364,1366 **** --- 1371,1374 ---- /* Stack expects some output */ + simp:false; print("[ Stack-Maxima started ]"); --- NEW FILE: multiply_cross.lisp --- ;; Customize Maxima's TEX() function. ;; Make %i print at a "j" ;; Chris Sangwin 19 August Jan 2005. ;; Useful files: ;; \Maxima-5.9.0\share\maxima\5.9.0\share\utils\mactex-utilities.lisp ;; \Maxima-5.9.0\share\maxima\5.9.0\src\mactex.lisp (defprop mtimes "\\times " texsym) Index: stacktex.lisp =================================================================== RCS file: /cvsroot/stack/stack-1-0/scripts/maxima/stacktex.lisp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** stacktex.lisp 21 Jun 2005 14:52:25 -0000 1.2 --- stacktex.lisp 17 Nov 2005 21:54:19 -0000 1.3 *************** *** 20,23 **** --- 20,27 ---- (append l r)) + ;; Define an explicit multipliction + ;;(defprop mtimes "\\times " texsym) + ;;(defprop mtimes "\\cdot " texsym) + ;; To use the LaTeX matrix style using the array environment, define tex-matrix as ;; Chris Sangwin 24/1/2004 --- NEW FILE: multiply_dot.lisp --- ;; Customize Maxima's TEX() function. ;; Make %i print at a "j" ;; Chris Sangwin 19 August Jan 2005. ;; Useful files: ;; \Maxima-5.9.0\share\maxima\5.9.0\share\utils\mactex-utilities.lisp ;; \Maxima-5.9.0\share\maxima\5.9.0\src\mactex.lisp (defprop mtimes "\\cdot " texsym) |
