fix overunder

zblz · zblz · commit c8fee9e2457c · 2015-08-09T17:52:59.000+01:00
diff --git a/lib/matplotlib/mathtext.py b/lib/matplotlib/mathtext.py
@@ -2718,44 +2718,12 @@ def subsuper(self, s, loc, toks):
                 "Subscript/superscript sequence is too long. "
                 "Use braces { } to remove ambiguity.")
 
-        # We remove kerning for consistency (otherwise it will compute kerning
-        # based on non-shrinked characters and may put them very close together
-        # when superscripted)
-        # We change the width of the last character to match the advance to
-        # consider some fonts with weird metrics: e.g. stix's f has a width of
-        # 7.75 and a kerning of -4.0 for an advance of 3.72, and we want to put
-        # the superscript at the advance
-        last_char = nucleus
-        if isinstance(nucleus,Hlist):
-            new_children = nucleus.children
-            if len(new_children):
-                # remove last kern
-                if isinstance(new_children[-1],Kern):
-                    new_children = new_children[:-1]
-                last_char = new_children[-1]
-                last_char.width = last_char._metrics.advance
-            # create new Hlist without kerning
-            nucleus = Hlist(new_children, do_kern=False)
-        else:
-            last_char.width = last_char._metrics.advance
-            nucleus = Hlist([nucleus])
-
         state = self.get_state()
         rule_thickness = state.font_output.get_underline_thickness(
             state.font, state.fontsize, state.dpi)
         xHeight = state.font_output.get_xheight(
             state.font, state.fontsize, state.dpi)
 
-        fs = rcParams['mathtext.fontset']
-        # If a custom fontset is used, check if it is Arev Sans, otherwise use
-        # CM parameters.
-        if fs == 'custom':
-            if (rcParams['mathtext.rm'] == 'sans' and
-                    rcParams['font.sans-serif'][0].lower() == 'Arev Sans'.lower()):
-                fs = 'arevsans'
-            else:
-                fs = 'cm'
-
         if napostrophes:
             if super is None:
                 super = Hlist([])
@@ -2791,6 +2759,38 @@ def subsuper(self, s, loc, toks):
             result = Hlist([vlist])
             return [result]
 
+        # We remove kerning for consistency (otherwise it will compute kerning
+        # based on non-shrinked characters and may put them very close together
+        # when superscripted)
+        # We change the width of the last character to match the advance to
+        # consider some fonts with weird metrics: e.g. stix's f has a width of
+        # 7.75 and a kerning of -4.0 for an advance of 3.72, and we want to put
+        # the superscript at the advance
+        last_char = nucleus
+        if isinstance(nucleus,Hlist):
+            new_children = nucleus.children
+            if len(new_children):
+                # remove last kern
+                if isinstance(new_children[-1],Kern):
+                    new_children = new_children[:-1]
+                last_char = new_children[-1]
+                last_char.width = last_char._metrics.advance
+            # create new Hlist without kerning
+            nucleus = Hlist(new_children, do_kern=False)
+        else:
+            last_char.width = last_char._metrics.advance
+            nucleus = Hlist([nucleus])
+
+        fs = rcParams['mathtext.fontset']
+        # If a custom fontset is used, check if it is Arev Sans, otherwise use
+        # CM parameters.
+        if fs == 'custom':
+            if (rcParams['mathtext.rm'] == 'sans' and
+                    rcParams['font.sans-serif'][0].lower() == 'Arev Sans'.lower()):
+                fs = 'arevsans'
+            else:
+                fs = 'cm'
+
         # Handle regular sub/superscripts
         lc_height   = last_char.height
         lc_baseline = 0
