matplotlib · mdboom · Jan 25, 2016 · Jan 19, 2016 · Jan 19, 2016
diff --git a/lib/matplotlib/mathtext.py b/lib/matplotlib/mathtext.py
@@ -2852,12 +2852,15 @@ def subsuper(self, s, loc, toks):
         sub = None
         super = None
 
-        # Pick all of the apostrophe's out
+        # Pick all of the apostrophes out, including first apostrophes that have
+        # been parsed as characters
         napostrophes = 0
         new_toks = []
         for tok in toks[0]:
             if isinstance(tok, six.string_types) and tok not in ('^', '_'):
                 napostrophes += len(tok)
+            elif isinstance(tok, Char) and tok.c == "'":
+                napostrophes += 1
             else:
                 new_toks.append(tok)
         toks = new_toks
@@ -2912,6 +2915,9 @@ def subsuper(self, s, loc, toks):
                 super = Hlist([])
             for i in range(napostrophes):
                 super.children.extend(self.symbol(s, loc, ['\prime']))
+            # kern() and hpack() needed to get the metrics right after extending
+            super.kern()
+            super.hpack()
 
         # Handle over/under symbols, such as sum or integral
         if self.is_overunder(nucleus):

diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_31.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_31.pdf
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_31.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_31.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_31.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_31.svg
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_31.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_31.pdf
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_31.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_31.png