Minor PDF filesize improvement.

mdboom · mdboom · commit b1c141e7bba1 · 2007-08-09T15:14:59.000Z
svn path=/trunk/matplotlib/; revision=3695
diff --git a/lib/matplotlib/backends/backend_pdf.py b/lib/matplotlib/backends/backend_pdf.py
@@ -508,6 +508,7 @@ def embedTTFType3(font, characters, descriptor):
             charprocsObject = self.reserveObject('character procs')
             differencesArray = []
             firstchar, lastchar = 0, 255
+            bbox = [cvt(x, nearest=False) for x in font.bbox]
             
             fontdict = {
                 'Type'            : Name('Font'),
@@ -517,7 +518,7 @@ def embedTTFType3(font, characters, descriptor):
                 'FontDescriptor'  : fontdescObject,
                 'Subtype'         : Name('Type3'),
                 'Name'            : descriptor['FontName'],
-                'FontBBox'        : [cvt(x, nearest=False) for x in font.bbox],
+                'FontBBox'        : bbox,
                 'FontMatrix'      : [ .001, 0, 0, .001, 0, 0 ],
                 'CharProcs'       : charprocsObject,
                 'Encoding'        : {
@@ -575,15 +576,18 @@ def get_char_width(charcode):
             charprocs = {}
             charprocsRef = {}
             for charname, stream in rawcharprocs.items():
+                charprocDict = { 'Length': len(stream) }
+                # The 2-byte characters are used as XObjects, so they
+                # need extra info in their dictionary
+                if charname in two_byte_chars:
+                    charprocDict['Type'] = Name('XObject')
+                    charprocDict['Subtype'] = Name('Form')
+                    charprocDict['BBox'] = bbox
                 charprocObject = self.reserveObject('charProc for %s' % name)
-                self.beginStream(charprocObject.id,
-                                 None,
-                                 {'Length':  len(stream),
-                                  'Type': Name('XObject'),
-                                  'Subtype': Name('Form'),
-                                  'BBox': [cvt(x, nearest=False) for x in font.bbox]})
+                self.beginStream(charprocObject.id, None, charprocDict)
                 self.currentstream.write(stream)
                 self.endStream()
+
                 # Send the glyphs with ccode > 255 to the XObject dictionary,
                 # and the others to the font itself
                 if charname in two_byte_chars:
