Mercurial > emacs
diff lisp/calc/calc.el @ 90099:fa9654493afb
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-10
Merge from emacs--cvs-trunk--0
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-59
- miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-68
Update from CVS
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Wed, 02 Feb 2005 01:54:00 +0000 |
| parents | 6d92d69fae33 d46309369c36 |
| children | 8395880305fe |
line wrap: on
line diff
--- a/lisp/calc/calc.el Mon Jan 31 01:41:13 2005 +0000 +++ b/lisp/calc/calc.el Wed Feb 02 01:54:00 2005 +0000 @@ -405,6 +405,7 @@ pascal Use Pascal language notation. fortran Use Fortran language notation. tex Use TeX notation. + latex Use LaTeX notation. eqn Use eqn notation. math Use Mathematica(tm) notation. maple Use Maple notation.") @@ -704,6 +705,7 @@ (defvar math-eval-rules-cache-tag t) (defvar math-radix-explicit-format t) (defvar math-expr-function-mapping nil) +(defvar math-expr-special-function-mapping nil) (defvar math-expr-variable-mapping nil) (defvar math-read-expr-quotes nil) (defvar math-working-step nil) @@ -1368,6 +1370,7 @@ (if calc-leading-zeros "Zero " "") (cond ((null calc-language) "") ((eq calc-language 'tex) "TeX ") + ((eq calc-language 'latex) "LaTeX ") (t (concat (capitalize (symbol-name calc-language)) " "))) @@ -3218,9 +3221,13 @@ ("\\cal") ("\\mit") ("\\Cal") ("\\Bbb") ("\\frak") ("\\goth") ("\\evalto") ("\\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") @@ -3228,8 +3235,7 @@ ("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 )