[Emacs-diffs] Changes to emacs/lisp/calc/calc-aent.el

[Jay Belanger]

Index: emacs/lisp/calc/calc-aent.el
diff -c emacs/lisp/calc/calc-aent.el:1.20 emacs/lisp/calc/calc-aent.el:1.21
*** emacs/lisp/calc/calc-aent.el:1.20   Sun Dec 19 06:59:33 2004
--- emacs/lisp/calc/calc-aent.el        Mon Jan 31 06:21:31 2005
***************
*** 690,696 ****
                            math-exp-pos)
                      (or (eq math-exp-pos 0)
                          (and (memq calc-language '(nil flat big unform
!                                                        tex eqn))
                               (eq (string-match "[^])}\"a-zA-Z0-9'$]_"
                                                 math-exp-str (1- math-exp-pos))
                                   (1- math-exp-pos))))))
--- 690,696 ----
                            math-exp-pos)
                      (or (eq math-exp-pos 0)
                          (and (memq calc-language '(nil flat big unform
!                                                        tex latex eqn))
                               (eq (string-match "[^])}\"a-zA-Z0-9'$]_"
                                                 math-exp-str (1- math-exp-pos))
                                   (1- math-exp-pos))))))
***************
*** 746,752 ****
               (setq math-exp-token 'string
                     math-expr-data (math-match-substring math-exp-str 1)
                     math-exp-pos (match-end 0))))
!           ((and (= ch ?\\) (eq calc-language 'tex)
                  (< math-exp-pos (1- (length math-exp-str))))
             (or (string-match "\\\\hbox *{\\([a-zA-Z0-9]+\\)}" 
                                 math-exp-str math-exp-pos)
--- 746,752 ----
               (setq math-exp-token 'string
                     math-expr-data (math-match-substring math-exp-str 1)
                     math-exp-pos (match-end 0))))
!           ((and (= ch ?\\) (memq calc-language '(tex latex))
                  (< math-exp-pos (1- (length math-exp-str))))
             (or (string-match "\\\\hbox *{\\([a-zA-Z0-9]+\\)}" 
                                 math-exp-str math-exp-pos)
***************
*** 800,810 ****
             (setq math-exp-pos (match-end 0))
             (math-read-token))
            (t
!            (if (and (eq ch ?\{) (memq calc-language '(tex eqn)))
                 (setq ch ?\())
!            (if (and (eq ch ?\}) (memq calc-language '(tex eqn)))
                 (setq ch ?\)))
!            (if (and (eq ch ?\&) (eq calc-language 'tex))
                 (setq ch ?\,))
             (setq math-exp-token 'punc
                   math-expr-data (char-to-string ch)
--- 800,810 ----
             (setq math-exp-pos (match-end 0))
             (math-read-token))
            (t
!            (if (and (eq ch ?\{) (memq calc-language '(tex latex eqn)))
                 (setq ch ?\())
!            (if (and (eq ch ?\}) (memq calc-language '(tex latex eqn)))
                 (setq ch ?\)))
!            (if (and (eq ch ?\&) (memq calc-language '(tex latex)))
                 (setq ch ?\,))
             (setq math-exp-token 'punc
                   math-expr-data (char-to-string ch)