Fix STIX fonts.

mdboom · mdboom · commit 50573a8ca3fb · 2008-06-02T14:08:58.000Z
svn path=/trunk/matplotlib/; revision=5356
diff --git a/lib/matplotlib/font_manager.py b/lib/matplotlib/font_manager.py
@@ -755,6 +755,7 @@ def set_style(self, style):
         if style not in ('normal', 'italic', 'oblique', None):
             raise ValueError("style must be normal, italic or oblique")
         self._slant = style
+    set_slant = set_style
 
     def set_variant(self, variant):
         """Set the font variant.  Values are: normal or small-caps."""
@@ -807,7 +808,10 @@ def set_file(self, file):
 
     def set_fontconfig_pattern(self, pattern):
         for key, val in self._parse_fontconfig_pattern(pattern).items():
-            getattr(self, "set_" + key)(val)
+            if type(val) == list:
+                getattr(self, "set_" + key)(val[0])
+            else:
+                getattr(self, "set_" + key)(val)
 
     def copy(self):
         """Return a deep copy of self"""
@@ -951,7 +955,7 @@ def findfont(self, prop, fontext='ttf'):
         fname = prop.get_file()
         if fname is not None:
             verbose.report('findfont returning %s'%fname, 'debug')
-            return fname
+            return fname[0]
 
         if fontext == 'afm':
             fontdict = self.afmdict
diff --git a/lib/matplotlib/mathtext.py b/lib/matplotlib/mathtext.py
@@ -890,18 +890,18 @@ class StixFonts(UnicodeFonts):
     A font handling class for the STIX fonts
     """
     _fontmap = { 'rm'  : 'STIXGeneral',
-                 'it'  : 'STIXGeneralItalic',
-                 'bf'  : 'STIXGeneralBol',
-                 'nonunirm' : 'STIXNonUni',
-                 'nonuniit' : 'STIXNonUniIta',
-                 'nonunibf' : 'STIXNonUniBol',
+                 'it'  : 'STIXGeneral:italic',
+                 'bf'  : 'STIXGeneral:weight=bold',
+                 'nonunirm' : 'STIXNonUnicode',
+                 'nonuniit' : 'STIXNonUnicode:italic',
+                 'nonunibf' : 'STIXNonUnicode:weight=bold',
 
                  0 : 'STIXGeneral',
-                 1 : 'STIXSiz1Sym',
-                 2 : 'STIXSiz2Sym',
-                 3 : 'STIXSiz3Sym',
-                 4 : 'STIXSiz4Sym',
-                 5 : 'STIXSiz5Sym'
+                 1 : 'STIXSize1',
+                 2 : 'STIXSize2',
+                 3 : 'STIXSize3',
+                 4 : 'STIXSize4',
+                 5 : 'STIXSize5'
                  }
     fontmap = {}
     use_cmex = False
