[Stack-cvs] stack-1-0/scripts/maxima complexj.lisp,1.1,1.2 stackmaxima.mac,1.26,1.27

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/stack/stack-1-0/scripts/maxima
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17646/scripts/maxima

Modified Files:
	stackmaxima.mac 
Added Files:
	complexj.lisp 
Log Message:
Merging of Paul Kiddie's work into main STACK HEAD branch

Index: stackmaxima.mac
===================================================================
RCS file: /cvsroot/stack/stack-1-0/scripts/maxima/stackmaxima.mac,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** stackmaxima.mac	17 Aug 2005 11:35:36 -0000	1.26
--- stackmaxima.mac	25 Aug 2005 16:06:17 -0000	1.27
***************
*** 19,22 ****
--- 19,24 ----
  FPPREC:16;       /* Work with 16 digits */
  
+ ASSUME_POS:TRUE;
+ 
  %E_TO_NUMLOG:TRUE;
   /* "r" some rational number, and "x" some expression, %E^(r*LOG(x)) => x^r .*/
***************
*** 78,81 ****
--- 80,86 ----
  load("stacktex.lisp"); /* Loads LaTeX adaptions and preferences */ 
  
+ complexj:TRUE;
+ if complexj then (j:%i,load("complexj.lisp")) else i:%i; /* Makes a complex j if needed */ 
+ 
  /* ARRGH! */
  /* texput("<<",[" {\\color{red} ", " } ", " " ],matchfix); */
***************
*** 205,209 ****
  
  plot(ex,[ra]) :=  /*stack_web_plot*/
!     BLOCK([tfn,afn,ufn,lvs,preamble,sysp,sysr,filename],
      lvs:listofvars(ex),
      if length(lvs)#1 then
--- 210,215 ----
  
  plot(ex,[ra]) :=  /*stack_web_plot*/
!     BLOCK([tfn,afn,ufn,lvs,ffmt,preamble,sysp,sysr,filename],
!     ffmt:"gif",
      lvs:listofvars(ex),
      if length(lvs)#1 then
***************
*** 211,219 ****
      filename:CONCAT("stackplot",string(rand(10^8))), 
      tfn:CONCAT(TMP_IMAGE_DIR,filename,".plt"),
!     afn:CONCAT("'",IMAGE_DIR,filename,".png","'"),
!     if OPT_OUTPUT="MathML" then 
!       ufn:CONCAT(" <center><img src='",URL_BASE,filename,".png' alt='STACK autogenerated plot' /></center> ")
!     else 
!       ufn:CONCAT(" <html><center><img src='",URL_BASE,filename,".png' alt='STACK autogenerated plot' /></center></html> "),
  
   /* Removed on Windows: cd '",IMAGE_DIR,"' */
--- 217,224 ----
      filename:CONCAT("stackplot",string(rand(10^8))), 
      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> "),
  
   /* Removed on Windows: cd '",IMAGE_DIR,"' */
***************
*** 221,225 ****
  set zeroaxis
  set grid 
! set terminal png transparent size 450,300
  set output ",afn),
  
--- 226,230 ----
  set zeroaxis
  set grid 
! set terminal ",ffmt," transparent size 450,300
  set output ",afn),
  
***************
*** 558,562 ****
  
  /* An answer test based expandp(sa). */
! ATExpanded(SA) := 
      BLOCK([KEEPFLOAT,RawMark,FeedBack,AnswerNote,str],
      RawMark:0, FeedBack:"", AnswerNote:"",
--- 563,568 ----
  
  /* An answer test based expandp(sa). */
! /* Note, the TA is a dummy to allow one mechanism for calling functions */
! ATExpanded(SA,TA) := 
      BLOCK([KEEPFLOAT,RawMark,FeedBack,AnswerNote,str],
      RawMark:0, FeedBack:"", AnswerNote:"",

--- NEW FILE: complexj.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 $%i "j" texword)