First pass of Type 3 font subsetting for Postscript backend. Made

ttconv code exception and threadsafe.  Added subsetting.

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

Author: mdboom

lib/matplotlib/backends/backend_ps.py

@@ -20,7 +20,8 @@ def _fn_name(): return sys._getframe(1).f_code.co_name
 
 from matplotlib.font_manager import fontManager
 from matplotlib.ft2font import FT2Font, KERNING_UNFITTED, KERNING_DEFAULT, KERNING_UNSCALED
-from matplotlib.mathtext import math_parse_s_ps, bakoma_fonts
+from matplotlib.ttf2ps import convert_ttf_to_ps
+from matplotlib.mathtext import math_parse_s_ps
 from matplotlib.text import Text
 
 from matplotlib.transforms import get_vec6_scales
@@ -29,6 +30,7 @@ def _fn_name(): return sys._getframe(1).f_code.co_name
     fromstring, nonzero, ones, put, take, where, isnan
 import binascii
 import re
+import sets
 
 if sys.platform.startswith('win'): cmd_split = '&'
 else: cmd_split = ';'
@@ -97,11 +99,6 @@ def quote_ps_string(s):
     return s
 
 
-_fontd = {}
-_afmfontd = {}
-_type42 = []
-
-
 def seq_allequal(seq1, seq2):
     """
     seq1 and seq2 are either None or sequences or numerix arrays
@@ -145,6 +142,17 @@ def __init__(self, width, height, pswriter, dpi=72):
         self.hatch = None
         self.image_magnification = dpi/72.0
 
+        self.fontd = {}
+        self.afmfontd = {}
+        self.used_characters = {}
+
+    def track_characters(self, font, s):
+        """Keeps track of which characters are required from
+        each font."""
+        fname = font.fname
+        used_characters = self.used_characters.setdefault(fname, sets.Set())
+        used_characters.update(s)
+
     def set_color(self, r, g, b, store=1):
         if (r,g,b) != self.color:
             if r==g and r==b:
@@ -264,7 +272,7 @@ def get_text_width_height(self, s, prop, ismath):
 
         if ismath:
             width, height, pswriter = math_parse_s_ps(
-                s, 72, prop.get_size_in_points())
+                s, 72, prop.get_size_in_points(), 0, self.track_characters)
             return width, height
 
         if rcParams['ps.useafm']:
@@ -291,21 +299,19 @@ def flipy(self):
 
     def _get_font_afm(self, prop):
         key = hash(prop)
-        font = _afmfontd.get(key)
+        font = self.afmfontd.get(key)
         if font is None:
             font = AFM(file(fontManager.findfont(prop, fontext='afm')))
-            _afmfontd[key] = font
+            self.afmfontd[key] = font
         return font
 
     def _get_font_ttf(self, prop):
         key = hash(prop)
-        font = _fontd.get(key)
+        font = self.fontd.get(key)
         if font is None:
             fname = fontManager.findfont(prop)
             font = FT2Font(str(fname))
-            _fontd[key] = font
-            if fname not in _type42:
-                _type42.append(fname)
+            self.fontd[key] = font
         font.clear()
         size = prop.get_size_in_points()
         font.set_size(size, 72.0)
@@ -727,6 +733,7 @@ def draw_text(self, gc, x, y, s, prop, angle, ismath):
         else:
             font = self._get_font_ttf(prop)
             font.set_text(s,0)
+            self.track_characters(font, s)
 
             self.set_color(*gc.get_rgb())
             self.set_font(font.get_sfnt()[(1,0,0,6)], prop.get_size_in_points())
@@ -753,6 +760,7 @@ def draw_unicode(self, gc, x, y, s, prop, angle):
 
         self.set_color(*gc.get_rgb())
         self.set_font(font.get_sfnt()[(1,0,0,6)], prop.get_size_in_points())
+        self.track_characters(font, s)
 
         cmap = font.get_charmap()
         lastgind = None
@@ -800,7 +808,7 @@ def draw_mathtext(self, gc,
             self._pswriter.write("% mathtext\n")
 
         fontsize = prop.get_size_in_points()
-        width, height, pswriter = math_parse_s_ps(s, 72, fontsize)
+        width, height, pswriter = math_parse_s_ps(s, 72, fontsize, angle, self.track_characters)
         self.set_color(*gc.get_rgb())
         thetext = pswriter.getvalue()
         ps = """gsave
@@ -873,7 +881,6 @@ def push_gc(self, gc, store=1):
 
 ##        write("\n")
 
-
 class GraphicsContextPS(GraphicsContextBase):
     def get_capstyle(self):
         return {'butt':0,
@@ -893,85 +900,6 @@ def new_figure_manager(num, *args, **kwargs):
     manager = FigureManagerPS(canvas, num)
     return manager
 
-def encodeTTFasPS(fontfile):
-    """
-    Encode a TrueType font file for embedding in a PS file.
-    """
-    font = file(fontfile, 'rb')
-    hexdata, data = [], font.read(65520)
-    b2a_hex = binascii.b2a_hex
-    while data:
-        hexdata.append('<%s>\n' %
-                       '\n'.join([b2a_hex(data[j:j+36]).upper()
-                                  for j in range(0, len(data), 36)]) )
-        data  = font.read(65520)
-
-    hexdata = ''.join(hexdata)[:-2] + '00>'
-    font    = FT2Font(str(fontfile))
-
-    headtab  = font.get_sfnt_table('head')
-    version  = '%d.%d' % headtab['version']
-    revision = '%d.%d' % headtab['fontRevision']
-
-    dictsize = 8
-    fontname = font.postscript_name
-    encoding = 'StandardEncoding'
-    fontbbox = '[%d %d %d %d]' % font.bbox
-
-    posttab  = font.get_sfnt_table('post')
-    minmemory= posttab['minMemType42']
-    maxmemory= posttab['maxMemType42']
-
-    infosize = 7
-    sfnt     = font.get_sfnt()
-    notice   = sfnt[(1,0,0,0)]
-    family   = sfnt[(1,0,0,1)]
-    fullname = sfnt[(1,0,0,4)]
-    iversion = sfnt[(1,0,0,5)]
-    fixpitch = str(bool(posttab['isFixedPitch'])).lower()
-    ulinepos = posttab['underlinePosition']
-    ulinethk = posttab['underlineThickness']
-    italicang= '(%d.%d)' % posttab['italicAngle']
-
-    numglyphs = font.num_glyphs
-    glyphs = []
-    for j in range(numglyphs):
-        glyphs.append('/%s %d def' % (font.get_glyph_name(j), j))
-        if j != 0 and j%4 == 0:
-            glyphs.append('\n')
-        else:
-            glyphs.append(' ')
-    glyphs = ''.join(glyphs)
-    data = ['%%!PS-TrueType-%(version)s-%(revision)s\n' % locals()]
-    if maxmemory:
-        data.append('%%%%VMusage: %(minmemory)d %(maxmemory)d' % locals())
-    data.append("""%(dictsize)d dict begin
-/FontName /%(fontname)s def
-/FontMatrix [1 0 0 1 0 0] def
-/FontType 42 def
-/Encoding %(encoding)s def
-/FontBBox %(fontbbox)s def
-/PaintType 0 def
-/FontInfo %(infosize)d dict dup begin
-/Notice (%(notice)s) def
-/FamilyName (%(family)s) def
-/FullName (%(fullname)s) def
-/version (%(iversion)s) def
-/isFixedPitch %(fixpitch)s def
-/UnderlinePosition %(ulinepos)s def
-/UnderlineThickness %(ulinethk)s def
-end readonly def
-/sfnts [
-%(hexdata)s
-] def
-/CharStrings %(numglyphs)d dict dup begin
-%(glyphs)s
-end readonly def
-FontName currentdict end definefont pop""" % locals())
-    return ''.join(data)
-
-
-
 class FigureCanvasPS(FigureCanvasBase):
     def draw(self):
         pass
@@ -1091,20 +1019,24 @@ def print_figure(self, outfile, dpi=72, facecolor='w', edgecolor='w',
 
             Ndict = len(psDefs)
             print >>fh, "%%BeginProlog"
-            type42 = _type42 + bakoma_fonts
             if not rcParams['ps.useafm']:
-                Ndict += len(type42)
+                Ndict += len(renderer.used_characters)
             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()
             if not rcParams['ps.useafm']:
-                for font in type42:
-                    print >>fh, "%%BeginFont: "+FT2Font(str(font)).postscript_name
-                    print >>fh, encodeTTFasPS(font)
-                    print >>fh, "%%EndFont"
+                for font_filename, chars in renderer.used_characters.items():
+                    font = FT2Font(font_filename)
+                    cmap = font.get_charmap()
+                    glyph_ids = []
+                    for c in chars:
+                        ccode = ord(c)
+                        gind = cmap.get(ccode) or 0
+                        glyph_ids.append(gind)
+                    convert_ttf_to_ps(font_filename, fh, rcParams['ps.fonttype'], glyph_ids)
             print >>fh, "end"
             print >>fh, "%%EndProlog"
 

lib/matplotlib/mathtext.py

@@ -146,8 +146,6 @@
 from matplotlib.numerix import absolute
 from matplotlib import get_data_path, rcParams
 
-bakoma_fonts = []
-
 # symbols that have the sub and superscripts over/under
 overunder = { r'\sum'    : 1,
               r'\int'    : 1,
@@ -416,12 +414,6 @@ def _get_info(self, facename, symbol, fontsize, dpi):
         if tup is not None:
             return tup
         filename = self.filenamesd[facename]
-        # This is used only by the PS backend --- to integrate the fonts
-        # into the resulting PS. TO-DO: fix the PS backend so it doesn't do
-        # these dirty tricks
-        if self.output == 'PS':
-            if filename not in bakoma_fonts:
-                bakoma_fonts.append(filename)
         fontface = self.fonts[facename]
         fontface.set_size(fontsize, dpi)
         head  = fontface.get_sfnt_table('head')
@@ -510,11 +502,6 @@ def _get_info(self, facename, symbol, fontsize, dpi):
         if tup is not None:
             return tup
         filename = self.filenamesd[facename]
-        # This is used only by the PS backend --- to integrate the fonts
-        # into the resulting PS.
-        if self.output == 'PS':
-            if filename not in bakoma_fonts:
-                bakoma_fonts.append(filename)
         fontface = self.fonts[facename]
         fontface.set_size(fontsize, dpi)
         head  = fontface.get_sfnt_table('head')
@@ -718,7 +705,7 @@ class BakomaPSFonts(Fonts):
                 None  : 'cmmi10',
                 }
 
-    def __init__(self):
+    def __init__(self, character_tracker=None):
         self.glyphd = {}
         self.fonts = dict(
             [ (name, FT2Font(os.path.join(self.basepath, name) + '.ttf'))
@@ -731,6 +718,7 @@ def __init__(self):
                 for charcode, glyphind in charmap.items()])
         for font in self.fonts.values():
             font.clear()
+        self.character_tracker = character_tracker
 
     def _get_info (self, font, sym, fontsize, dpi):
         'load the cmfont, metrics and glyph with caching'
@@ -752,14 +740,15 @@ def _get_info (self, font, sym, fontsize, dpi):
             num = 0
             #sym = '.notdef'
             raise ValueError('unrecognized symbol "%s, %d"' % (sym, num))
-        filename = os.path.join(self.basepath, basename) + '.ttf'
-        if filename not in bakoma_fonts:
-            bakoma_fonts.append(filename)
+
         cmfont = self.fonts[basename]
         cmfont.set_size(fontsize, dpi)
         head = cmfont.get_sfnt_table('head')
         glyph = cmfont.load_char(num)
 
+        if self.character_tracker:
+            self.character_tracker(cmfont, unichr(num))
+
         xmin, ymin, xmax, ymax = [val/64.0 for val in glyph.bbox]
         if basename == 'cmex10':
             offset = -(head['yMin']+512)/head['unitsPerEm']*10.
@@ -1555,7 +1544,7 @@ def __init__(self, output):
         self.output = output
         self.cache = {}
 
-    def __call__(self, s, dpi, fontsize, angle=0):
+    def __call__(self, s, dpi, fontsize, angle=0, character_tracker=None):
         cacheKey = (s, dpi, fontsize, angle)
         s = s[1:-1]  # strip the $ from front and back
         if self.cache.has_key(cacheKey):
@@ -1574,7 +1563,7 @@ def __call__(self, s, dpi, fontsize, angle=0):
                 self.font_object = StandardPSFonts()
                 Element.fonts = self.font_object
             else:
-                self.font_object = BakomaPSFonts()
+                self.font_object = BakomaPSFonts(character_tracker)
                 #self.font_object = MyUnicodeFonts(output='PS')
                 Element.fonts = self.font_object
         elif self.output == 'PDF':

matplotlibrc.template

@@ -258,6 +258,7 @@ numerix      : %(numerix)s  # numpy, Numeric or numarray
                                           # xpdf intended for production of publication quality files,
                                           # but requires ghostscript, xpdf and ps2eps
 #ps.distiller.res  : 6000      # dpi
+#ps.fonttype       : 3         # Output Type 3 (raw Postscript) or Type 42 (embedded TrueType)
 
 # pdf backend params
 #pdf.compression   : 6 # integer from 0 to 9

setup.py

@@ -82,7 +82,7 @@
 from setupext import build_agg, build_gtkagg, build_tkagg, build_wxagg,\
      build_ft2font, build_image, build_windowing, build_transforms, \
      build_contour, build_nxutils, build_enthought, build_swigagg, build_gdk, \
-     build_subprocess, build_isnan
+     build_subprocess, build_isnan, build_ttf2ps
 import distutils.sysconfig
 
 for line in file('lib/matplotlib/__init__.py').readlines():
@@ -120,6 +120,7 @@
 
 # these are not optional
 BUILD_FT2FONT = 1
+BUILD_TTF2PS  = 1
 BUILD_CONTOUR = 1
 BUILD_NXUTILS = 1
 
@@ -269,6 +270,9 @@ def havegtk():
 if BUILD_FT2FONT:
     build_ft2font(ext_modules, packages)
 
+if BUILD_TTF2PS:
+    build_ttf2ps(ext_modules, packages)
+
 if BUILD_WINDOWING and sys.platform=='win32':
    build_windowing(ext_modules, packages)
 

setupext.py

@@ -73,6 +73,7 @@
 
 BUILT_AGG       = False
 BUILT_FT2FONT   = False
+BUILT_TTF2PS    = False
 BUILT_GTKAGG    = False
 BUILT_IMAGE     = False
 BUILT_TKAGG     = False
@@ -500,6 +501,18 @@ def build_ft2font(ext_modules, packages):
     ext_modules.append(module)
     BUILT_FT2FONT = True
 
+def build_ttf2ps(ext_modules, packages):
+    global BUILT_TTF2PS
+    if BUILT_TTF2PS: return # only build it if you you haven't already
+    deps = ['src/_ttf2ps.cpp', 'ttconv/pprdrv_tt.cpp', 'ttconv/pprdrv_tt2.cpp', 'ttconv/ttutil.cpp']
+    deps.extend(glob.glob('CXX/*.cxx'))
+    deps.extend(glob.glob('CXX/*.c'))
+
+    module = Extension('matplotlib.ttf2ps', deps)
+    add_base_flags(module)
+    ext_modules.append(module)
+    BUILT_TTF2PS = True
+
 def build_gtkagg(ext_modules, packages, numerix):
     global BUILT_GTKAGG
     if BUILT_GTKAGG: return # only build it if you you haven't already