afm an option for ps text

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

Author: jdh2358

.matplotlibrc

@@ -171,9 +171,13 @@ savefig.dpi       : 100      # figure dots per inch
 savefig.facecolor : white    # figure facecolor when saving
 savefig.edgecolor : white    # figure edgecolor when saving
 
+# tk backend params
 tk.window_focus   : False    # Maintain shell focus for TkAgg
 tk.pythoninspect  : False    # tk sets PYTHONINSEPCT
 
+# ps backend params
+ps.useafm         : True    # use of afm fonts -- breaks mathtext but results in small files
+
 # Set the verbose flags.  This controls how much information
 # matplotlib gives you at runtime and where it goes.  Ther verbosity
 # levels are: silent, helpful, debug, debug-annoying.  Any level is

CHANGELOG

@@ -1,5 +1,13 @@
 New entries should be added at the top
 
+2005-02-23 Added rc param ps.useafm so backend ps can use native afm
+           fonts or truetype.  afme breaks mathtext but causes much
+           smaller font sizes and may result in images that display
+           better in some contexts (eg pdfs incorporated into latex
+           docs viewed in acrobat reader).  I would like to extend
+           this approach to allow the user to use truetype only for
+           mathtext, which should be easy.
+
 2005-02-23 Used sequence protocol rather than tuple in agg collection
            drawing routines for greater flexibility - JDH
 

TODO

@@ -649,8 +649,10 @@ ZeroDivisionError: SeparableTransformation::eval_scalars yin interval is zero; c
 
 -- keypress mods on pan/zoom broken in QT in linux
 
--- linestyles in contour
+-- DONE linestyles in contour
 
 -- check stabar in wx with toolbar = None or classic
 
--- nan handling?
+-- nan handling?
+
+-- kwarg processing - eg raise on unrecognized kwargs

examples/backend_driver.py

@@ -106,7 +106,7 @@ def drive(backend, python='python2.3'):
 #backends = ['Agg', 'Cairo', 'GDK', 'PS', 'SVG', 'Template']
 backends = ['Agg', 'PS', 'SVG', 'Template']
 #backends = [ 'GTK', 'WX', 'TkAgg']
-#backends = ['Agg']
+backends = ['PS']
 python = 'python2.3'
 for backend in backends:
     print 'testing %s' % backend

lib/matplotlib/__init__.py

@@ -545,6 +545,7 @@ def validate_verbose_fileo(s):
 
     'tk.window_focus'   : [ False, validate_bool],  # Maintain shell focus for TkAgg
     'tk.pythoninspect'   : [ False, validate_bool],  # Set PYTHONINSPECT
+    'ps.useafm'   : [ False, validate_bool],  # Set PYTHONINSPECT
     'plugins.directory' : ['.matplotlib_plugins', str], # where plugin directory is locate
 
     }

lib/matplotlib/backends/__init__.py

@@ -6,7 +6,7 @@
 
 interactive_bk     = ['GTK','GTKAgg','GTKCairo','FltkAgg','QtAgg', 'TkAgg',
                       'WX','WXAgg',]
-non_interactive_bk = ['Agg','Cairo','GD','GDK','Paint','PS','SVG','Template']
+non_interactive_bk = ['Agg','Cairo','GD','GDK','Paint','PS', 'SVG','Template']
 all_backends       = interactive_bk + non_interactive_bk
 
 backend = matplotlib.get_backend()

lib/matplotlib/backends/backend_ps.py

@@ -6,8 +6,9 @@
 from __future__ import division
 import sys, os, time
 from cStringIO import StringIO
-from matplotlib import verbose, __version__
+from matplotlib import verbose, __version__, rcParams
 from matplotlib._pylab_helpers import Gcf
+from matplotlib.afm import AFM
 from matplotlib.backend_bases import RendererBase, GraphicsContextBase,\
      FigureManagerBase, FigureCanvasBase
 
@@ -34,8 +35,10 @@
 
 def _num_to_str(val):
     if is_string_like(val): return val
+
     ival = int(val)
     if val==ival: return str(ival)
+
     s = "%1.3f"%val
     s = s.rstrip("0")
     s = s.rstrip(".")
@@ -54,6 +57,7 @@ def quote_ps_string(s):
 
 
 _fontd = {}
+_afmfontd = {}
 _type42 = []
 
 
@@ -130,6 +134,7 @@ def set_linedash(self, offset, seq):
         self.linedash = (offset,seq)
 
     def set_font(self, fontname, fontsize):
+        if rcParams['ps.useafm']: return
         if (fontname,fontsize) != (self.fontname,self.fontsize):
             out = ("/%s findfont\n"
                    "%1.3f scalefont\n"
@@ -147,12 +152,23 @@ def get_text_width_height(self, s, prop, ismath):
         get the width and height in display coords of the string s
         with FontPropertry prop
         """
+
+        if rcParams['ps.useafm']:
+            if ismath: s = s[1:-1]
+            font = self._get_font_afm(prop)
+            l,b,w,h = font.get_str_bbox(s)
+
+            fontsize = prop.get_size_in_points()
+            w *= 0.001*fontsize
+            h *= 0.001*fontsize
+            return w, h
+
         if ismath:
             width, height, pswriter = math_parse_s_ps(
                 s, 72, prop.get_size_in_points())
             return width, height
 
-        font = self._get_font(prop)
+        font = self._get_font_ttf(prop)
         font.set_text(s, 0.0)
         w, h = font.get_width_height()
         w /= 64.0  # convert from subpixels
@@ -163,7 +179,15 @@ def flipy(self):
         'return true if small y numbers are top for renderer'
         return False
 
-    def _get_font(self, prop):
+    def _get_font_afm(self, prop):
+        key = hash(prop)
+        font = _afmfontd.get(key)
+        if font is None:
+            font = AFM(file(fontManager.findfont(prop, fontext='afm')))
+            _afmfontd[key] = font
+        return font
+
+    def _get_font_ttf(self, prop):
         key = hash(prop)
         font = _fontd.get(key)
         if font is None:
@@ -381,26 +405,63 @@ def draw_text(self, gc, x, y, s, prop, angle, ismath):
         """
         # local to avoid repeated attribute lookups
         write = self._pswriter.write
-        if ismath:
-            return self.draw_mathtext(gc, x, y, s, prop, angle)
         if debugPS:
             write("% text\n")
-        
-        font = self._get_font(prop)
-        font.set_text(s,0)
 
-        self.set_color(*gc.get_rgb())
-        self.set_font(font.get_sfnt()[(1,0,0,6)], prop.get_size_in_points())
-        write("%s m\n"%_nums_to_str(x,y))
-        if angle:
-            write("gsave\n")
-            write("%s rotate\n"%_num_to_str(angle))
-        descent = font.get_descent() / 64.0
-        if descent:
-            write("0 %s rmoveto\n"%_num_to_str(descent))
-        write("(%s) show\n"%quote_ps_string(s))
-        if angle:
-            write("grestore\n")
+        if rcParams['ps.useafm']:
+            if ismath: s = s[1:-1]
+            font = self._get_font_afm(prop)
+
+            l,b,w,h = font.get_str_bbox(s)
+
+            fontsize = prop.get_size_in_points()
+            l *= 0.001*fontsize
+            b *= 0.001*fontsize
+            w *= 0.001*fontsize
+            h *= 0.001*fontsize
+
+            if angle==90: l,b = -b, l # todo generalize for arb rotations
+
+            pos = _nums_to_str(x-l, y-b)
+            thetext = '(%s)' % s
+            fontname = font.get_fontname()
+            fontsize = prop.get_size_in_points()
+            rotate = '%1.1f rotate' % angle
+            setcolor = '%1.3f %1.3f %1.3f setrgbcolor' % gc.get_rgb()
+            #h = 0
+            ps = """\
+gsave
+/%(fontname)s findfont
+%(fontsize)s scalefont
+setfont
+%(pos)s moveto
+%(rotate)s
+%(thetext)s
+%(setcolor)s
+show
+grestore
+    """ % locals()
+            self._draw_ps(ps, gc, None)
+
+        else:
+            if ismath:
+                return self.draw_mathtext(gc, x, y, s, prop, angle)
+
+            font = self._get_font_ttf(prop)
+            font.set_text(s,0)
+
+            self.set_color(*gc.get_rgb())
+            self.set_font(font.get_sfnt()[(1,0,0,6)], prop.get_size_in_points())
+            write("%s m\n"%_nums_to_str(x,y))
+            if angle:
+                write("gsave\n")
+                write("%s rotate\n"%_num_to_str(angle))
+            descent = font.get_descent() / 64.0
+            if descent:
+                write("0 %s rmoveto\n"%_num_to_str(descent))
+            write("(%s) show\n"%quote_ps_string(s))
+            if angle:
+                write("grestore\n")
 
     def new_gc(self):
         return GraphicsContextPS()
@@ -657,18 +718,23 @@ def print_figure(self, outfile, dpi=72,
         type42 = _type42 + [os.path.join(self.basepath, name) + '.ttf' \
                             for name in bakoma_fonts]
         print >>fh, "%%BeginProlog"
-        print >>fh, "/mpldict %d dict def"%(len(_psDefs)+len(type42))
+        Ndict = len(_psDefs)
+        if not rcParams['ps.useafm']:
+            Ndict += len(type42)
+        print >>fh, "/mpldict %d dict def"%Ndict
         print >>fh, "mpldict begin"
+
         for d in _psDefs:
             d=d.strip()
             for l in d.split('\n'):
                 print >>fh, l.strip()
-        for font in type42:
-            font = str(font)  # TODO: handle unicode filenames
-            print >>fh, "%%BeginFont: "+FT2Font(font).postscript_name
-            print >>fh, encodeTTFasPS(font)
-            print >>fh, "%%EndFont"
-        print >>fh, "%%EndProlog"
+        if not rcParams['ps.useafm']:
+            for font in type42:
+                font = str(font)  # TODO: handle unicode filenames
+                print >>fh, "%%BeginFont: "+FT2Font(font).postscript_name
+                print >>fh, encodeTTFasPS(font)
+                print >>fh, "%%EndFont"
+            print >>fh, "%%EndProlog"
 
         if not isEPSF: print >>fh, "%%Page: 1 1"
         print >>fh, "mpldict begin"

lib/matplotlib/cbook.py

@@ -530,3 +530,17 @@ def remove(self, o):
 def popall(seq):
     'empty a list'
     for i in xrange(len(seq)): seq.pop()
+
+def finddir(o, match, case=False):
+    """
+    return all attributes of o which match string in match.  if case
+    is True require an exact case match.  
+    """
+    if case:
+        names = [(name,name) for name in dir(o) if is_string_like(name)]
+    else:
+        names = [(name.lower(), name) for name in dir(o) if is_string_like(name)]
+        match = match.lower()
+    return [orig for name, orig in names if name.find(match)>=0]
+
+    

lib/matplotlib/lines.py

@@ -188,8 +188,10 @@ def set_data(self, *args):
         self._x = asarray(x, Float)
         self._y = asarray(y, Float)
 
-        if len(self._x.shape)>1: self._x = ravel(self._x)
-        if len(self._y.shape)>1: self._y = ravel(self._y)
+        if len(self._x.shape)>1:
+            self._x = ravel(self._x)
+        if len(self._y.shape)>1:
+            self._y = ravel(self._y)
 
 
         if len(self._y)==1 and len(self._x)>1:

lib/matplotlib/pylab.py

@@ -1578,6 +1578,17 @@ def ion():
     matplotlib.interactive(True)
 
 def switch_backend(newbackend):
+    """
+    Swtich the default backend to newbackend.  This feature is
+    EXPERIMENTAL, and is only expected to work switching to an image
+    backend.  Eg, if you have a bunch of PS scripts that you want to
+    run from an interactive ipython session, yuo may want to switch to
+    the PS backend before running them to avoid having a bunch of GUI
+    windows popup.  If you try to interactively switch from one GUI
+    backend to another, you will explode.
+
+    Calling this command will close all open windows.
+    """
     close('all')
     global new_figure_manager, draw_if_interactive, show
     matplotlib.use(newbackend)

lib/matplotlib/text.py

@@ -600,7 +600,7 @@ def _get_layout_super(self, renderer, m):
         w = wb+we
 
         xb, yb = self._transform.xy_tup((self._x, self._y))
-        xe = xb+wb
+        xe = xb+1.1*wb
         ye = yb+0.5*hb
         h = ye+he-yb