Merged revisions 7796 via svnmerge from

jkseppan · jkseppan · commit 8765290268b6 · 2009-09-20T13:21:38.000Z
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v0_99_maint ........ r7796 | jouni | 2009-09-20 16:19:25 +0300 (Su, 20 Syy 2009) | 1 line Fix off-by-one error in dviread.Tfm ........ svn path=/trunk/matplotlib/; revision=7797
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,6 +1,5 @@
-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-20 Fix off-by-one error in dviread.Tfm, and additionally protect
+           against exceptions in case a dvi font is missing some metrics - 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 
diff --git a/lib/matplotlib/dviread.py b/lib/matplotlib/dviread.py
@@ -415,7 +415,7 @@ def __init__(self, scale, tfm, texname, vf):
             scale, tfm, texname, vf
         self.size = scale * (72.0 / (72.27 * 2**16))
         try:
-            nchars = max(tfm.width.iterkeys())
+            nchars = max(tfm.width.iterkeys()) + 1
         except ValueError:
             nchars = 0
         self.widths = [ (1000*tfm.width.get(char, 0)) >> 20
@@ -619,11 +619,10 @@ def __init__(self, filename):
         widths, heights, depths = \
             [ struct.unpack('!%dI' % (len(x)/4), x)
               for x in (widths, heights, depths) ]
-        for i in range(ec-bc):
-            self.width[bc+i] = _fix2comp(widths[ord(char_info[4*i])])
-            self.height[bc+i] = _fix2comp(heights[ord(char_info[4*i+1]) >> 4])
-            self.depth[bc+i] = _fix2comp(depths[ord(char_info[4*i+1]) & 0xf])
-
+        for idx, char in enumerate(range(bc, ec+1)):
+            self.width[char] = _fix2comp(widths[ord(char_info[4*idx])])
+            self.height[char] = _fix2comp(heights[ord(char_info[4*idx+1]) >> 4])
+            self.depth[char] = _fix2comp(depths[ord(char_info[4*idx+1]) & 0xf])
 
 class PsfontsMap(object):
     """
