(math-compose-expr): Allow multiline matrices in TeX mode.

1 files changed, 14 insertions, 4 deletions

diff --git a/lisp/calc/calccomp.el b/lisp/calc/calccomp.el
index dc46159b09b..26ae8c1975c 100644
--- a/lisp/calc/calccomp.el
+++ b/lisp/calc/calccomp.el
@@ -266,12 +266,22 @@
               (if (or calc-full-vectors (< (length a) 7))
                   (if (and (eq calc-language 'tex)
                            (math-matrixp a))
-                      (append '(horiz "\\matrix{ ")
-                              (math-compose-tex-matrix (cdr a))
-                              '(" }"))
+                      (if (and (integerp calc-language-option)
+                               (or (= calc-language-option 0)
+                                   (> calc-language-option 1)
+                                   (< calc-language-option -1)))
+                          (append '(vleft 0 "\\matrix{")
+                                  (math-compose-tex-matrix (cdr a))
+                                  '("}"))
+                        (append '(horiz "\\matrix{ ")
+                                (math-compose-tex-matrix (cdr a))
+                                '(" }")))
                     (if (and (eq calc-language 'latex)
                              (math-matrixp a))
-                        (if (memq calc-language-option '(-2 0 2))
+                        (if (and (integerp calc-language-option)
+                                 (or (= calc-language-option 0)
+                                     (> calc-language-option 1)
+                                     (< calc-language-option -1)))
                             (append '(vleft 0 "\\begin{pmatrix}")
                                     (math-compose-tex-matrix (cdr a))
                                     '("\\end{pmatrix}"))