Mercurial > emacs
comparison lisp/calc/calc-lang.el @ 59829:502b609847e8
(math-function-table, math-oper-table, math-variable-table):
Adjust the LaTeX portions.
author | Jay Belanger <jay.p.belanger@gmail.com> |
---|---|
date | Mon, 31 Jan 2005 21:53:21 +0000 |
parents | dea78c6f5e48 |
children | 937e422a1694 fa9654493afb |
comparison
equal
deleted
inserted
replaced
59828:2f3d955df59a | 59829:502b609847e8 |
---|---|
426 (substring str (1- (match-end 0)))))) | 426 (substring str (1- (match-end 0)))))) |
427 str) | 427 str) |
428 (put 'tex 'math-input-filter 'math-tex-input-filter) | 428 (put 'tex 'math-input-filter 'math-tex-input-filter) |
429 | 429 |
430 (put 'latex 'math-oper-table | 430 (put 'latex 'math-oper-table |
431 '( ( "u+" ident -1 1000 ) | 431 (append (get 'tex 'math-oper-table) |
432 ( "u-" neg -1 1000 ) | 432 '(( "\\Hat" calcFunc-Hat -1 950 ) |
433 ( "\\hat" calcFunc-hat -1 950 ) | 433 ( "\\Check" calcFunc-Check -1 950 ) |
434 ( "\\check" calcFunc-check -1 950 ) | 434 ( "\\Tilde" calcFunc-Tilde -1 950 ) |
435 ( "\\tilde" calcFunc-tilde -1 950 ) | 435 ( "\\Acute" calcFunc-Acute -1 950 ) |
436 ( "\\acute" calcFunc-acute -1 950 ) | 436 ( "\\Grave" calcFunc-Grave -1 950 ) |
437 ( "\\grave" calcFunc-grave -1 950 ) | 437 ( "\\Dot" calcFunc-Dot -1 950 ) |
438 ( "\\dot" calcFunc-dot -1 950 ) | 438 ( "\\Ddot" calcFunc-Dotdot -1 950 ) |
439 ( "\\ddot" calcFunc-dotdot -1 950 ) | 439 ( "\\Breve" calcFunc-Breve -1 950 ) |
440 ( "\\breve" calcFunc-breve -1 950 ) | 440 ( "\\Bar" calcFunc-Bar -1 950 ) |
441 ( "\\bar" calcFunc-bar -1 950 ) | 441 ( "\\Vec" calcFunc-VEC -1 950 ) |
442 ( "\\vec" calcFunc-Vec -1 950 ) | 442 ( "\\dddot" calcFunc-dddot -1 950 ) |
443 ( "\\underline" calcFunc-under -1 950 ) | 443 ( "\\ddddot" calcFunc-ddddot -1 950 ) |
444 ( "\\Hat" calcFunc-Hat -1 950 ) | 444 ( "\div" / 170 171 ) |
445 ( "\\Check" calcFunc-Check -1 950 ) | 445 ( "\\le" calcFunc-leq 160 161 ) |
446 ( "\\Tilde" calcFunc-Tilde -1 950 ) | 446 ( "\\leqq" calcFunc-leq 160 161 ) |
447 ( "\\Acute" calcFunc-Acute -1 950 ) | 447 ( "\\leqsland" calcFunc-leq 160 161 ) |
448 ( "\\Grave" calcFunc-Grave -1 950 ) | 448 ( "\\ge" calcFunc-geq 160 161 ) |
449 ( "\\Dot" calcFunc-Dot -1 950 ) | 449 ( "\\geqq" calcFunc-geq 160 161 ) |
450 ( "\\Ddot" calcFunc-Dotdot -1 950 ) | 450 ( "\\geqslant" calcFunc-geq 160 161 ) |
451 ( "\\Breve" calcFunc-Breve -1 950 ) | 451 ( "=" calcFunc-eq 160 161 ) |
452 ( "\\Bar" calcFunc-Bar -1 950 ) | 452 ( "\\neq" calcFunc-neq 160 161 ) |
453 ( "\\Vec" calcFunc-VEC -1 950 ) | 453 ( "\\ne" calcFunc-neq 160 161 ) |
454 ( "\\dddot" calcFunc-dddot -1 950 ) | 454 ( "\\lnot" calcFunc-lnot -1 121 ) |
455 ( "\\ddddot" calcFunc-ddddot -1 950 ) | 455 ( "\\land" calcFunc-land 110 111 ) |
456 ( "u|" calcFunc-abs -1 0 ) | 456 ( "\\lor" calcFunc-lor 100 101 ) |
457 ( "|" closing 0 -1 ) | 457 ( "?" (math-read-if) 91 90 ) |
458 ( "\\lfloor" calcFunc-floor -1 0 ) | 458 ( "!!!" calcFunc-pnot -1 85 ) |
459 ( "\\rfloor" closing 0 -1 ) | 459 ( "&&&" calcFunc-pand 80 81 ) |
460 ( "\\lceil" calcFunc-ceil -1 0 ) | 460 ( "|||" calcFunc-por 75 76 ) |
461 ( "\\rceil" closing 0 -1 ) | 461 ( "\\gets" calcFunc-assign 51 50 ) |
462 ( "\\pm" sdev 300 300 ) | 462 ( ":=" calcFunc-assign 51 50 ) |
463 ( "!" calcFunc-fact 210 -1 ) | 463 ( "::" calcFunc-condition 45 46 ) |
464 ( "^" ^ 201 200 ) | 464 ( "\\to" calcFunc-evalto 40 41 ) |
465 ( "_" calcFunc-subscr 201 200 ) | 465 ( "\\to" calcFunc-evalto 40 -1 ) |
466 ( "\\times" * 191 190 ) | 466 ( "=>" calcFunc-evalto 40 41 ) |
467 ( "*" * 191 190 ) | 467 ( "=>" calcFunc-evalto 40 -1 )))) |
468 ( "2x" * 191 190 ) | |
469 ( "+" + 180 181 ) | |
470 ( "-" - 180 181 ) | |
471 ( "\\over" / 170 171 ) | |
472 ( "/" / 170 171 ) | |
473 ( "\div" / 170 171 ) | |
474 ( "\\choose" calcFunc-choose 170 171 ) | |
475 ( "\\mod" % 170 171 ) | |
476 ( "<" calcFunc-lt 160 161 ) | |
477 ( ">" calcFunc-gt 160 161 ) | |
478 ( "\\leq" calcFunc-leq 160 161 ) | |
479 ( "\\le" calcFunc-leq 160 161 ) | |
480 ( "\\leqq" calcFunc-leq 160 161 ) | |
481 ( "\\leqsland" calcFunc-leq 160 161 ) | |
482 ( "\\geq" calcFunc-geq 160 161 ) | |
483 ( "\\ge" calcFunc-geq 160 161 ) | |
484 ( "\\geqq" calcFunc-geq 160 161 ) | |
485 ( "\\geqslant" calcFunc-geq 160 161 ) | |
486 ( "=" calcFunc-eq 160 161 ) | |
487 ( "\\neq" calcFunc-neq 160 161 ) | |
488 ( "\\ne" calcFunc-neq 160 161 ) | |
489 ( "\\lnot" calcFunc-lnot -1 121 ) | |
490 ( "\\land" calcFunc-land 110 111 ) | |
491 ( "\\lor" calcFunc-lor 100 101 ) | |
492 ( "?" (math-read-if) 91 90 ) | |
493 ( "!!!" calcFunc-pnot -1 85 ) | |
494 ( "&&&" calcFunc-pand 80 81 ) | |
495 ( "|||" calcFunc-por 75 76 ) | |
496 ( "\\gets" calcFunc-assign 51 50 ) | |
497 ( ":=" calcFunc-assign 51 50 ) | |
498 ( "::" calcFunc-condition 45 46 ) | |
499 ( "\\to" calcFunc-evalto 40 41 ) | |
500 ( "\\to" calcFunc-evalto 40 -1 ) | |
501 ( "=>" calcFunc-evalto 40 41 ) | |
502 ( "=>" calcFunc-evalto 40 -1 ))) | |
503 | 468 |
504 (put 'latex 'math-function-table | 469 (put 'latex 'math-function-table |
505 '( ( \\arccos . calcFunc-arccos ) | 470 (append |
506 ( \\arcsin . calcFunc-arcsin ) | 471 (get 'tex 'math-function-table) |
507 ( \\arctan . calcFunc-arctan ) | 472 '(( \\frac . (math-latex-parse-frac /)) |
508 ( \\arg . calcFunc-arg ) | 473 ( \\tfrac . (math-latex-parse-frac /)) |
509 ( \\cos . calcFunc-cos ) | 474 ( \\dfrac . (math-latex-parse-frac /)) |
510 ( \\cosh . calcFunc-cosh ) | 475 ( \\binom . (math-latex-parse-frac calcFunc-choose)) |
511 ( \\det . calcFunc-det ) | 476 ( \\tbinom . (math-latex-parse-frac calcFunc-choose)) |
512 ( \\exp . calcFunc-exp ) | 477 ( \\dbinom . (math-latex-parse-frac calcFunc-choose)) |
513 ( \\gcd . calcFunc-gcd ) | 478 ( \\phi . calcFunc-totient ) |
514 ( \\ln . calcFunc-ln ) | 479 ( \\mu . calcFunc-moebius )))) |
515 ( \\log . calcFunc-log10 ) | |
516 ( \\max . calcFunc-max ) | |
517 ( \\min . calcFunc-min ) | |
518 ( \\tan . calcFunc-tan ) | |
519 ( \\sin . calcFunc-sin ) | |
520 ( \\sinh . calcFunc-sinh ) | |
521 ( \\sqrt . calcFunc-sqrt ) | |
522 ( \\tanh . calcFunc-tanh ) | |
523 ( \\frac . (math-latex-parse-frac /)) | |
524 ( \\tfrac . (math-latex-parse-frac /)) | |
525 ( \\dfrac . (math-latex-parse-frac /)) | |
526 ( \\binom . (math-latex-parse-frac calcFunc-choose)) | |
527 ( \\tbinom . (math-latex-parse-frac calcFunc-choose)) | |
528 ( \\dbinom . (math-latex-parse-frac calcFunc-choose)) | |
529 ( \\phi . calcFunc-totient ) | |
530 ( \\mu . calcFunc-moebius ))) | |
531 | 480 |
532 (put 'latex 'math-special-function-table | 481 (put 'latex 'math-special-function-table |
533 '((/ . (math-latex-print-frac "\\frac")) | 482 '((/ . (math-latex-print-frac "\\frac")) |
534 (calcFunc-choose . (math-latex-print-frac "\\binom")))) | 483 (calcFunc-choose . (math-latex-print-frac "\\binom")))) |
535 | 484 |
536 (put 'latex 'math-variable-table | 485 (put 'latex 'math-variable-table |
537 '( ( \\pi . var-pi ) | 486 (get 'tex 'math-variable-table)) |
538 ( \\infty . var-inf ) | |
539 ( \\infty . var-uinf ) | |
540 ( \\phi . var-phi ) | |
541 ( \\gamma . var-gamma ) | |
542 ( \\sum . (math-parse-tex-sum calcFunc-sum) ) | |
543 ( \\prod . (math-parse-tex-sum calcFunc-prod) ))) | |
544 | 487 |
545 (put 'latex 'math-complex-format 'i) | 488 (put 'latex 'math-complex-format 'i) |
546 | 489 |
547 (defun math-latex-parse-frac (f val) | 490 (defun math-latex-parse-frac (f val) |
548 (let (numer denom) | 491 (let (numer denom) |