[Stack-cvs] stack-dev/maxima stacktex.lisp,1.5,1.5.8.1

[Chris S. <san...@us...>]

Update of /cvsroot/stack/stack-dev/maxima
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv24152/maxima

Modified Files:
      Tag: STACK2_2
	stacktex.lisp 
Log Message:
Bug with display of inequalities fixed

Index: stacktex.lisp
===================================================================
RCS file: /cvsroot/stack/stack-dev/maxima/stacktex.lisp,v
retrieving revision 1.5
retrieving revision 1.5.8.1
diff -C2 -d -r1.5 -r1.5.8.1
*** stacktex.lisp	28 Oct 2009 14:03:07 -0000	1.5
--- stacktex.lisp	27 Sep 2010 10:54:33 -0000	1.5.8.1
***************
*** 1,13 ****
  ;; Customize Maxima's TEX() function.  To give better control to the output.
! ;; Chris Sangwin 21 Jan 2009.
! ;; 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
  
  ;; Additional mactex utilities taken from the distributed file
  ;; mactex-utilities.lisp
! ;; Based on code by Richard J. Fateman,  copyright 1987. 
! ;; Fateman's code was ported to Common Lisp by William 
! ;; Schelter.  
  
  ;; If you want LaTeX style quotients, first load mactex and second
--- 1,13 ----
  ;; Customize Maxima's TEX() function.  To give better control to the output.
! ;; Chris Sangwin 27 Sept 2010.
! ;; Useful files:
! ;; \Maxima-5.21.1\share\maxima\5.21.1\share\utils\mactex-utilities.lisp
! ;; \Maxima-5.21.1\share\maxima\5.21.1\src\mactex.lisp
  
  ;; Additional mactex utilities taken from the distributed file
  ;; mactex-utilities.lisp
! ;; Based on code by Richard J. Fateman,  copyright 1987.
! ;; Fateman's code was ported to Common Lisp by William
! ;; Schelter.
  
  ;; If you want LaTeX style quotients, first load mactex and second
***************
*** 39,46 ****
  
  (defun tex-matrix (x l r) ;; matrix looks like ((mmatrix)((mlist) a b) ...)
!   (append l `("\\left[\\begin{array}{") 
               (tex-matrix-col-count x "c") ; Replace every column with a "c"
              `("} ")
!      ; Below is the bit we need - forms the array     
       (mapcan #'(lambda(y) (tex-list (cdr y) nil (list " \\\\ ") " & ")) (cdr x))
       '("\\end{array}\\right]") r)
--- 39,46 ----
  
  (defun tex-matrix (x l r) ;; matrix looks like ((mmatrix)((mlist) a b) ...)
!   (append l `("\\left[\\begin{array}{")
               (tex-matrix-col-count x "c") ; Replace every column with a "c"
              `("} ")
!      ; Below is the bit we need - forms the array
       (mapcan #'(lambda(y) (tex-list (cdr y) nil (list " \\\\ ") " & ")) (cdr x))
       '("\\end{array}\\right]") r)
***************
*** 64,68 ****
    (tex (cadr x) (append l (texsym (caar x)))  r 'mparen 'mparen))
  
!  
  (defprop &? ("?") texsym)
  
--- 64,68 ----
    (tex (cadr x) (append l (texsym (caar x)))  r 'mparen 'mparen))
  
! 
  (defprop &? ("?") texsym)
  
***************
*** 141,142 ****
--- 141,149 ----
  	((eql (elt x 0) #\\) x)
  	(t (concatenate 'string "\\mbox{" x "}"))))
+ 
+ 
+ ;; Sort out display on inequalitis
+ ;; Chris Sangwin, 21/9/2010
+ 
+ (defprop mlessp (" < ") texsym)
+ (defprop mgreaterp (" > ") texsym)
\ No newline at end of file