[Maxima-commits] CVS: maxima/interfaces/emacs/emaxima emaxima.el,1.30,1.31

[Jay B. <bel...@us...>]

Update of /cvsroot/maxima/maxima/interfaces/emacs/emaxima
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5964/maxima/interfaces/emacs/emaxima

Modified Files:
	emaxima.el 
Log Message:
Fixed a problem with ":=" in the output.
Fixed a problem with (%t..) output.


Index: emaxima.el
===================================================================
RCS file: /cvsroot/maxima/maxima/interfaces/emacs/emaxima/emaxima.el,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- emaxima.el	1 Jul 2004 17:56:43 -0000	1.30
+++ emaxima.el	21 Sep 2004 19:36:15 -0000	1.31
@@ -1206,7 +1206,7 @@
       (buffer-substring-no-properties start end))))
 
 (defun emaxima-fix-tex-output (string)
-  (maxima-replace-in-string ":=" "\\mathbin{:=}" string))
+  (maxima-replace-in-string ":=" "\\\\mathbin{:=}" string))
 
 (defun emaxima-insert-preoutput (string &optional strip)
   (if (and (> (length string) 1)
@@ -1231,11 +1231,11 @@
       (when (> mb 0)
         (emaxima-insert-preoutput (substring out 0 mb)))
       (insert "\\t")
-      (insert (substring out (+ mb 2) (- me 1)))
+      (insert (substring out (+ mb 3) (- me 1)))
       (insert ". ")
       (setq out (maxima-strip-string-beginning (substring out me)))
       (string-match 
-       (concat "(\\(" maxima-outchar "\\|" maxima-linechar " \\)[0-9]+)") out)
+       (concat "(\\(" maxima-outchar "\\|" maxima-linechar "\\)[0-9]+)") out)
       (setq ie (match-beginning 0))
       (insert (emaxima-fix-tex-output 
                (maxima-strip-string-end (substring out 0 ie))))
@@ -1267,11 +1267,11 @@
       (when (> mb 0)
         (emaxima-insert-preoutput (substring out 0 mb)))
       (insert "\\t")
-      (insert (substring out (+ mb 2) (- me 1)))
+      (insert (substring out (+ mb 3) (- me 1)))
       (insert ". ")
       (setq out (maxima-strip-string-beginning (substring out me)))
       (string-match 
-       (concat "(" maxima-outchar "\\|" maxima-linechar "[0-9]+)") out)
+       (concat "(\\(" maxima-outchar "\\|" maxima-linechar "\\)[0-9]+)") out)
       (setq ie (match-beginning 0))
       (insert (emaxima-fix-tex-output
                (maxima-strip-string-end (substring out 0 ie))))