Add support for \widehat and \widetilde

mdboom · mdboom · commit cf513c8b89ba · 2007-08-02T18:59:29.000Z
svn path=/trunk/matplotlib/; revision=3666
diff --git a/examples/mathtext_examples.py b/examples/mathtext_examples.py
@@ -36,7 +36,8 @@
     r'$\frac{x_2888}{y}$',
     r"$\sqrt[3]{\frac{X_2}{Y}}=5$",
     r"$\sqrt[3]{x}=5$",
-    r'$\frac{X}{\frac{X}{Y}}$'
+    r'$\frac{X}{\frac{X}{Y}}$',
+    r'$\widehat{abc}\widetilde{def}$'
     ]
 
 from pylab import *
diff --git a/lib/matplotlib/_mathtext_data.py b/lib/matplotlib/_mathtext_data.py
@@ -39,6 +39,8 @@
     r'\}'                   : ('cmex10', 130),
     r'\leftangle'           : ('cmex10',  97),
     r'\rightangle'          : ('cmex10',  64),
+    r'\widehat'             : ('cmex10',  15),
+    r'\widetilde'           : ('cmex10',  52),
 
     r'\omega'               : ('cmmi10',  29),
     r'\varepsilon'          : ('cmmi10',  20),
diff --git a/lib/matplotlib/mathtext.py b/lib/matplotlib/mathtext.py
@@ -1437,15 +1437,15 @@ class AutoWidthChar(Hlist):
     of some characters (such as the BaKoMa fonts), the correct glyph will
     be selected, otherwise this will always just return a scaled version
     of the glyph."""
-    def __init__(self, c, width, state, always=False):
+    def __init__(self, c, width, state, always=False, char_class=Char):
         alternatives = state.font_output.get_sized_alternatives_for_symbol(
             state.font, c)
 
         state = state.copy()
         big_enough = False
         for fontname, sym in alternatives:
             state.font = fontname
-            char = Char(sym, state)
+            char = char_class(sym, state)
             if char.width > width:
                 big_enough = True
                 break
@@ -1455,7 +1455,7 @@ def __init__(self, c, width, state, always=False):
         if not big_enough:
             factor = width / char.width
             state.fontsize *= factor
-            char = Char(sym, state)
+            char = char_class(sym, state)
             
         Hlist.__init__(self, [char])
         
@@ -1969,12 +1969,15 @@ def accent(self, s, loc, toks):
             raise ParseFatalException("Error parsing accent")
         accent, sym = toks[0]
         if accent in self._wide_accents:
-            accent = AutoWidthChar(accent, sym.width, state)
+            accent = AutoWidthChar(
+                accent, sym.width, state, char_class=Accent)
+            shift_amount = 0.
         else:
             accent = Accent(self._accent_map[accent], state)
+            shift_amount = accent._metrics.xmin
         centered = HCentered([accent])
         centered.hpack(sym.width, 'exactly')
-        centered.shift_amount = accent._metrics.xmin
+        centered.shift_amount = shift_amount
         return Vlist([
                 centered,
                 Vbox(0., thickness * 2.0),

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,8 @@`
`36`	`36`	`r'$\frac{x_2888}{y}$',`
`37`	`37`	`r"$\sqrt[3]{\frac{X_2}{Y}}=5$",`
`38`	`38`	`r"$\sqrt[3]{x}=5$",`
`39`		`- r'$\frac{X}{\frac{X}{Y}}$'`
	`39`	`+ r'$\frac{X}{\frac{X}{Y}}$',`
	`40`	`+ r'$\widehat{abc}\widetilde{def}$'`
`40`	`41`	`]`
`41`	`42`
`42`	`43`	`from pylab import *`