fixed a tex cache agg key bug

jdh2358 · jdh2358 · commit 5756b34a9120 · 2005-08-12T19:04:19.000Z
svn path=/trunk/matplotlib/; revision=1629
diff --git a/lib/matplotlib/backends/backend_agg.py b/lib/matplotlib/backends/backend_agg.py
@@ -265,7 +265,7 @@ def draw_tex(self, gc, x, y, s, prop, angle):
             w,h = h,w
             x -= w
 
-        key = s, size, dpi, rgb
+        key = s, size, dpi, rgb, angle
         im = self.texd.get(key)
         
         if im is None:
diff --git a/lib/matplotlib/backends/backend_ps.py b/lib/matplotlib/backends/backend_ps.py
@@ -1083,10 +1083,12 @@ def print_figure(self, outfile, dpi=72,
             latexh.close()
 
             command = 'latex -interaction=nonstopmode "%s"' % texfile
+            verbose.report(command, 'debug-annoying')
             stdin, stdout, stderr = os.popen3(command)
             verbose.report(stdout.read(), 'debug-annoying')
             verbose.report(stderr.read(), 'helpful')
             command = 'dvips -R -T %fin,%fin -o "%s" "%s"' % (pw, ph, psfile, dvifile)
+            verbose.report(command, 'debug-annoying')
             stdin, stdout, stderr = os.popen3(command)
             verbose.report(stdout.read(), 'debug-annoying')
             verbose.report(stderr.read(), 'helpful')
@@ -1096,6 +1098,7 @@ def print_figure(self, outfile, dpi=72,
                 command = 'gs -dBATCH -dNOPAUSE -dSAFER -r%d \
                     -sDEVICE=epswrite -dLanguageLevel=2 -dEPSFitPage \
                     -sOutputFile="%s" "%s"'% (dpi, epsfile, psfile)
+                verbose.report(command, 'debug-annoying')
                 stdin, stdout, stderr = os.popen3(command)
                 verbose.report(stdout.read(), 'debug-annoying')
                 verbose.report(stderr.read(), 'helpful')
@@ -1113,6 +1116,7 @@ def print_figure(self, outfile, dpi=72,
                 command = 'eps2eps -dSAFER -r%d "%s" "%s"'% (dpi, outfile, tmpfile)
             else:
                 command = 'ps2ps -dSAFER -r%d "%s" "%s"'% (dpi, outfile, tmpfile)
+            verbose.report(command, 'debug-annoying')
             stdin, stdout, stderr = os.popen3(command)
             verbose.report(stdout.read(), 'debug-annoying')
             verbose.report(stderr.read(), 'helpful')
diff --git a/lib/matplotlib/texmanager.py b/lib/matplotlib/texmanager.py
@@ -114,6 +114,7 @@ def make_dvi(self, tex, force=0):
 
         if force or not os.path.exists(dvifile):
             command = self.get_tex_command(tex, fname)
+            verbose.report(command, 'debug-annoying')            
             stdin, stdout, stderr = os.popen3(command)
             verbose.report(stdout.read(), 'debug-annoying')
             err = stderr.read()
@@ -145,6 +146,7 @@ def make_png(self, tex, dpi, force=0):
 
         # see get_rgba for a discussion of the background
         if force or not os.path.exists(pngfile):
+            verbose.report(command, 'debug-annoying')
             stdin, stdout, stderr = os.popen3(command)
             verbose.report(stdout.read(), 'debug-annoying')
             err = stderr.read()
@@ -160,6 +162,7 @@ def make_ps(self, tex, dpi, force=0):
 
         if not os.path.exists(psfile):
             command = 'dvips -q -E -D %d -o "%s" "%s"'% (dpi, psfile, dvifile)
+            verbose.report(command, 'debug-annoying')
             stdin, stdout, stderr = os.popen3(command)
             verbose.report(stdout.read(), 'debug-annoying')
             err = stderr.read()
