update to 1.0.6.7

changes:
Better LaTeX export of elsart style and other fixes in the LaTeX converter
Several minor improvements in the graphical mode
Fixes for Maxima 5.10.0

5 files changed, 11 insertions, 176 deletions

diff --git a/editors/TeXmacs/Makefile b/editors/TeXmacs/Makefile
index 8f577f89b55..3e2c11cfd2f 100644
--- a/editors/TeXmacs/Makefile
+++ b/editors/TeXmacs/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.63 2006/11/09 21:01:45 drochner Exp $
+# $NetBSD: Makefile,v 1.64 2006/12/15 19:24:30 drochner Exp $
 
-DISTNAME=		TeXmacs-1.0.6.6-src
+DISTNAME=		TeXmacs-1.0.6.7-src
 PKGNAME=		${DISTNAME:S/-src//}
 CATEGORIES=		editors
 MASTER_SITES=		ftp://ftp.texmacs.org/pub/TeXmacs/targz/
@@ -40,12 +40,6 @@ REPLACE_FILES.bash+=	plugins/octave/bin/tm_octave
 REPLACE_FILES.bash+=	plugins/reduce/bin/tm_reduce
 REPLACE_FILES.bash+=	plugins/xypic/bin/tm_xypic
 
-# temporary to support maxima-5.10
-# can probably go away on next TeXmacs update
-post-extract:
-	${CP} ${FILESDIR}/texmacs-maxima-5.10.0.lisp \
-		${WRKSRC}/plugins/maxima/lisp
-
 pre-install:
 	${RM} -f ${WRKSRC}/TeXmacs/doc/devel/format/.log
 	${FIND} ${WRKSRC}/plugins/ -name '*.orig' | ${XARGS} ${RM}
diff --git a/editors/TeXmacs/PLIST b/editors/TeXmacs/PLIST
index 0a6ff15b693..c49857efa29 100644
--- a/editors/TeXmacs/PLIST
+++ b/editors/TeXmacs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.32 2006/11/09 21:01:45 drochner Exp $
+@comment $NetBSD: PLIST,v 1.33 2006/12/15 19:24:30 drochner Exp $
 bin/fig2ps
 bin/texmacs
 include/TeXmacs.h
@@ -1817,6 +1817,7 @@ share/TeXmacs/misc/pixmaps/tm_vect.xpm
 share/TeXmacs/misc/pixmaps/tm_verbatim.xpm
 share/TeXmacs/misc/pixmaps/unknown.ps
 share/TeXmacs/misc/sounds/phone.wav
+share/TeXmacs/packages/customize/cite-author-year.ts
 share/TeXmacs/packages/customize/number-europe.ts
 share/TeXmacs/packages/customize/number-long-article.ts
 share/TeXmacs/packages/customize/number-us.ts
@@ -1934,6 +1935,7 @@ share/TeXmacs/plugins/maxima/lisp/texmacs-maxima-5.9.2.lisp
 share/TeXmacs/plugins/maxima/packages/session/maxima.ts
 share/TeXmacs/plugins/maxima/progs/init-maxima.scm
 share/TeXmacs/plugins/maxima/progs/maxima-input.scm
+share/TeXmacs/plugins/maxima/progs/maxima-kbd.scm
 share/TeXmacs/plugins/maxima/progs/maxima-menus.scm
 share/TeXmacs/plugins/mupad/packages/session/mupad.ts
 share/TeXmacs/plugins/mupad/progs/init-mupad.scm
@@ -2018,6 +2020,7 @@ share/TeXmacs/progs/convert/latex/latex-tools.scm
 share/TeXmacs/progs/convert/latex/texout.scm
 share/TeXmacs/progs/convert/latex/textest.scm
 share/TeXmacs/progs/convert/latex/textm.scm
+share/TeXmacs/progs/convert/latex/tmtex-elsevier.scm
 share/TeXmacs/progs/convert/latex/tmtex-test.scm
 share/TeXmacs/progs/convert/latex/tmtex.scm
 share/TeXmacs/progs/convert/mathml/mathml-drd.scm
@@ -2168,6 +2171,7 @@ share/TeXmacs/progs/text/format-text-menu.scm
 share/TeXmacs/progs/text/std-text-drd.scm
 share/TeXmacs/progs/text/std-text-edit.scm
 share/TeXmacs/progs/text/std-text-kbd.scm
+share/TeXmacs/progs/text/std-text-natbib.scm
 share/TeXmacs/progs/text/text-kbd.scm
 share/TeXmacs/progs/text/text-menu.scm
 share/TeXmacs/progs/text/tm-structure.scm
diff --git a/editors/TeXmacs/distinfo b/editors/TeXmacs/distinfo
index b92550b0720..8e34c914adb 100644
--- a/editors/TeXmacs/distinfo
+++ b/editors/TeXmacs/distinfo
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.41 2006/11/09 21:01:45 drochner Exp $
+$NetBSD: distinfo,v 1.42 2006/12/15 19:24:30 drochner Exp $
 
-SHA1 (TeXmacs-1.0.6.6-src.tar.gz) = 07df6d2a624c43a1b39d770c7ac3c390311876e9
-RMD160 (TeXmacs-1.0.6.6-src.tar.gz) = 587d671fb0732a3cd80e0452a039518c2a4a7b4e
-Size (TeXmacs-1.0.6.6-src.tar.gz) = 3789730 bytes
+SHA1 (TeXmacs-1.0.6.7-src.tar.gz) = 5dc396cb1cee2c1c189deddaba44547cb0931b5b
+RMD160 (TeXmacs-1.0.6.7-src.tar.gz) = 0dd5d1a71dcdaa7404e9cddc29c2e34e3685e9d0
+Size (TeXmacs-1.0.6.7-src.tar.gz) = 3801955 bytes
 SHA1 (patch-aa) = 95b9e42fe1ff343e891fe299382c3647636eec99
 SHA1 (patch-ab) = e2d3dff7ce46ff0a827c6d6e9320060b21d6bd71
 SHA1 (patch-ac) = 21810d4f9d5e6525a86ec2d0c347dcfd1c9e31c8
 SHA1 (patch-ae) = c313a19db160d9f1c0dc950a1eb465869cec777f
 SHA1 (patch-ag) = 2b1c0ce4aa0f6b824f08f05a95beacbb1722436b
 SHA1 (patch-ai) = 10c6e74b4b1b9b38a5da071f0ad00780ae8aa419
-SHA1 (patch-aj) = ae3b832cc76a2883ccb9a184d330c10428ef3a21
diff --git a/editors/TeXmacs/files/texmacs-maxima-5.10.0.lisp b/editors/TeXmacs/files/texmacs-maxima-5.10.0.lisp
deleted file mode 100644
index f980cff0207..00000000000
--- a/editors/TeXmacs/files/texmacs-maxima-5.10.0.lisp
+++ /dev/null
@@ -1,150 +0,0 @@
-; $NetBSD: texmacs-maxima-5.10.0.lisp,v 1.1 2006/10/23 09:42:23 drochner Exp $
-
-(in-package :maxima)
-#+clisp (defvar *old-suppress-check-redefinition* 
-	      custom:*suppress-check-redefinition*)
-#+clisp (setf custom:*suppress-check-redefinition* t)
-(setf *alt-display2d* 'texmacs)
-(setf *prompt-prefix* "channel:promptlatex:\\red ")
-(setf *prompt-suffix* "\\black")
-;(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*))
-#+(or cmu sbcl scl)
-(setf *terminal-io* (make-two-way-stream *standard-input* *standard-output*))
-
-;; Small changes to mactex.lisp for interfacing with TeXmacs
-;; Andrey Grozin, 2001-2005
-
-(defun main-prompt ()
-  (format () "~A(~A~D) ~A" *prompt-prefix* 
-    (tex-stripdollar $inchar) $linenum *prompt-suffix*))
-
-(declare-top
-	 (special lop rop ccol $gcprint $inchar)
-	 (*expr tex-lbp tex-rbp))
-(defconstant texport *standard-output*)
-
-(defun tex-stripdollar (x)
-  (let ((s (quote-% (maybe-invert-string-case (symbol-name (stripdollar x))))))
-    (if (> (length s) 1)
-      (concatenate 'string "\\mathrm{" s "}")
-      s)))
-
-(defprop mtimes "\\*" texsym)
-
-(defun texmacs (x)
-  (let ((ccol 1))
-    (mapc #'myprinc
-        (tex x '("latex:$\\displaystyle ") '("$
-") 'mparen 'mparen))))
-
-;; In order to allow cut-and-paste from output to input,
-;; we should output \sin(x), not \sin x.
-
-(map 'list #'(lambda (f) (remprop f 'tex) (remprop f 'tex-rbp))
-  '(%sin %cos %tan %cot %sec %csc %sinh %cosh %tanh %coth %asin %acos %atan %exp %log))
-
-(remprop '$pi 'texword)
-(remprop '$gamma 'texword)
-(setf (get '$%i 'texword) "\\mathi")
-(setf (get '$%e 'texword) "\\mathe")
-
-;; Also, we should output f(x)^2, not f^2(x)
-
-(defun tex-mexpt (x l r)
-  (let((nc (eq (caar x) 'mncexpt)))	; true if a^^b rather than a^b
-    (setq l (if (and (numberp (cadr x)) (numneedsparen (cadr x)))
-                (tex (cadr x) (cons "\\left(" l) '("\\right)") lop (caar x))
-		(tex (cadr x) l nil lop (caar x)))
-          r (if (mmminusp (setq x (nformat (caddr x))))
-		;; the change in base-line makes parens unnecessary
-		(if nc
-		    (tex (cadr x) '("^ {-\\langle ")(cons "\\rangle }" r) 'mparen 'mparen)
-		    (tex (cadr x) '("^ {- ")(cons " }" r) 'mminus 'mparen))
-		(if nc
-		    (tex x (list "^{\\langle ")(cons "\\rangle}" r) 'mparen 'mparen)
-		    (if (and (integerp x) (< x 10))
-			(tex x (list "^")(cons "" r) 'mparen 'mparen)
-			(tex x (list "^{")(cons "}" r) 'mparen 'mparen)))))
-    (append l r)))
-
-;; binomial coefficients
-
-(defun tex-choose (x l r)
-  `(,@l
-    "\\binom{"
-    ,@(tex (cadr x) nil nil 'mparen 'mparen)
-    "}{"
-    ,@(tex (caddr x) nil nil 'mparen 'mparen)
-    "}"
-    ,@r))
-
-;; Integrals, sums, products
-
-(defun tex-int (x l r)
-  (let ((s1 (tex (cadr x) nil nil 'mparen 'mparen)) ;;integrand delims / & d
-	(var (tex (caddr x) nil nil 'mparen rop))) ;; variable
-    (cond((= (length x) 3)
-	  (append l `("\\int {" ,@s1 "}{\\;\\mathd\\;" ,@var "}\\big.") r))
-	 (t ;; presumably length 5
-	  (let ((low (tex (nth 3 x) nil nil 'mparen 'mparen))
-		;; 1st item is 0
-		(hi (tex (nth 4 x) nil nil 'mparen 'mparen)))
-	    (append l `("\\int_{" ,@low "}^{" ,@hi "}{" ,@s1 "\\;\\mathd\\;" ,@var "}\\big.") r))))))
-
-(defun tex-sum(x l r)
-  (let ((op (cond ((eq (caar x) '%sum) "\\sum_{")
-		  ((eq (caar x) '%product) "\\prod_{")
-		  ;; extend here
-		  ))
-	;; gotta be one of those above
-	(s1 (tex (cadr x) nil nil 'mparen rop))	;; summand
-	(index ;; "index = lowerlimit"
-	 (tex `((mequal simp) ,(caddr x),(cadddr x)) nil nil 'mparen 'mparen))
-	(toplim (tex (car(cddddr x)) nil nil 'mparen 'mparen)))
-    (append l `( ,op ,@index "}^{" ,@toplim "}{" ,@s1 "}\\big.") r)))
-
-(defun tex-lsum(x l r)
-  (let ((op (cond ((eq (caar x) '%lsum) "\\sum_{")
-		  ;; extend here
-		  ))
-	;; gotta be one of those above 
-	(s1 (tex (cadr x) nil nil 'mparen rop))	;; summand
-	(index ;; "index = lowerlimit"
-	 (tex `((min simp) , (caddr x), (cadddr x))  nil nil 'mparen 'mparen)))
-    (append l `( ,op ,@index "}}{" ,@s1 "}\\big.") r)))
-
-;; This is a hack for math input of integrals, sums, products
-
-(defmfun $tmint (a b f x) ($integrate f x a b))
-
-(defmspec $tmsum (l) (setq l (cdr l))
-  (if (= (length l) 3)
-      (dosum (caddr l) (cadar l) (meval (caddar l)) (meval (cadr l)) t)
-      (wna-err '$tmsum)))
-
-(defmspec $tmlsum (l) (setq l (cdr l))
-  (or (= (length l) 2) (wna-err '$tmlsum))
-  (let ((form (cadr l))
-        (ind (cadar l))
-        (lis (meval (caddar l)))
-        (ans 0))
-       (or (symbolp ind) (merror "Second argument not a variable ~M" ind))
-       (cond (($listp lis)
-              (loop for v in (cdr lis)
-                    with lind = (cons ind nil)
-                    for w = (cons v nil)
-                    do
-                    (setq ans (add* ans  (mbinding (lind w) (meval form)))))
-                   ans)
-           (t `((%lsum) ,form ,ind ,lis)))))
-
-(defmspec $tmprod (l) (setq l (cdr l))
-  (if (= (length l) 3)
-      (dosum (caddr l) (cadar l) (meval (caddar l)) (meval (cadr l)) nil)
-      (wna-err '$tmprod)))
-
-#+clisp (setf custom:*suppress-check-redefinition*
-	      *old-suppress-check-redefinition*)
diff --git a/editors/TeXmacs/patches/patch-aj b/editors/TeXmacs/patches/patch-aj
deleted file mode 100644
index 2d1eb44c968..00000000000
--- a/editors/TeXmacs/patches/patch-aj
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aj,v 1.2 2006/11/09 21:01:45 drochner Exp $
-
---- plugins/maxima/bin/tm_maxima.orig	2006-08-21 15:08:44.000000000 +0200
-+++ plugins/maxima/bin/tm_maxima
-@@ -19,6 +19,7 @@ case $1 in
-       | 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* | 5.9.3* | 5.10) exec maxima -u $1 -l $2 -p "$TEXMACS_MAXIMA_PATH/texmacs-maxima-5.9.2.lisp";;
-+  5.10.*) exec maxima -u $1 -l $2 -p "$TEXMACS_MAXIMA_PATH/texmacs-maxima-5.10.0.lisp";;
-   cygwin)
-     CYGWIN_ROOT="C:\cygwin"
-     CYGWIN_TEXMACS_HOME=`echo $TEXMACS_HOME_PATH | sed 's|/|\\\\|g'`