Update copyright date.

[gnu-emacs] / lisp / calc / calccomp.el

diff --git a/lisp/calc/calccomp.el b/lisp/calc/calccomp.el
index dc46159b09b4a40b8bd876611daee90f51922f04..305e155843e8632fd93718c77ac36b4f3fca06ca 100644 (file)
--- a/lisp/calc/calccomp.el
+++ b/lisp/calc/calccomp.el
@@ -35,7 +35,9 @@
   '( calcFunc-log
      calcFunc-ln calcFunc-exp
      calcFunc-sin calcFunc-cos calcFunc-tan
+     calcFunc-sec calcFunc-csc calcFunc-cot
      calcFunc-sinh calcFunc-cosh calcFunc-tanh
+     calcFunc-sech calcFunc-csch calcFunc-coth
      calcFunc-arcsin calcFunc-arccos calcFunc-arctan
      calcFunc-arcsinh calcFunc-arccosh calcFunc-arctanh))
 
@@ -266,12 +268,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}"))
@@ -898,7 +910,7 @@
                       (setq func (substring func 0 (- n)))
                       (while (>= (setq n (1- n)) 0)
                         (setq func (concat func " prime")))))
-                (cond ((and (eq calc-language '(tex latex))
+                (cond ((and (memq calc-language '(tex latex))
                             (or (> (length a) 2)
                                 (not (math-tex-expr-is-flat (nth 1 a)))))
                        (setq left "\\left( "