finished unicode support for ps

jdh2358 · jdh2358 · commit 9c19d00627e0 · 2005-03-30T17:46:52.000Z
svn path=/trunk/matplotlib/; revision=1109
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,6 +1,6 @@
 New entries should be added at the top
 
-2005-03-29 Added alpha unicode support for Agg and PS - JDH
+2005-03-29 Added unicode support for Agg and PS - JDH
 
 2005-03-28 Added Jarrod's svg patch for text - JDH
 
diff --git a/lib/matplotlib/backends/backend_agg.py b/lib/matplotlib/backends/backend_agg.py
@@ -244,7 +244,7 @@ def _get_agg_font(self, prop):
         
         if font is None:
             fname = fontManager.findfont(prop)
-            font = FT2Font(str(fname))
+            font = FT2Font(fname)
             _fontd[key] = font
 
         font.clear()
diff --git a/lib/matplotlib/backends/backend_ps.py b/lib/matplotlib/backends/backend_ps.py
@@ -196,7 +196,7 @@ def _get_font_ttf(self, prop):
         font = _fontd.get(key)
         if font is None:
             fname = fontManager.findfont(prop)
-            font = FT2Font(str(fname))
+            font = FT2Font(fname)
             _fontd[key] = font
             if fname not in _type42:
                 _type42.append(fname)
@@ -591,7 +591,6 @@ def encodeTTFasPS(fontfile):
     """
     Encode a TrueType font file for embedding in a PS file.
     """
-    fontfile = str(fontfile) # TODO: handle unicode filenames
     font = file(fontfile, 'rb')
     hexdata, data = [], font.read(65520)
     b2a_hex = binascii.b2a_hex
@@ -777,7 +776,6 @@ def print_figure(self, outfile, dpi=72,
                 print >>fh, l.strip()
         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"
diff --git a/lib/matplotlib/font_manager.py b/lib/matplotlib/font_manager.py
@@ -460,7 +460,7 @@ def createFontDict(fontfiles, fontext='ttf'):
             prop = afmFontProperty(font)
         else:
             try:
-                font = ft2font.FT2Font(str(fpath))
+                font = ft2font.FT2Font(fpath)
             except RuntimeError:
                 warnings.warn("Could not open font file %s"%fpath)
                 continue
@@ -636,7 +636,7 @@ def get_name(self):
         """Return the name of the font that best matches the font
 properties.
 """
-        return ft2font.FT2Font(str(fontManager.findfont(self))).family_name
+        return ft2font.FT2Font(fontManager.findfont(self)).family_name
 
     def get_style(self):
         """Return the font style.  Values are: normal, italic or oblique.
