Fixed color, alignment bugs in the latex backend.

ddale · ddale · commit 403785dc747e · 2005-05-24T21:10:20.000Z
svn path=/trunk/matplotlib/; revision=1364
diff --git a/examples/tex_demo.py b/examples/tex_demo.py
@@ -6,12 +6,10 @@
 s = cos(2*2*pi*t)
 plot(t, s)
 
-xlabel('time (s)')
-ylabel('voltage (mV)')
-##title(r"\TeX\ is Number $\displaystyle\sum_{n=1}^\infty\frac{-e^{i\pi}}{2^n}$!", 
-##        fontsize=20)
+xlabel(r'\bf{time (s)}')
+ylabel(r'\it{voltage (mV)}',fontsize=16)
 title(r"\TeX\ is Number $\displaystyle\sum_{n=1}^\infty{-e^{i\pi} \over 2^n}$!", 
-        fontsize=20)
+        {'bbox':{'fc':0.8,'pad':0}}, fontsize=16, color='r')
 grid(True)
 savefig('tex_demo')
 
diff --git a/lib/matplotlib/backends/backend_latex.py b/lib/matplotlib/backends/backend_latex.py
@@ -23,8 +23,8 @@ def get_text_width_height(self, s, prop, ismath):
         """
         fontsize = prop.get_size_in_points()
         l,b,r,t = self.texmanager.get_ps_bbox(s)
-        w = (r-l)#*fontsize/10.
-        h = (t-b)#*fontsize/10.
+        w = (r-l)*fontsize/10.
+        h = (t-b)*fontsize/10.
         #print s, w, h
         return w, h
 
@@ -37,15 +37,13 @@ def draw_text(self, gc, x, y, s, prop, angle, ismath):
         corr = 0#w/2*(fontsize-10)/10
         pos = _nums_to_str(x-corr, y)
         thetext = 'psmarker%d' % self.textcnt
-        setcolor = '%1.3f %1.3f %1.3f setrgbcolor' % gc.get_rgb()
         scale = float(fontsize/10.0)
-        color = r'\rgb %1.3f %1.3f %1.3f'%gc.get_rgb()
-        tex = '\color{rgb}{%s}'%s
-        self.psfrag.append(r'\psfrag{%s}[bl][bl][%f][%f]{%s}'%(thetext, scale, angle, s))
+        color = '%1.3f,%1.3f,%1.3f'% gc.get_rgb()
+        tex = r'\color[rgb]{%s} %s' % (color, s)
+        self.psfrag.append(r'\psfrag{%s}[bl][bl][%f][%f]{%s}'%(thetext, scale, angle, tex))
         ps = """\
 gsave
 %(pos)s moveto
-%(setcolor)s
 (%(thetext)s)
 show
 grestore
@@ -55,8 +53,6 @@ def draw_text(self, gc, x, y, s, prop, angle, ismath):
         self.textcnt += 1
 
 
-
-
 class FigureCanvasLatex(FigureCanvasBase):
     basepath = get_data_path()
 
@@ -82,7 +78,7 @@ def print_figure(self, outfile, dpi=72,
         latexh = file(outfile, 'w')
 
         # center the figure on the paper
-        self.figure.dpi.set(72)        # ignore the passsed dpi setting for PS
+        self.figure.dpi.set(72)        # ignore the passed dpi setting for PS
         width, height = self.figure.get_size_inches()
 
         if orientation=='landscape':
@@ -161,14 +157,13 @@ def print_figure(self, outfile, dpi=72,
         print >>latexh, r"""\documentclass{article}
 \usepackage{psfrag}
 \usepackage[dvips]{graphicx}
+\usepackage{color}
 \pagestyle{empty}
 \begin{document}
 
-
 \begin{figure}[t]
   %s
-  \resizebox{5.5in}{!}{\includegraphics{%s}}
- 
+  \scalebox{1}{\includegraphics{%s}}
 \end{figure}
 
 \end{document}
diff --git a/lib/matplotlib/texmanager.py b/lib/matplotlib/texmanager.py
@@ -13,6 +13,9 @@
 from matplotlib._image import readpng, fromarray
 from matplotlib.numerix import ravel, where, array, \
      zeros, Float, absolute, nonzero, sqrt
+     
+debug = False
+     
 class TexManager:
     """
     Convert strings to dvi files using TeX, caching the results to a
@@ -31,33 +34,27 @@ def __init__(self):
         self.pscnt = 0
         self.dvipngVersion = None
         
-    def make_dvi(self, tex):
+    def make_dvi(self, tex, force=0):
+        if debug: force = True
+        
         prefix = self.get_prefix(tex)
         fname = os.path.join(self.texcache, prefix+ '.tex')
         dvitmp = prefix + '.dvi'
         dvifile = os.path.join(self.texcache, dvitmp)
 
         logfile = prefix + '.log'
         fh = file(fname, 'w')
-        if True: #use latex
-            s = r"""\documentclass{article}
-\pagestyle{empty}
-\begin{document}
-%s
-\end{document}
-""" % tex
-            fh.write(s)
-            fh.close()
-            command = 'latex %s'%fname
-        else:
-            s = r"""\nopagenumbers
+        s = r"""\nopagenumbers
+\hsize=72in
+\vsize=72in
 %s
 \bye
 """ % tex
-            fh.write(s)
-            fh.close()
-            command = 'tex %s'%fname
-        if not os.path.exists(dvifile):
+        fh.write(s)
+        fh.close()
+        command = 'tex %s'%fname
+
+        if force or not os.path.exists(dvifile):
             #sin, sout = os.popen2(command)
             #sout.close()
             os.system(command)
@@ -70,6 +67,8 @@ def get_prefix(self, tex):
         return md5.md5(tex).hexdigest()
         
     def make_png(self, tex, dpi, force=0):
+        if debug: force = True
+        
         dvifile = self.make_dvi(tex)
         prefix = self.get_prefix(tex)
         pngfile = os.path.join(self.texcache, '%s_%d.png'% (prefix, dpi))
@@ -88,6 +87,8 @@ def make_png(self, tex, dpi, force=0):
         return pngfile
 
     def make_ps(self, tex, dpi, force=0):
+        if debug: force = True
+        
         dvifile = self.make_dvi(tex)
         prefix = self.get_prefix(tex)
         psfile = os.path.join(self.texcache, '%s_%d.epsf'% (prefix, dpi))
