changeset 69207:5ebe6d04f2e5

(math-compose-tex-matrix): Add a latex option. (math-compose-expr): Use latex option when calling math-compose-tex-matrix for latex mode.
author Jay Belanger <jay.p.belanger@gmail.com>
date Tue, 28 Feb 2006 14:27:04 +0000
parents 3fc5f80af468
children 658f0dc9c1dc
files lisp/calc/calccomp.el
diffstat 1 files changed, 6 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/calc/calccomp.el	Tue Feb 28 08:14:44 2006 +0000
+++ b/lisp/calc/calccomp.el	Tue Feb 28 14:27:04 2006 +0000
@@ -286,10 +286,10 @@
                                      (> calc-language-option 1)
                                      (< calc-language-option -1)))
                             (append '(vleft 0 "\\begin{pmatrix}")
-                                    (math-compose-tex-matrix (cdr a))
+                                    (math-compose-tex-matrix (cdr a) t)
                                     '("\\end{pmatrix}"))
                           (append '(horiz "\\begin{pmatrix} ")
-                                  (math-compose-tex-matrix (cdr a))
+                                  (math-compose-tex-matrix (cdr a) t)
                                   '(" \\end{pmatrix}")))
                       (if (and (eq calc-language 'eqn)
                                (math-matrixp a))
@@ -1015,10 +1015,11 @@
 		(math-compose-expr (car a) math-comp-vector-prec)
 		(concat " " math-comp-right-bracket)))))
 
-(defun math-compose-tex-matrix (a)
+(defun math-compose-tex-matrix (a &optional ltx)
   (if (cdr a)
-      (cons (append (math-compose-vector (cdr (car a)) " & " 0) '(" \\\\ "))
-            (math-compose-tex-matrix (cdr a)))
+      (cons (append (math-compose-vector (cdr (car a)) " & " 0) 
+                    (if ltx '(" \\\\ ") '(" \\cr ")))
+            (math-compose-tex-matrix (cdr a) ltx))
     (list (math-compose-vector (cdr (car a)) " & " 0))))
 
 (defun math-compose-eqn-matrix (a)