Mercurial > emacs
comparison lisp/calc/calc-aent.el @ 60169:c396883e5069
(math-read-token): Add local variable.
author | Jay Belanger <jay.p.belanger@gmail.com> |
---|---|
date | Sat, 19 Feb 2005 19:59:49 +0000 |
parents | 4b615730220f |
children | b56d5250fbc3 bf0d492ea2d5 |
comparison
equal
deleted
inserted
replaced
60168:d96e54250eea | 60169:c396883e5069 |
---|---|
782 math-exp-str math-exp-pos)) | 782 math-exp-str math-exp-pos)) |
783 (setq math-exp-token 'symbol | 783 (setq math-exp-token 'symbol |
784 math-exp-pos (match-end 0) | 784 math-exp-pos (match-end 0) |
785 math-expr-data (math-restore-dashes | 785 math-expr-data (math-restore-dashes |
786 (math-match-substring math-exp-str 1))) | 786 (math-match-substring math-exp-str 1))) |
787 (let ((code (assoc math-expr-data math-tex-ignore-words))) | 787 (let ((code (assoc math-expr-data math-tex-ignore-words)) |
788 envname) | |
788 (cond ((null code)) | 789 (cond ((null code)) |
789 ((null (cdr code)) | 790 ((null (cdr code)) |
790 (math-read-token)) | 791 (math-read-token)) |
791 ((eq (nth 1 code) 'punc) | 792 ((eq (nth 1 code) 'punc) |
792 (setq math-exp-token 'punc | 793 (setq math-exp-token 'punc |
799 math-expr-data "[") | 800 math-expr-data "[") |
800 (cond ((or (string= envname "matrix") | 801 (cond ((or (string= envname "matrix") |
801 (string= envname "bmatrix") | 802 (string= envname "bmatrix") |
802 (string= envname "smallmatrix") | 803 (string= envname "smallmatrix") |
803 (string= envname "pmatrix")) | 804 (string= envname "pmatrix")) |
804 (if (setq j (string-match (concat "\\\\end{" envname "}") | 805 (if (string-match (concat "\\\\end{" envname "}") |
805 math-exp-str math-exp-pos)) | 806 math-exp-str math-exp-pos) |
806 (setq math-exp-str | 807 (setq math-exp-str |
807 (replace-match "]" t t math-exp-str)) | 808 (replace-match "]" t t math-exp-str)) |
808 (error "%s" (concat "No closing \\end{" envname "}")))))) | 809 (error "%s" (concat "No closing \\end{" envname "}")))))) |
809 ((and (eq (nth 1 code) 'mat) | 810 ((and (eq (nth 1 code) 'mat) |
810 (string-match " *{" math-exp-str math-exp-pos)) | 811 (string-match " *{" math-exp-str math-exp-pos)) |