Various minor bugfixes.

mdboom · mdboom · commit 17a074e3eff5 · 2007-07-30T18:05:14.000Z
svn path=/trunk/matplotlib/; revision=3633
diff --git a/lib/matplotlib/_mathtext_data.py b/lib/matplotlib/_mathtext_data.py
@@ -2214,7 +2214,7 @@
 'combiningbreve'           : 774,
 'combiningoverline'        : 772,
 'combininggraveaccent'     : 768,
-'combiningacuteaccent'     : 764,
+'combiningacuteaccent'     : 714,
 'combiningdiaeresis'       : 776,
 'combiningtilde'           : 771,
 'combiningrightarrowabove' : 8407,
diff --git a/lib/matplotlib/mathtext.py b/lib/matplotlib/mathtext.py
@@ -617,7 +617,7 @@ def get_sized_alternatives_for_symbol(self, fontname, sym):
             return alternatives
         return [(fontname, sym)]
     
-class UnicodeFonts(BakomaFonts):
+class UnicodeFonts(TruetypeFonts):
     """An abstract base class for handling Unicode fonts.
     """
     fontmap = { 'cal' : 'cmsy10',
@@ -628,7 +628,7 @@ class UnicodeFonts(BakomaFonts):
                 'sf'  : 'DejaVuSans',
                 None  : 'DejaVuSerif-Italic'
                 }
-        
+
     def _get_offset(self, cached_font, glyph, fontsize, dpi):
         return 0.
 
@@ -637,6 +637,7 @@ def _get_glyph(self, fontname, sym, fontsize):
         
         try:
             uniindex = get_unicode_index(sym)
+            found_symbol = True
         except ValueError:
             # This is a total hack, but it works for now
             if sym.startswith('\\big'):
@@ -658,7 +659,7 @@ def _get_glyph(self, fontname, sym, fontsize):
                 glyphindex = cached_font.charmap[uniindex]
             except KeyError:
                 warn("Font '%s' does not have a glyph for '%s'" %
-                     (cached_font.postscript_name, sym),
+                     (cached_font.font.postscript_name, sym),
                      MathTextWarning)
                 found_symbol = False
 
@@ -2228,7 +2229,7 @@ def __call__(self, s, dpi, prop, angle=0):
             font_output = BakomaFonts(prop, backend)
             # When we have a decent Unicode font, we should test and
             # then make this available as an option
-            # font_output = UnicodeFonts(prop, backend)
+            #~ font_output = UnicodeFonts(prop, backend)
 
         fontsize = prop.get_size_in_points()
         if self._parser is None:
