added caching for tex/agg

svn path=/trunk/matplotlib/; revision=1429

Author: jdh2358

.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' 
+font.latex.package  : type1cm  # This must be an available LaTeX font
+#package, like 'times' or 'pslatex' ; only applies if text.usetex is set
 
 ### 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.usetex         : False  # use tex/latex 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

Makefile

@@ -15,7 +15,7 @@ clean:
 	rm -f *.png *.ps *.eps *.svg *.jpg
 	find . -name "_tmp*.py" | xargs rm -f;\
 	find . \( -name "*~" -o -name "*.pyc" \) | xargs rm -f;\
-	find examples \( -name "*.svg" -o -name "*.png" -o -name "*.ps"  -o -name "*.eps" -o -name "*.tar" -name "*.gz" \) | xargs rm -f
+	find examples \( -name "*.svg" -o -name "*.png" -o -name "*.ps"  -o -name "*.eps" -o -name "*.tar" -o  -name "*.gz" -o -name "*.log" -o -name "*.aux" -o -name "*.tex" \) | xargs rm -f
 	find unit \( -name "*.png" -o -name "*.ps"  -o -name "*.eps" \) | xargs rm -f
 	find . \( -name "#*" -o -name ".#*" -o -name ".*~" -o -name "*~" \) | xargs rm -f
 

examples/tex_demo.py

@@ -1,5 +1,21 @@
 #!/usr/bin/env python
-from pylab import *
+"""
+You can use TeX to render all of your matplotlib text if the rc
+parameter text.usetex is set.  This works currently on the agg and ps
+backends, and requires that you have tex and the other dependencies
+described at http://matplotlib.sf.net/matplotlib.texmanager.html
+properly installed on your system.  The first time you run a script
+you will see a lot of output from tex and associated tools.  The next
+time, the run may be silent, as a lot of the information is cached in
+~/.tex.cache
+
+"""
+from matplotlib import rc
+from matplotlib.numerix import arange, cos, pi
+from pylab import figure, axes, plot, xlabel, ylabel, title, \
+     grid, savefig, show
+
+
 rc('text', usetex=True)
 figure(1)
 ax = axes([0.1, 0.1, 0.8, 0.7])

lib/matplotlib/__init__.py

@@ -142,7 +142,7 @@
 """
 from __future__ import generators
 
-__version__  = '0.81alpha'
+__version__  = '0.81rc1'
 __revision__ = '$Revision$'
 __date__     = '$Date$'
 

lib/matplotlib/backends/backend_agg.py

@@ -123,6 +123,7 @@ def __init__(self, width, height, dpi):
         self.cache = self._renderer.cache
         self.blit = self._renderer.blit
         self.texmanager = TexManager()
+        self.texd = {}  # a cache of tex image rasters
         self.bbox = lbwh_to_bbox(0,0, self.width, self.height)
 
 
@@ -254,27 +255,33 @@ def draw_tex(self, gc, x, y, s, prop, angle):
 
         flip = angle==90
         w,h = self.get_text_width_height(s, prop, 'TeX', rgb)
-
-        Z = self.texmanager.get_rgba(s, size, dpi, rgb)
         if flip:
             w,h = h,w
             x -= w
-            r = Z[:,:,0]
-            g = Z[:,:,1]
-            b = Z[:,:,2]
-            a = Z[:,:,3]
-            m,n,tmp = Z.shape
-            
-            def func(x):
-                return transpose(fliplr(x))
-                
-            Z = zeros((n,m,4), typecode=Float)
-            Z[:,:,0] = func(r)
-            Z[:,:,1] = func(g)
-            Z[:,:,2] = func(b)
-            Z[:,:,3] = func(a)
-
-        im = fromarray(Z, 1)
+
+        key = s, size, dpi, rgb
+        im = self.texd.get(key)
+        
+        if im is None:
+            Z = self.texmanager.get_rgba(s, size, dpi, rgb)
+            if flip:
+                r = Z[:,:,0]
+                g = Z[:,:,1]
+                b = Z[:,:,2]
+                a = Z[:,:,3]
+                m,n,tmp = Z.shape
+
+                def func(x):
+                    return transpose(fliplr(x))
+
+                Z = zeros((n,m,4), typecode=Float)
+                Z[:,:,0] = func(r)
+                Z[:,:,1] = func(g)
+                Z[:,:,2] = func(b)
+                Z[:,:,3] = func(a)
+            im = fromarray(Z, 1)
+            self.texd[key] = im            
+
         self.draw_image(x, y-h, im, 'upper', self.bbox)
 
     def get_canvas_width_height(self):

lib/matplotlib/texmanager.py

@@ -10,7 +10,8 @@
 
   *Agg backends: dvipng
 
-  PS backend: latex w/ psfrag, dvips
+  PS backend: latex w/ psfrag, dvips, and Ghostscript 8.51
+  (older versions do not work properly)
 
 Backends: