# HG changeset patch
# User Jay Belanger <jay.p.belanger@gmail.com>
# Date 1107152491 0
# Node ID 5f760ce654b7661b220e1f022e6e178ee6f7d400
# Parent  37a65df00ab2b70972a237d2c5e9314121738c59
(math-read-token): Add support for LaTeX.

diff -r 37a65df00ab2 -r 5f760ce654b7 lisp/calc/calc-aent.el
--- a/lisp/calc/calc-aent.el	Mon Jan 31 02:22:24 2005 +0000
+++ b/lisp/calc/calc-aent.el	Mon Jan 31 06:21:31 2005 +0000
@@ -690,7 +690,7 @@
                           math-exp-pos)
 		      (or (eq math-exp-pos 0)
 			  (and (memq calc-language '(nil flat big unform
-							 tex eqn))
+							 tex latex eqn))
 			       (eq (string-match "[^])}\"a-zA-Z0-9'$]_"
 						 math-exp-str (1- math-exp-pos))
 				   (1- math-exp-pos))))))
@@ -746,7 +746,7 @@
 	       (setq math-exp-token 'string
 		     math-expr-data (math-match-substring math-exp-str 1)
 		     math-exp-pos (match-end 0))))
-	    ((and (= ch ?\\) (eq calc-language 'tex)
+	    ((and (= ch ?\\) (memq calc-language '(tex latex))
 		  (< math-exp-pos (1- (length math-exp-str))))
 	     (or (string-match "\\\\hbox *{\\([a-zA-Z0-9]+\\)}" 
                                math-exp-str math-exp-pos)
@@ -800,11 +800,11 @@
 	     (setq math-exp-pos (match-end 0))
 	     (math-read-token))
 	    (t
-	     (if (and (eq ch ?\{) (memq calc-language '(tex eqn)))
+	     (if (and (eq ch ?\{) (memq calc-language '(tex latex eqn)))
 		 (setq ch ?\())
-	     (if (and (eq ch ?\}) (memq calc-language '(tex eqn)))
+	     (if (and (eq ch ?\}) (memq calc-language '(tex latex eqn)))
 		 (setq ch ?\)))
-	     (if (and (eq ch ?\&) (eq calc-language 'tex))
+	     (if (and (eq ch ?\&) (memq calc-language '(tex latex)))
 		 (setq ch ?\,))
 	     (setq math-exp-token 'punc
 		   math-expr-data (char-to-string ch)