added accents to mathtext

jdh2358 · jdh2358 · commit 2aaaa056c43b · 2005-01-18T21:23:07.000Z
svn path=/trunk/matplotlib/; revision=873
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,10 @@
 New entries should be added at the top
 
+2005-01-18 Added accents to mathtext: \hat, \breve, \grave, \bar,
+  \acute, \tilde, \vec, \dot, \ddot.  All of them have the same
+  syntax, eg to make an overbar you do \bar{o} or to make an o umlaut
+  you do \ddot{o} - JDH
+
 2005-01-18 Plugged an image resize memory leaks - JDH
 
 2005-01-18 Fixed some mathtext parser problems relating to superscripts
diff --git a/lib/matplotlib/_mathtext_data.py b/lib/matplotlib/_mathtext_data.py
@@ -138,11 +138,17 @@
     r'\rightbracket'        : ('cmr10',   72),
     r']'                    : ('cmr10',   72),
 
-
+    # these are mathml names, I think.  I'm just using them for the
+    # tex methods noted
     r'\circumflexaccent'    : ('cmr10',   124), # for \hat
     r'\combiningbreve'      : ('cmr10',   81),  # for \breve
-    r'\combiningoverline'      : ('cmr10',   131),  # for \bar    
-
+    r'\combiningoverline'   : ('cmr10',   131),  # for \bar
+    r'\combininggraveaccent' : ('cmr10', 114), # for \grave
+    r'\combiningacuteaccent' : ('cmr10', 63), # for \accute
+    r'\combiningdiaeresis' : ('cmr10', 91), # for \ddot
+    r'\combiningtilde' : ('cmr10', 75), # for \tilde
+    r'\combiningrightarrowabove' : ('cmmi10', 110), # for \vec
+    r'\combiningdotabove' : ('cmr10', 26), # for \dot
 
     r'\leftarrow'           : ('cmsy10',  12),
     r'\uparrow'             : ('cmsy10',  25),
diff --git a/lib/matplotlib/mathtext.py b/lib/matplotlib/mathtext.py
@@ -18,11 +18,17 @@
 
   The fonts \cal, \rm, \it, and \tt are allowed.
 
+  The following accents are provided: \hat, \breve, \grave, \bar,
+  \acute, \tilde, \vec, \dot, \ddot.  All of them have the same
+  syntax, eg to make an overbar you do \bar{o} or to make an o umlaut
+  you do \ddot{o}.
+
   The spacing elements \ , \/ and \hspace{num} are provided.  \/
   inserts a small space, and \hspace{num} inserts a fraction of the
   current fontsize.  Eg, if num=0.5 and the fontsize is 12.0,
   hspace{0.5} inserts 6 points of space
 
+
   
   If you find TeX expressions that don't parse or render properly,
   please email me, but please check KNOWN ISSUES below first.
@@ -484,7 +490,7 @@ def set_origin(self, ox, oy):
             
             if loc=='above':
                 nx = self.centerx() - element.width()/2.0
-                ny = self.ymax() + self.pady()
+                ny = self.ymax() + self.pady() - element.ymax() + element.oy + element.height()
                 #print element, self.ymax(), element.height(), element.ymax(), element.ymin(), ny
             elif loc=='below':
                 nx = self.centerx() - element.width()/2.0
@@ -789,9 +795,15 @@ def accent(self, s, loc, toks):
         accent, sym = toks[0]
 
         d = {
-            r'\hat'   : r'\circumflexaccent',
-            r'\breve' : r'\combiningbreve',
-            r'\bar'   : r'\combiningoverline',                        
+            r'\hat'    : r'\circumflexaccent',
+            r'\breve'  : r'\combiningbreve',
+            r'\bar'    : r'\combiningoverline',
+            r'\grave'  : r'\combininggraveaccent',
+            r'\acute'  : r'\combiningacuteaccent',
+            r'\ddot'   : r'\combiningdiaeresis',
+            r'\tilde'  : r'\combiningtilde',
+            r'\dot'  : r'\combiningdotabove',            
+            r'\vec'    : r'\combiningrightarrowabove',                        
              }
         above = SymbolElement(d[accent])
         sym.neighbors['above'] = above
