(math-read-token): Read LaTeX matrices.

1 files changed, 16 insertions, 2 deletions

diff --git a/lisp/calc/calc-aent.el b/lisp/calc/calc-aent.el
index bf4f5c382e7..49aae82a950 100644
--- a/lisp/calc/calc-aent.el
+++ b/lisp/calc/calc-aent.el
@@ -763,8 +763,22 @@ in Calc algebraic input.")
                      ((eq (nth 1 code) 'punc)
                       (setq math-exp-token 'punc
                             math-expr-data (nth 2 code)))
-                     ((and (eq (nth 1 code) 'mat)
-                           (string-match " *{" math-exp-str math-exp-pos))
+                     ((and (eq (nth 1 code) 'begenv)
+                           (string-match " *{\\([^}]*\\)}" math-exp-str math-exp-pos))
+                      (setq math-exp-pos (match-end 0)
+                            envname (match-string 1 math-exp-str)
+                            math-exp-token 'punc
+                            math-expr-data "[")
+                      (cond ((or (string= envname "matrix")
+                                 (string= envname "bmatrix")
+                                 (string= envname "pmatrix"))
+                             (if (setq j (string-match (concat "\\\\end{" envname "}")
+                                               math-exp-str math-exp-pos))
+                                 (setq math-exp-str 
+                                       (replace-match "]" t t math-exp-str))
+                               (error "%s" (concat "No closing \\end{" envname "}"))))))
+                      ((and (eq (nth 1 code) 'mat)
+                            (string-match " *{" math-exp-str math-exp-pos))
                       (setq math-exp-pos (match-end 0)
                             math-exp-token 'punc
                             math-expr-data "[")