added pyparsing/mathtext enhancements

jdh2358 · jdh2358 · commit 776861643a04 · 2005-12-21T14:47:56.000Z
svn path=/trunk/matplotlib/; revision=1927
diff --git a/CHANGELOG b/CHANGELOG
@@ -3,8 +3,9 @@
 2005-12-20 Added Jouni's rc patch to support lists of keys to set on -
            JDH
 
-2005-12-12 Updated pyparsing (mathtext now a bit faster) and minor
-           fixes to scipy numerix and setuptools
+2005-12-12 Updated pyparsing and mathtext for some speed enhancements
+           (Thanks Paul McGuire) and minor fixes to scipy numerix and
+           setuptools
 
 2005-12-12 Matplotlib data is now installed as package_data in
            the matplotlib module.  This gets rid of checking the
diff --git a/lib/matplotlib/figure.py b/lib/matplotlib/figure.py
@@ -1,3 +1,6 @@
+"""
+Figure class -- add docstring here!
+"""
 import sys
 from artist import Artist
 from axes import Axes, Subplot, PolarSubplot, PolarAxes
diff --git a/lib/matplotlib/mathtext.py b/lib/matplotlib/mathtext.py
@@ -1257,7 +1257,7 @@ def subsuperscript(self, s, loc, toks):
 
 space = FollowedBy(bslash) + (Literal(r'\ ') | Literal(r'\/') | Group(Literal(r'\hspace{') + number + Literal('}'))).setParseAction(handler.space).setName('space')
 
-_symbol = Regex("("+")|(".join(
+symbol = Regex("("+")|(".join(
     [
     r"\\[a-zA-Z0-9]+(?!{)",
     r"[a-zA-Z0-9 ]",
@@ -1267,10 +1267,10 @@ def subsuperscript(self, s, loc, toks):
     r"[!@%&]",
     r"[[\]()]",
     ])+")"
-               )
+               ).setParseAction(handler.symbol).leaveWhitespace()
 
 #~ symbol = (texsym ^ char ^ binop ^ relation ^ punctuation ^ misc ^ grouping  ).setParseAction(handler.symbol).leaveWhitespace()
-symbol = (texsym | char | binop | relation | punctuation | misc | grouping  ).setParseAction(handler.symbol).leaveWhitespace()
+_symbol = (texsym | char | binop | relation | punctuation | misc | grouping  ).setParseAction(handler.symbol).leaveWhitespace()
 
 subscript = Forward().setParseAction(handler.subscript).setName("subscript")
 superscript = Forward().setParseAction(handler.superscript).setName("superscript")
