mathtext2 - added support for complex sub/superscripts (i.e.fractions etc.)

edin1 · edin1 · commit 19bd05adc52d · 2006-08-28T20:29:34.000Z
svn path=/trunk/matplotlib/; revision=2715
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,6 @@
+2006-08-28 mathtext2.py: Sub/superscripts can now be complex (i.e.
+           fractions etc.). The demo is also updated - ES
+
 2006-08-28 font_manager.py: Added /usr/local/share/fonts to list of
            X11 font directories - DSD 
 
diff --git a/examples/mathtext2_demo.py b/examples/mathtext2_demo.py
@@ -55,7 +55,7 @@
 #xlabel(r'$\Delta_i^j$', fontsize=20)
 #ylabel(r'$\Delta_{i+1}^j$', fontsize=20)
 #tex = r'$\cal{R}\prod_{i=\alpha_{i+1}}^\infty a_i\rm{sin}(2 \pi f x_i)$'
-#tex = ur"$1^2_3$"
+tex = ur"$1^j_3$"
 #tex = ur"$Tj_1j_jj_gT$"
 #tex = ur"$F_1^1y_{1_{2_{3_2\sum_1^2{4}^6}}3}1_23$"
 #tex = ur"$x_2{\cal TRALALA}\sum_1^2$"
@@ -64,10 +64,10 @@
 #tex = ur"$Tutinjac\ fff\sin\exp$"
 #tex = ur"$\sin\exp{\rm sin\ exp}$"
 #tex = ur"$a^{\sin x}\sin b\sin(x/x), {\rm sin}(x/x){\rm sin\ }(x/x)$"
-tex = ur"$1\frac {\int_{-\infty}^\infty} 22$"
+#tex = ur"$1\frac {\int_{-\infty}^\infty} 22$"
 #tex = ur"$\frac{\int_{-\infty}^\infty} 2$"
 #tex = ur"$1_\frac{\sum^2_{i_{23}=0}} 2678$"
-#tex = ur"$1_{\frac{\sum^2_{i_{23}=0}} 2 345}678$"
+tex = ur"$1_{\frac{\sum^2_{i_{23}=0}}{\sum_{i=\frac94}^\infty} 345}678$"
 text(0.5, 2., tex, fontsize=20)
 tex = r'${\cal R}\prod_{i=\alpha_{i+1}}^\infty a_i\sin\exp(2 \pi f x_i)$'
 text(1, 1.9, tex, fontsize=20)
diff --git a/lib/matplotlib/mathtext2.py b/lib/matplotlib/mathtext2.py
@@ -5,6 +5,7 @@
  * commands for typesetting functions (\sin, \cos etc.),
  * commands for changing the current font (\rm, \cal etc.),
  * Space/kern commands "\ ", \thinspace
+ * \frac
 
 Small TO-DO's:
 --------------
@@ -16,9 +17,7 @@
 
 TO-DO's:
 --------
- * \frac, \over, \above, \choose etc.
- * Implement classes for Line, Fraction etc
- * Change env to be a new class, not a dict.
+ * \over, \above, \choose etc.
  * Add support for other backends
 
 """
@@ -425,12 +424,19 @@ def __init__(self, env, nuc=None, type="ord", sub=None,
         # below the origin of the nucleus (the descent of the letter "j").
         # TO-DO: Change with a better alternative. Not working: F_1^1y_1
         c = TexCharClass(env, "j")
+        C = TexCharClass(env, "M")
+
         self.subpad = c.height - c.bearingy
+        # If subscript is complex (i.e. a large Hbox - fraction etc.)
+        # we have to aditionaly lower the subscript
+        if sub.ymax > (C.height/2.1 + self.subpad):
+            self.subpad = sub.ymax - C.height/2.1
+            
         #self.subpad = max(self.subpad)
         #self.subpad = 0.5*sub.height
         # Similar for the superscript
-        C = TexCharClass(env, "M")
-        self.suppad = max(nuc.height/2., C.ymax/2.)# - C.bearingy
+        self.suppad = max(nuc.height/1.9, C.ymax/1.9) - sup.ymin# - C.bearingy
+
 
         #self.advance = nuc.advance + max((sub.advance, sup.advance))
 
