added switch to use latex or tex

ddale · ddale · commit c6d50853ee2d · 2005-05-24T17:04:28.000Z
svn path=/trunk/matplotlib/; revision=1363
diff --git a/examples/tex_demo.py b/examples/tex_demo.py
@@ -8,7 +8,9 @@
 
 xlabel('time (s)')
 ylabel('voltage (mV)')
-title(r"\TeX\ is Number $\displaystyle\sum_{n=1}^\infty\frac{-e^{i\pi}}{2^n}$!", 
+##title(r"\TeX\ is Number $\displaystyle\sum_{n=1}^\infty\frac{-e^{i\pi}}{2^n}$!", 
+##        fontsize=20)
+title(r"\TeX\ is Number $\displaystyle\sum_{n=1}^\infty{-e^{i\pi} \over 2^n}$!", 
         fontsize=20)
 grid(True)
 savefig('tex_demo')
diff --git a/lib/matplotlib/backends/backend_latex.py b/lib/matplotlib/backends/backend_latex.py
@@ -21,9 +21,10 @@ def get_text_width_height(self, s, prop, ismath):
         get the width and height in display coords of the string s
         with FontPropertry prop
         """
+        fontsize = prop.get_size_in_points()
         l,b,r,t = self.texmanager.get_ps_bbox(s)
-        w = r-l
-        h = t-b
+        w = (r-l)#*fontsize/10.
+        h = (t-b)#*fontsize/10.
         #print s, w, h
         return w, h
 
@@ -33,7 +34,7 @@ def draw_text(self, gc, x, y, s, prop, angle, ismath):
         """
         w, h = self.get_text_width_height(s, prop, ismath)
         fontsize = prop.get_size_in_points()
-        corr = w/2*(fontsize-10)/10
+        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()
diff --git a/lib/matplotlib/texmanager.py b/lib/matplotlib/texmanager.py
@@ -39,16 +39,24 @@ def make_dvi(self, tex):
 
         logfile = prefix + '.log'
         fh = file(fname, 'w')
-##        fh.write(tex + '\n\\nopagenumbers\n\\bye\n')
-        s = r"""\documentclass{article}
+        if True: #use latex
+            s = r"""\documentclass{article}
 \pagestyle{empty}
 \begin{document}
 %s
-\end{document}""" % tex
-        fh.write(s)
-        fh.close()
-##        command = 'tex %s'%fname
-        command = 'latex %s'%fname
+\end{document}
+""" % tex
+            fh.write(s)
+            fh.close()
+            command = 'latex %s'%fname
+        else:
+            s = r"""\nopagenumbers
+%s
+\bye
+""" % tex
+            fh.write(s)
+            fh.close()
+            command = 'tex %s'%fname
         if not os.path.exists(dvifile):
             #sin, sout = os.popen2(command)
             #sout.close()
