Merged revisions 7794 via svnmerge from

jkseppan · jkseppan · commit f76a00437214 · 2009-09-20T13:07:15.000Z
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v0_99_maint ........ r7794 | jouni | 2009-09-20 15:30:22 +0300 (Su, 20 Syy 2009) | 1 line Prevent exception in case of missing height and depth information in a TeX font ........ svn path=/trunk/matplotlib/; revision=7795
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,7 @@
+2009-09-20 Prevent exception in case of missing height and depth information
+           in a TeX font - this doesn't make the typesetting right, but prevents
+           the crash - JKS
+
 2009-09-15 Implement draw_text and draw_tex method of backend_base using
            the textpath module. Implement draw_tex method of the svg 
            backend. - JJL
diff --git a/lib/matplotlib/dviread.py b/lib/matplotlib/dviread.py
@@ -88,8 +88,7 @@ def _output(self):
                 e = 0           # zero depth
             else:               # glyph
                 x,y,font,g,w = elt
-                h = _mul2012(font._scale, font._tfm.height[g])
-                e = _mul2012(font._scale, font._tfm.depth[g])
+                h,e = font._height_depth_of(g)
             minx = min(minx, x)
             miny = min(miny, y - h)
             maxx = max(maxx, x + w)
@@ -443,6 +442,24 @@ def _width_of(self, char):
             'debug')
         return 0
 
+    def _height_depth_of(self, char):
+        """
+        Height and depth of char in dvi units. For internal use by dviread.py.
+        """
+
+        result = []
+        for metric,name in ((self._tfm.height, "height"),
+                            (self._tfm.depth, "depth")):
+            value = metric.get(char, None)
+            if value is None:
+                matplotlib.verbose.report(
+                    'No %s for char %d in font %s' % (name, char, self.texname),
+                    'debug')
+                result.append(0)
+            else:
+                result.append(_mul2012(value, self._scale))
+        return result
+    
 class Vf(Dvi):
     """
     A virtual font (\*.vf file) containing subroutines for dvi files.
