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

[Jay Belanger]

Index: emacs/lisp/calc/calc-ext.el
diff -c emacs/lisp/calc/calc-ext.el:1.23 emacs/lisp/calc/calc-ext.el:1.24
*** emacs/lisp/calc/calc-ext.el:1.23    Wed Nov 17 19:22:31 2004
--- emacs/lisp/calc/calc-ext.el Mon Nov 22 04:52:48 2004
***************
*** 2943,2979 ****
              (math-expr-function-mapping (get 'tex 'math-function-table))
              (math-expr-variable-mapping (get 'tex 'math-variable-table)))
          (math-read-expr str)))
!     (let ((lines nil)
          (pos 0)
          (width 0)
!         (err-msg nil)
!         the-baseline the-h2
          new-pos p)
        (while (setq new-pos (string-match "\n" str pos))
!       (setq lines (cons (substring str pos new-pos) lines)
              pos (1+ new-pos)))
!       (setq lines (nreverse (cons (substring str pos) lines))
!           p lines)
        (while p
        (setq width (max width (length (car p)))
              p (cdr p)))
!       (if (math-read-big-bigp lines)
          (or (catch 'syntax
!               (math-read-big-rec 0 0 width (length lines)))
!             err-msg
              '(error 0 "Syntax error"))
        (math-read-expr str)))))
  
! (defun math-read-big-bigp (lines)
!   (and (cdr lines)
         (let ((matrix nil)
             (v 0)
!            (height (if (> (length (car lines)) 0) 1 0)))
!        (while (and (cdr lines)
                     (let* ((i 0)
                            j
!                           (l1 (car lines))
!                           (l2 (nth 1 lines))
                            (len (min (length l1) (length l2))))
                       (if (> (length l2) 0)
                           (setq height (1+ height)))
--- 2943,2981 ----
              (math-expr-function-mapping (get 'tex 'math-function-table))
              (math-expr-variable-mapping (get 'tex 'math-variable-table)))
          (math-read-expr str)))
!     (let ((math-read-big-lines nil)
          (pos 0)
          (width 0)
!         (math-read-big-err-msg nil)
!         math-read-big-baseline math-read-big-h2
          new-pos p)
        (while (setq new-pos (string-match "\n" str pos))
!       (setq math-read-big-lines 
!               (cons (substring str pos new-pos) math-read-big-lines)
              pos (1+ new-pos)))
!       (setq math-read-big-lines 
!             (nreverse (cons (substring str pos) math-read-big-lines))
!           p math-read-big-lines)
        (while p
        (setq width (max width (length (car p)))
              p (cdr p)))
!       (if (math-read-big-bigp math-read-big-lines)
          (or (catch 'syntax
!               (math-read-big-rec 0 0 width (length math-read-big-lines)))
!             math-read-big-err-msg
              '(error 0 "Syntax error"))
        (math-read-expr str)))))
  
! (defun math-read-big-bigp (math-read-big-lines)
!   (and (cdr math-read-big-lines)
         (let ((matrix nil)
             (v 0)
!            (height (if (> (length (car math-read-big-lines)) 0) 1 0)))
!        (while (and (cdr math-read-big-lines)
                     (let* ((i 0)
                            j
!                           (l1 (car math-read-big-lines))
!                           (l2 (nth 1 math-read-big-lines))
                            (len (min (length l1) (length l2))))
                       (if (> (length l2) 0)
                           (setq height (1+ height)))
***************
*** 2984,2990 ****
                                            (= (aref l2 i) (aref l1 i)))
                                       (and (eq (aref l1 i) ?\[)
                                            (eq (aref l2 i) ?\[)
!                                           (let ((h2 (length l1)))
                                              (setq j (math-read-big-balance
                                                       (1+ i) v "[")))
                                            (setq i (1- j)))))
--- 2986,2992 ----
                                            (= (aref l2 i) (aref l1 i)))
                                       (and (eq (aref l1 i) ?\[)
                                            (eq (aref l2 i) ?\[)
!                                           (let ((math-rb-h2 (length l1)))
                                              (setq j (math-read-big-balance
                                                       (1+ i) v "[")))
                                            (setq i (1- j)))))
***************
*** 2994,3003 ****
                                (eq (aref l2 i) ?\[)
                                (setq matrix t)
                                nil))))
!          (setq lines (cdr lines)
                 v (1+ v)))
         (or (and (> height 1)
!                 (not (cdr lines)))
             matrix))))
  
  ;;; Nontrivial "flat" formatting.
--- 2996,3005 ----
                                (eq (aref l2 i) ?\[)
                                (setq matrix t)
                                nil))))
!          (setq math-read-big-lines (cdr math-read-big-lines)
                 v (1+ v)))
         (or (and (> height 1)
!                 (not (cdr math-read-big-lines)))
             matrix))))
  
  ;;; Nontrivial "flat" formatting.