added accents to mathtext

jdh2358 · jdh2358 · commit d9ee67dad50d · 2005-01-18T22:18:25.000Z
svn path=/trunk/matplotlib/; revision=875
diff --git a/CHANGELOG b/CHANGELOG
@@ -3,9 +3,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
+  you do \ddot{o}. The shortcuts are also provided, eg: \"o \'e \`e
+  \~n \.x \^y - JDH
 
-2005-01-18 Plugged an image resize memory leaks - JDH
+2005-01-18 Plugged image resize memory leaks - JDH
 
 2005-01-18 Fixed some mathtext parser problems relating to superscripts
 
diff --git a/examples/accented_text.py b/examples/accented_text.py
@@ -0,0 +1,20 @@
+"""
+matplotlib supports accented characters via TeX mathtext
+
+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 shortcuts are also provided, eg: \"o \'e \`e \~n \.x
+\^y
+
+"""
+from pylab import *
+
+plot(range(10))
+
+title(r'$\ddot{o}\acute{e}\grave{e}\hat{O}\breve{i}\bar{A}\tilde{n}\vec{q}$', fontsize=20)
+# shorthad is also supported
+xlabel(r"""$\"o\'e\`e\~n\.x\^y$""", fontsize=20)
+
+
+show()
diff --git a/lib/matplotlib/mathtext.py b/lib/matplotlib/mathtext.py
@@ -21,7 +21,8 @@
   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}.
+  you do \ddot{o}.  The shortcuts are also provided, eg: \"o \'e \`e
+  \~n \.x \^y
 
   The spacing elements \ , \/ and \hspace{num} are provided.  \/
   inserts a small space, and \hspace{num} inserts a fraction of the
@@ -795,15 +796,21 @@ def accent(self, s, loc, toks):
         accent, sym = toks[0]
 
         d = {
-            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',                        
+            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',                        
+            r'\"'     : r'\combiningdiaeresis',
+            r"\`"     : r'\combininggraveaccent',
+            r"\'"     : r'\combiningacuteaccent',
+            r'\~'     : r'\combiningtilde',
+            r'\.'     : r'\combiningdotabove',
+            r'\^'   : r'\circumflexaccent',            
              }
         above = SymbolElement(d[accent])
         sym.neighbors['above'] = above
@@ -913,7 +920,10 @@ def subsuperscript(self, s, loc, toks):
 
 accent = Literal('hat') | Literal('check') | Literal('dot') | \
          Literal('breve') | Literal('acute') | Literal('ddot') | \
-         Literal('grave') | Literal('tilde') | Literal('bar') | Literal('vec')
+         Literal('grave') | Literal('tilde') | Literal('bar') | \
+         Literal('vec') | Literal('"') | Literal("`") | Literal("'") |\
+         Literal('~') | Literal('.') | Literal('^')
+         
 
 
 
@@ -953,7 +963,7 @@ def subsuperscript(self, s, loc, toks):
 #~ composite = Group( Combine(bslash + composite) + group + group).setParseAction(handler.composite).setName("composite")
 composite = Group( Combine(bslash + overUnder) + group + group).setParseAction(handler.composite).setName("composite")
 
-accent = Group( Combine(bslash + accent) + group).setParseAction(handler.accent).setName("accent")
+accent = Group( Combine(bslash + accent) + Optional(lbrace) + symbol + Optional(rbrace)).setParseAction(handler.accent).setName("accent")
 
 #~ symgroup = symbol ^ group
 symgroup = symbol | group
