fix integrals

zblz · zblz · commit a99c3bc7fe50 · 2015-08-07T02:26:36.000+01:00
diff --git a/lib/matplotlib/mathtext.py b/lib/matplotlib/mathtext.py
@@ -1191,7 +1191,7 @@ def get_underline_thickness(self, font, fontsize, dpi):
                    'stix': 0.10,
                    'stixsans': 0.10}
 ## Percentage of x-height that sub/superscripts drop below the baseline
-SUBDROP         = {'cm': 0.3,
+SUBDROP         = {'cm': 0.2,
                    'stix': 0.3,
                    'stixsans': 0.3}
 # Percentage of x-height that superscripts drop below the baseline
@@ -1212,6 +1212,11 @@ def get_underline_thickness(self, font, fontsize, dpi):
 DELTA           = {'cm': 0.10,
                    'stix': 0.15,
                    'stixsans': 0.25}
+# Percentage of x-height that supercripts are offset relative to the subscript
+# for integrals
+DELTAINTEGRAL   = {'cm': 0.5,
+                   'stix': 0.5,
+                   'stixsans': 0.5}
 
 class MathTextWarning(Warning):
     pass
@@ -2757,9 +2762,13 @@ def subsuper(self, s, loc, toks):
             shift_down = nucleus.depth + SUBDROP[fs] * xHeight
         else:
             shift_down = SUBDROP[fs] * xHeight
+        integral = (nucleus.height + nucleus.depth) > 2 * xHeight
         if super is None:
             # node757
-            x = Hlist([sub])
+            if integral:
+                x = Hlist([Kern(-DELTA[fs] * nucleus.height),sub])
+            else:
+                x = Hlist([sub])
             x.shrink()
             x.width += SCRIPT_SPACE[fs] * xHeight
             shift_down = max(shift_down, SUB1[fs] * xHeight)
@@ -2768,16 +2777,25 @@ def subsuper(self, s, loc, toks):
             x.shift_amount = shift_down / 2.
         else:
             if self.is_slanted(last_char):
-                x = Hlist([Kern(DELTA[fs] * super.height),super])
+                f = DELTA[fs]
+                if integral: f = DELTAINTEGRAL[fs]
+                x = Hlist([Kern(f * nucleus.height),super])
             else:
                 x = Hlist([super])
             x.shrink()
             x.width += SCRIPT_SPACE[fs] * xHeight
-            shift_up = SUP1[fs] * xHeight
+            if integral:
+                shift_up = max(shift_up,SUP1[fs] * xHeight)
+            else:
+                shift_up = SUP1[fs] * xHeight
             if sub is None:
                 x.shift_amount = -shift_up
             else: # Both sub and superscript
-                y = Hlist([sub])
+                if integral:
+                    y = Hlist([Kern(-DELTA[fs] * nucleus.height),sub])
+                else:
+                    y = Hlist([sub])
+                #y = Hlist([sub])
                 y.shrink()
                 y.width += SCRIPT_SPACE[fs] * xHeight
                 shift_down = max(shift_down, SUB2[fs] * xHeight)
