Merge pull request #864 from goir/patch-1

mdboom · mdboom · commit e87374e3dc12 · 2012-05-14T11:56:28.000-07:00
AFM - Kerning information is not used
diff --git a/lib/matplotlib/afm.py b/lib/matplotlib/afm.py
@@ -348,6 +348,7 @@ def string_width_height(self, s):
             # find the min y
             thismin = b
             if thismin<miny: miny = thismin
+            namelast = name
 
         return totalw, maxy-miny
 
@@ -385,6 +386,7 @@ def get_str_bbox_and_descent(self, s):
             # find the min y
             thismin = b
             if thismin<miny: miny = thismin
+            namelast = name
 
         return left, miny, totalw, maxy-miny, -miny
 
diff --git a/lib/matplotlib/tests/test_text.py b/lib/matplotlib/tests/test_text.py
@@ -95,3 +95,13 @@ def test_antialiasing():
     # test cleanup will do it for us.  In fact, if we do it here, it
     # will turn antialiasing back off before the images are actually
     # rendered.
+
+
+def test_afm_kerning():
+    from matplotlib.afm import AFM
+    from matplotlib.font_manager import findfont
+
+    fn = findfont("Helvetica", fontext="afm")
+    with open(fn, 'rb') as fh:
+        afm = AFM(fh)
+    assert afm.string_width_height('VAVAVAVAVAVA') == (7174.0, 718)
