Mercurial > emacs
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 90098:59a447f7a6ba | 90099:fa9654493afb |
|---|---|
| 403 unform Use unformatted display: add(a, mul(b,c)). | 403 unform Use unformatted display: add(a, mul(b,c)). |
| 404 c Use C language notation. | 404 c Use C language notation. |
| 405 pascal Use Pascal language notation. | 405 pascal Use Pascal language notation. |
| 406 fortran Use Fortran language notation. | 406 fortran Use Fortran language notation. |
| 407 tex Use TeX notation. | 407 tex Use TeX notation. |
| 408 latex Use LaTeX notation. | |
| 408 eqn Use eqn notation. | 409 eqn Use eqn notation. |
| 409 math Use Mathematica(tm) notation. | 410 math Use Mathematica(tm) notation. |
| 410 maple Use Maple notation.") | 411 maple Use Maple notation.") |
| 411 | 412 |
| 412 (defcalcmodevar calc-language-option nil | 413 (defcalcmodevar calc-language-option nil |
| 702 (defvar calc-standalone-flag nil) | 703 (defvar calc-standalone-flag nil) |
| 703 (defvar var-EvalRules nil) | 704 (defvar var-EvalRules nil) |
| 704 (defvar math-eval-rules-cache-tag t) | 705 (defvar math-eval-rules-cache-tag t) |
| 705 (defvar math-radix-explicit-format t) | 706 (defvar math-radix-explicit-format t) |
| 706 (defvar math-expr-function-mapping nil) | 707 (defvar math-expr-function-mapping nil) |
| 708 (defvar math-expr-special-function-mapping nil) | |
| 707 (defvar math-expr-variable-mapping nil) | 709 (defvar math-expr-variable-mapping nil) |
| 708 (defvar math-read-expr-quotes nil) | 710 (defvar math-read-expr-quotes nil) |
| 709 (defvar math-working-step nil) | 711 (defvar math-working-step nil) |
| 710 (defvar math-working-step-2 nil) | 712 (defvar math-working-step-2 nil) |
| 711 (defvar var-i '(special-const (math-imaginary 1))) | 713 (defvar var-i '(special-const (math-imaginary 1))) |
| 1366 ((= calc-number-radix 16) "Hex ") | 1368 ((= calc-number-radix 16) "Hex ") |
| 1367 (t (format "Radix%d " calc-number-radix))) | 1369 (t (format "Radix%d " calc-number-radix))) |
| 1368 (if calc-leading-zeros "Zero " "") | 1370 (if calc-leading-zeros "Zero " "") |
| 1369 (cond ((null calc-language) "") | 1371 (cond ((null calc-language) "") |
| 1370 ((eq calc-language 'tex) "TeX ") | 1372 ((eq calc-language 'tex) "TeX ") |
| 1373 ((eq calc-language 'latex) "LaTeX ") | |
| 1371 (t (concat | 1374 (t (concat |
| 1372 (capitalize (symbol-name calc-language)) | 1375 (capitalize (symbol-name calc-language)) |
| 1373 " "))) | 1376 " "))) |
| 1374 (cond ((eq fmt 'float) | 1377 (cond ((eq fmt 'float) |
| 1375 (if (zerop figs) "" (format "Norm%d " figs))) | 1378 (if (zerop figs) "" (format "Norm%d " figs))) |
| 3216 ("\\rm") ("\\bf") ("\\it") ("\\sl") | 3219 ("\\rm") ("\\bf") ("\\it") ("\\sl") |
| 3217 ("\\roman") ("\\bold") ("\\italic") ("\\slanted") | 3220 ("\\roman") ("\\bold") ("\\italic") ("\\slanted") |
| 3218 ("\\cal") ("\\mit") ("\\Cal") ("\\Bbb") ("\\frak") ("\\goth") | 3221 ("\\cal") ("\\mit") ("\\Cal") ("\\Bbb") ("\\frak") ("\\goth") |
| 3219 ("\\evalto") | 3222 ("\\evalto") |
| 3220 ("\\matrix" mat) ("\\bmatrix" mat) ("\\pmatrix" mat) | 3223 ("\\matrix" mat) ("\\bmatrix" mat) ("\\pmatrix" mat) |
| 3224 ("\\begin" begenv) | |
| 3221 ("\\cr" punc ";") ("\\\\" punc ";") ("\\*" punc "*") | 3225 ("\\cr" punc ";") ("\\\\" punc ";") ("\\*" punc "*") |
| 3222 ("\\{" punc "[") ("\\}" punc "]") | 3226 ("\\{" punc "[") ("\\}" punc "]"))) |
| 3223 )) | 3227 |
| 3228 (defconst math-latex-ignore-words | |
| 3229 (append math-tex-ignore-words | |
| 3230 '(("\\begin" begenv)))) | |
| 3224 | 3231 |
| 3225 (defconst math-eqn-ignore-words | 3232 (defconst math-eqn-ignore-words |
| 3226 '( ("roman") ("bold") ("italic") ("mark") ("lineup") ("evalto") | 3233 '( ("roman") ("bold") ("italic") ("mark") ("lineup") ("evalto") |
| 3227 ("left" ("floor") ("ceil")) | 3234 ("left" ("floor") ("ceil")) |
| 3228 ("right" ("floor") ("ceil")) | 3235 ("right" ("floor") ("ceil")) |
| 3229 ("arc" ("sin") ("cos") ("tan") ("sinh") ("cosh") ("tanh")) | 3236 ("arc" ("sin") ("cos") ("tan") ("sinh") ("cosh") ("tanh")) |
| 3230 ("size" n) ("font" n) ("fwd" n) ("back" n) ("up" n) ("down" n) | 3237 ("size" n) ("font" n) ("fwd" n) ("back" n) ("up" n) ("down" n) |
| 3231 ("above" punc ",") | 3238 ("above" punc ","))) |
| 3232 )) | |
| 3233 | 3239 |
| 3234 (defconst math-standard-opers | 3240 (defconst math-standard-opers |
| 3235 '( ( "_" calcFunc-subscr 1200 1201 ) | 3241 '( ( "_" calcFunc-subscr 1200 1201 ) |
| 3236 ( "%" calcFunc-percent 1100 -1 ) | 3242 ( "%" calcFunc-percent 1100 -1 ) |
| 3237 ( "u+" ident -1 1000 ) | 3243 ( "u+" ident -1 1000 ) |