Improved tex handling of text in backend_ps and texmanager, added tex/latex

ddale · ddale · commit 708cd251aece · 2005-06-03T17:00:40.000Z
option in rc.

svn path=/trunk/matplotlib/; revision=1415
diff --git a/.matplotlibrc b/.matplotlibrc
@@ -116,14 +116,15 @@ font.sans-serif     : Lucida Grande, Verdana, Geneva, Lucida, Bitstream Vera San
 font.cursive        : Apple Chancery, Textile, Zapf Chancery, Sand, cursive
 font.fantasy        : Comic Sans MS, Chicago, Charcoal, Impact, Western, fantasy
 font.monospace      : Andale Mono, Bitstream Vera Sans Mono, Nimbus Mono L, Courier New, Courier, Fixed, Terminal, monospace
-
+font.latex.package  : type1cm  # This must be an available LaTeX font package, like 'times' or 'pslatex' 
 
 ### TEXT
 # text properties used by text.Text.  See
 # http://matplotlib.sourceforge.net/matplotlib.text.html for more
 # information on text properties
 text.color          : black
 text.usetex         : False  # use tex for all text handling.  See http://matplotlib.sf.net/matplotlib.texmanager.html
+text.tex.engine     : latex  # tex is faster, but latex is required to use special font packages
 
 ### AXES
 # default face and edge color, default tick sizes,
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,10 @@
 New entries should be added at the top
 
+2005-06-03 Improved support for tex handling of text in backend_ps. - DSD 
+
+2005-06-03 Added rc options to render text with tex or latex, and to select 
+           the latex font package. - DSD
+
 2005-06-03 Fixed a bug in ticker.py causing a ZeroDivisionError
 
 2005-06-02 backend_gtk.py remove DBL_BUFFER, add line to expose_event to
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -465,6 +465,13 @@ def validate_ps_papersize(s):
         return s
     else:
         raise ValueError('ps.papersize must be one of: %s'% ', '.join(papertypes))
+        
+
+def validate_tex_engine(s):
+    if s.lower() in ['tex', 'latex']:
+        return s
+    else:
+        raise ValueError('text.tex.engine must be one of: tex, latex')
 
 
 # a map from key -> value, converter
@@ -511,10 +518,12 @@ def validate_ps_papersize(s):
     'font.cursive'      : ['cursive', validate_comma_sep_str],
     'font.fantasy'      : ['fantasy', validate_comma_sep_str],
     'font.monospace'    : ['monospace', validate_comma_sep_str],
+    'font.latex.package': ['type1cm', str],          # LaTeX font package: txfonts, pslatex, ...
 
     # text props
     'text.color'        : ['k', validate_color],     # black
-    'text.usetex'       : [False, validate_bool],     # black    
+    'text.usetex'       : [False, validate_bool],
+    'text.tex.engine'   : ['tex', validate_tex_engine], # TeX or LaTeX
     'text.fontstyle'    : ['normal', str],
     'text.fontangle'    : ['normal', str],
     'text.fontvariant'  : ['normal', str],
diff --git a/lib/matplotlib/backends/backend_ps.py b/lib/matplotlib/backends/backend_ps.py
@@ -1038,8 +1038,8 @@ def print_figure(self, outfile, dpi=72,
                                'Defaulting to letter.')
                 latexPaperType = 'letterpaper'
             print >>latexh, r"""\documentclass[%s]{article}
+\usepackage{%s}
 \usepackage{psfrag}
-\usepackage{type1cm}
 \usepackage[dvips]{graphicx}
 \usepackage{color}
 \pagestyle{empty}
@@ -1051,18 +1051,20 @@ def print_figure(self, outfile, dpi=72,
 \end{center}
 \end{figure}
 \end{document}
-"""% (latexPaperType, '\n'.join(renderer.psfrag), epsfile)
+"""% (latexPaperType, rcParams['font.latex.package'], 
+        '\n'.join(renderer.psfrag), epsfile)
         
             latexh.close()
 
-            command = 'latex %s' % texfile
+            command = command = "latex -interaction=nonstopmode '%s'" % texfile
             os.system(command)
-            command = 'dvips -o %s %s' % (psfile, basename+'.dvi')
+            os.system(command)
+            command = 'dvips -q -o %s %s' % (psfile, basename+'.dvi')
             os.system(command)
             if ext.startswith('.ep'):
-                command = 'ps2epsi %s %s' % (psfile, outfile)
-                msg = os.system(command)
-                if msg==32512: raise 'ps2epsi: command not found! Please install Ghostscript.'
+                command = 'gs -dBATCH -dNOPAUSE -dSAFER -q -r6000 -sDEVICE=epswrite ' + \
+                            '-dLanguageLevel=3 -dEPSFitPage -sOutputFile=%s %s'% (outfile, psfile)
+                os.system(command)
                 os.remove(psfile)
             os.remove(texfile)
             os.remove(basename+'.dvi')
diff --git a/lib/matplotlib/texmanager.py b/lib/matplotlib/texmanager.py
@@ -31,7 +31,7 @@
 """
 
 import os, sys, md5, shutil
-from matplotlib import get_home, get_data_path
+from matplotlib import get_home, get_data_path, rcParams
 from matplotlib._image import readpng
 from matplotlib.numerix import ravel, where, array, \
      zeros, Float, absolute, nonzero, sqrt
@@ -66,16 +66,32 @@ def make_dvi(self, tex, force=0):
 
         logfile = prefix + '.log'
         fh = file(fname, 'w')
-        s = r"""\def\frac#1#2{ {#1 \over #2} }
+        if rcParams['text.tex.engine'] == 'latex':
+            s = r"""\documentclass{article}
+\usepackage{%s}
+\setlength{\paperwidth}{72in}
+\setlength{\paperheight}{72in}
+\pagestyle{empty}
+\begin{document}
+%s
+\end{document}
+""" % (rcParams['font.latex.package'], tex)
+            fh.write(s)
+            fh.close()
+            command = "latex -interaction=nonstopmode '%s'"%fname
+            try: os.remove(prefix + '.aux')
+            except OSError: pass
+        else:
+            s = r"""\def\frac#1#2{ {#1 \over #2} }
 \nopagenumbers
 \hsize=72in
 \vsize=72in
 %s
 \bye
 """ % tex
-        fh.write(s)
-        fh.close()
-        command = 'tex %s'%fname
+            fh.write(s)
+            fh.close()
+            command = 'tex %s'%fname
 
         if force or not os.path.exists(dvifile):
             #sin, sout = os.popen2(command)
@@ -117,7 +133,7 @@ def make_ps(self, tex, dpi, force=0):
         psfile = os.path.join(self.texcache, '%s_%d.epsf'% (prefix, dpi))
 
         if not os.path.exists(psfile):
-            command = "dvips -E -D %d -o %s %s"% (dpi, psfile, dvifile)
+            command = "dvips -q -E -D %d -o %s %s"% (dpi, psfile, dvifile)
             os.system(command)
 
         return psfile
