diff -r -u progs.orig/convert/latex/tmtex-preamble.scm progs/convert/latex/tmtex-preamble.scm --- progs.orig/convert/latex/tmtex-preamble.scm 2003-12-10 16:14:56.000000000 -0700 +++ progs/convert/latex/tmtex-preamble.scm 2003-12-10 17:08:03.000000000 -0700 @@ -78,7 +78,12 @@ " \\captionof{#3}{#5}\n" " \\end{center}\n" " \\end{minipage}}")) - + (define (color) + (string-append + "\\definecolor{grey}{rgb}{0.75,0.75,0.75}\n" + "\\definecolor{orange}{rgb}{1.0,0.5,0.5}\n" + "\\definecolor{brown}{rgb}{0.5,0.25,0.0}\n" + "\\definecolor{pink}{rgb}{1.0,0.5,0.5}")) `(;; itemize and enumerate environments (itemizeminus ,(newitemize "itemizeminus" "$-$")) (itemizedot ,(newitemize "itemizedot" "$\\bullet$")) @@ -116,8 +121,8 @@ " GNU T\kern-.1667em\lower.5ex\hbox{E}\kern-.125emX\kern-.1em\lower.5ex\hbox{\textsc{m\kern-.05ema\kern-.125emc\kern-.05ems}} (" (translate "see" "english" lan) "{\\tt http://www.texmacs.org}).}")) - (tmhlink 2 "{\\blue #1}") - (tmaction 2 "{\\blue #1}") + (tmhlink 2 "{\\color{blue} #1}") + (tmaction 2 "{\\color{blue} #1}") (tmmathbf 1 "\\boldsymbol{#1}") (tmop 1 "\\operatorname{#1}") (tmbsl 0 "$\\backslash$") @@ -134,6 +139,7 @@ (tmperson 1 "\\textsc{#1}") (tmdummy 0 "$\\mbox{}$") (tmscript 1 "\\text{\\scriptsize $#1$}") + (color ,(color)) ;; other extra markup (scheme 0 "{\\sc Scheme}") diff -r -u progs.orig/convert/latex/tmtex.scm progs/convert/latex/tmtex.scm --- progs.orig/convert/latex/tmtex.scm 2003-12-10 16:14:56.000000000 -0700 +++ progs/convert/latex/tmtex.scm 2003-12-10 17:13:07.000000000 -0700 @@ -94,17 +94,7 @@ (("font-shape" "right") upshape) (("font-shape" "slanted") slshape) (("font-shape" "italic") itshape) - (("font-shape" "small-caps") scshape) - (("color" "black") black) - (("color" "grey") grey) - (("color" "white") white) - (("color" "red") red) - (("color" "blue") blue) - (("color" "yellow") yellow) - (("color" "magenta") magenta) - (("color" "orange") orange) - (("color" "green") green) - (("color" "brown") brown)) + (("font-shape" "small-caps") scshape)) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Manipulation of the environment @@ -686,6 +676,8 @@ (a (tmtex-get-assign-cmd var val))) (cond (w (list w arg)) (a (list '!group (tex-concat (list (list a) " " arg)))) + ((== var "color") + (list '!group (tex-concat (list (list 'color val) " " arg)))) (else arg))))) (define (tmtex-with l) diff -r -u progs.orig/drd/latex/latex-drd.scm progs/drd/latex/latex-drd.scm --- progs.orig/drd/latex/latex-drd.scm 2003-12-10 16:14:56.000000000 -0700 +++ progs/drd/latex/latex-drd.scm 2003-12-10 17:00:44.000000000 -0700 @@ -412,6 +412,10 @@ (tmfloat "ifthen") (tmfloat "capt-of") (tmfloat "calc") + + (color "color") + (tmhlink "color") + (tmaction "color") (omicron "pslatex") (multicols "multicol"))