Revision: 8269
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8269&view=rev
Author: mdboom
Date: 2010-04-23 18:34:32 +0000 (Fri, 23 Apr 2010)
Log Message:
-----------
Pass strings to FT2Font -- never Unicode strings.
Modified Paths:
--------------
trunk/matplotlib/lib/matplotlib/backends/backend_pdf.py
trunk/matplotlib/lib/matplotlib/backends/backend_ps.py
trunk/matplotlib/lib/matplotlib/mathtext.py
trunk/matplotlib/lib/matplotlib/textpath.py
Modified: trunk/matplotlib/lib/matplotlib/backends/backend_pdf.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backends/backend_pdf.py 2010-04-23
18:33:51 UTC (rev 8268)
+++ trunk/matplotlib/lib/matplotlib/backends/backend_pdf.py 2010-04-23
18:34:32 UTC (rev 8269)
@@ -654,7 +654,7 @@
if 0: flags |= 1 << 17 # TODO: small caps
if 0: flags |= 1 << 18 # TODO: force bold
- ft2font = FT2Font(fontfile)
+ ft2font = FT2Font(str(fontfile))
descriptor = {
'Type': Name('FontDescriptor'),
Modified: trunk/matplotlib/lib/matplotlib/backends/backend_ps.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backends/backend_ps.py 2010-04-23
18:33:51 UTC (rev 8268)
+++ trunk/matplotlib/lib/matplotlib/backends/backend_ps.py 2010-04-23
18:34:32 UTC (rev 8269)
@@ -1104,7 +1104,7 @@
if not rcParams['ps.useafm']:
for font_filename, chars in ps_renderer.used_characters.values():
if len(chars):
- font = FT2Font(font_filename)
+ font = FT2Font(str(font_filename))
cmap = font.get_charmap()
glyph_ids = []
for c in chars:
Modified: trunk/matplotlib/lib/matplotlib/mathtext.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/mathtext.py 2010-04-23 18:33:51 UTC (rev
8268)
+++ trunk/matplotlib/lib/matplotlib/mathtext.py 2010-04-23 18:34:32 UTC (rev
8269)
@@ -597,7 +597,7 @@
cached_font = self._fonts.get(basename)
if cached_font is None:
- font = FT2Font(basename)
+ font = FT2Font(str(basename))
cached_font = self.CachedFont(font)
self._fonts[basename] = cached_font
self._fonts[font.postscript_name] = cached_font
Modified: trunk/matplotlib/lib/matplotlib/textpath.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/textpath.py 2010-04-23 18:33:51 UTC (rev
8268)
+++ trunk/matplotlib/lib/matplotlib/textpath.py 2010-04-23 18:34:32 UTC (rev
8269)
@@ -311,7 +311,7 @@
if font_and_encoding is None:
font_bunch = self.tex_font_map[dvifont.texname]
- font = FT2Font(font_bunch.filename)
+ font = FT2Font(str(font_bunch.filename))
try:
font.select_charmap(1094992451) # select ADOBE_CUSTOM
except ValueError:
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
_______________________________________________
Matplotlib-checkins mailing list
Matplotlib-checkins@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
