SF.net SVN: matplotlib: [4928] trunk/matplotlib

[<md...@us...>]

Revision: 4928
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4928&view=rev
Author:   mdboom
Date:     2008-02-01 11:15:20 -0800 (Fri, 01 Feb 2008)

Log Message:
-----------
Merged revisions 4926-4927 via svnmerge from 
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.
........

Modified Paths:
--------------
    trunk/matplotlib/lib/matplotlib/mathtext.py

Property Changed:
----------------
    trunk/matplotlib/


Property changes on: trunk/matplotlib
___________________________________________________________________
Name: svnmerge-integrated
   - /branches/v0_91_maint:1-4925
   + /branches/v0_91_maint:1-4927

Modified: trunk/matplotlib/lib/matplotlib/mathtext.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/mathtext.py	2008-02-01 19:13:09 UTC (rev 4927)
+++ trunk/matplotlib/lib/matplotlib/mathtext.py	2008-02-01 19:15:20 UTC (rev 4928)
@@ -552,7 +552,6 @@
     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 @@
         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 @@
         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
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.