(math-tex-ignore-words): Remove LaTeX portion.

(math-latex-ignore-words): New constant.

2 files changed, 23 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fcbfa0c2d4a..5141e5999cd 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,20 @@
+2005-01-31  Jay Belanger  <belanger@truman.edu>
+
+        * calc/calc-aent.el (math-read-token): Separate the TeX and LaTeX
+        parts.
+
+        * calc/calc-embed.el (calc-embedded-open-formula)
+        (calc-embedded-close-formula): Ignore matrix environments.
+
+        * calc/calc-ext.el (math-read-big-expr): Make LaTeX the default
+        TeX mode.
+
+        * calc/calc-lang.el (math-function-table, math-oper-table)
+        (math-variable-table): Adjust the LaTeX portions.
+
+        * calc/calc.el (math-tex-ignore-words): Remove LaTeX portion.
+        (math-latex-ignore-words): New constant.
+
 2005-01-31  Richard M. Stallman  <rms@gnu.org>
 
         * textmodes/ispell.el (ispell-local-dictionary-overridden): New var.
diff --git a/lisp/calc/calc.el b/lisp/calc/calc.el
index 44c56f2787d..99857ce05a0 100644
--- a/lisp/calc/calc.el
+++ b/lisp/calc/calc.el
@@ -3223,8 +3223,11 @@ See calc-keypad for details."
      ("\\matrix" mat) ("\\bmatrix" mat) ("\\pmatrix" mat)
      ("\\begin" begenv)
      ("\\cr" punc ";") ("\\\\" punc ";") ("\\*" punc "*")
-     ("\\{" punc "[") ("\\}" punc "]")
-))
+     ("\\{" punc "[") ("\\}" punc "]")))
+
+(defconst math-latex-ignore-words
+  (append math-tex-ignore-words
+          '(("\\begin" begenv))))
 
 (defconst math-eqn-ignore-words
   '( ("roman") ("bold") ("italic") ("mark") ("lineup") ("evalto")
@@ -3232,8 +3235,7 @@ See calc-keypad for details."
      ("right" ("floor") ("ceil"))
      ("arc" ("sin") ("cos") ("tan") ("sinh") ("cosh") ("tanh"))
      ("size" n) ("font" n) ("fwd" n) ("back" n) ("up" n) ("down" n)
-     ("above" punc ",")
-))
+     ("above" punc ",")))
 
 (defconst math-standard-opers
   '( ( "_"     calcFunc-subscr 1200 1201 )