diff -urN TeXmacs-1.0.6-src.orig/plugins/maxima/bin/maxima_detect TeXmacs-1.0.6-src/plugins/maxima/bin/maxima_detect --- TeXmacs-1.0.6-src.orig/plugins/maxima/bin/maxima_detect 2005-12-02 19:08:07.000000000 +0100 +++ TeXmacs-1.0.6-src/plugins/maxima/bin/maxima_detect 2006-04-20 20:29:21.000000000 +0200 @@ -46,9 +46,10 @@ if [ "$1" ] then if $MAXIMA --list-avail | grep -F "version 5.9.1 -version 5.9.2" >/dev/null +version 5.9.2 +version 5.9.3" >/dev/null then - # 5.9.1 or 5.9.2 + # 5.9.1 or 5.9.2 or 5.9.3 maxima -d | grep -F 'maxima-htmldir=' | sed -e 's/maxima-htmldir=/"/' \ -e 's|$|/maxima_toc.html"|' else diff -urN TeXmacs-1.0.6-src.orig/plugins/maxima/bin/tm_maxima TeXmacs-1.0.6-src/plugins/maxima/bin/tm_maxima --- TeXmacs-1.0.6-src.orig/plugins/maxima/bin/tm_maxima 2005-12-02 19:08:07.000000000 +0100 +++ TeXmacs-1.0.6-src/plugins/maxima/bin/tm_maxima 2006-04-20 20:29:21.000000000 +0200 @@ -14,6 +14,6 @@ 5.9.0) exec maxima -u $1 -l $2 -p "$TEXMACS_MAXIMA_PATH/texmacs-maxima-5.9.0.lisp" \ | maxima_filter;; 5.9.1) exec maxima -u $1 -l $2 -p "$TEXMACS_MAXIMA_PATH/texmacs-maxima-5.9.1.lisp";; - 5.9.1.1* | 5.9.2*) exec maxima -u $1 -l $2 -p "$TEXMACS_MAXIMA_PATH/texmacs-maxima-5.9.2.lisp";; + 5.9.1.1* | 5.9.2* | 5.9.3) exec maxima -u $1 -l $2 -p "$TEXMACS_MAXIMA_PATH/texmacs-maxima-5.9.2.lisp";; *) echo -e "\2latex:\\red Unsupported version of maxima: $1\5" esac diff -urN TeXmacs-1.0.6-src.orig/plugins/maxima/lisp/texmacs-maxima-5.9.2.lisp TeXmacs-1.0.6-src/plugins/maxima/lisp/texmacs-maxima-5.9.2.lisp --- TeXmacs-1.0.6-src.orig/plugins/maxima/lisp/texmacs-maxima-5.9.2.lisp 2005-12-02 19:08:07.000000000 +0100 +++ TeXmacs-1.0.6-src/plugins/maxima/lisp/texmacs-maxima-5.9.2.lisp 2006-04-20 20:29:36.000000000 +0200 @@ -5,7 +5,7 @@ (setf *alt-display2d* 'texmacs) (setf *prompt-prefix* "channel:promptlatex:\\red ") (setf *prompt-suffix* "\\black") -(setf *general-display-prefix* "verbatim:") +;(setf *general-display-prefix* "verbatim:") (setf *maxima-prolog* "verbatim:") (setf *maxima-epilog* "latex:\\red The end\\black") #-gcl(setf *debug-io* (make-two-way-stream *standard-input* *standard-output*)) @@ -19,32 +19,6 @@ (format () "~A(~A~D) ~A" *prompt-prefix* (tex-stripdollar $inchar) $linenum *prompt-suffix*)) -(defun retrieve (msg flag &aux (print? nil)) - (declare (special msg flag print?)) - (or (eq flag 'noprint) (setq print? t)) - (cond ((not print?) - (setq print? t) - (princ *prompt-prefix*) - (princ *prompt-suffix*)) - ((null msg) - (princ *prompt-prefix*) - (princ *prompt-suffix*)) - ((atom msg) - (format t "~a~a~a" *prompt-prefix* msg *prompt-suffix*) - (mterpri)) - ((eq flag t) - (princ *prompt-prefix*) - (mapc #'princ (cdr msg)) - (princ *prompt-suffix*) - (mterpri)) - (t - (princ *prompt-prefix*) - (displa msg) - (princ *prompt-suffix*) - (mterpri))) - (let ((res (mread-noprompt *query-io* nil))) - (princ *general-display-prefix*) res)) - (declare-top (special lop rop ccol $gcprint $inchar) (*expr tex-lbp tex-rbp))