Merged revisions 4926-4927 via svnmerge from

mdboom · mdboom · commit 157a0598a02f · 2008-02-01T19:15:20.000Z
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v0_91_maint ........ r4927 | mdboom | 2008-02-01 14:13:09 -0500 (Fri, 01 Feb 2008) | 2 lines Fix doubly-included fonts in Postscript files. ........ svn path=/trunk/matplotlib/; revision=4928
diff --git a/lib/matplotlib/mathtext.py b/lib/matplotlib/mathtext.py
@@ -552,7 +552,6 @@ class TruetypeFonts(Fonts):
     A generic base class for all font setups that use Truetype fonts
     (through ft2font)
     """
-    basepath = os.path.join( get_data_path(), 'fonts' )
     _fonts = {}
 
     class CachedFont:
@@ -686,7 +685,7 @@ def __init__(self, *args, **kwargs):
         TruetypeFonts.__init__(self, *args, **kwargs)
         if not len(self.fontmap):
             for key, val in self._fontmap.iteritems():
-                fullpath = os.path.join(self.basepath, 'ttf', val + ".ttf")
+                fullpath = findfont(val)
                 self.fontmap[key] = fullpath
                 self.fontmap[val] = fullpath
 
@@ -913,7 +912,7 @@ def __init__(self, *args, **kwargs):
         TruetypeFonts.__init__(self, *args, **kwargs)
         if not len(self.fontmap):
             for key, name in self._fontmap.iteritems():
-                fullpath = os.path.join(self.basepath, 'ttf', name + ".ttf")
+                fullpath = findfont(name)
                 self.fontmap[key] = fullpath
                 self.fontmap[name] = fullpath
 
