added missing symbols to mathtext

jdh2358 · jdh2358 · commit f5fff32a3020 · 2005-01-27T15:31:34.000Z
svn path=/trunk/matplotlib/; revision=887
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,14 @@
 New entries should be added at the top
 
+2005-01-27 Added Lee's patch for missing symbols \leq and \LEFTbracket
+           to _mathtext_data - JDH
+
+2005-01-26 Added Baptiste's two scales patch -- see help(twin) in the
+           pylab interface for more info.  See also
+           examples/two_scales.py
+
+2005-01-24 Fixed a mathtext parser bug that prevented font changes in
+           sub/superscripts - JDH
 
 2005-01-24 Fixed contour wto work w/ interactive changes in colormaps,
            clim, etc - JDH
diff --git a/lib/matplotlib/_mathtext_data.py b/lib/matplotlib/_mathtext_data.py
@@ -49,6 +49,7 @@
     r'\Rightparen'          : ('cmex10',  81),
     r'\LEFTparen'           : ('cmex10', 119),
     r'\RIGHTparen'          : ('cmex10',  87),
+    r'\LEFTbracket'         : ('cmex10', 125),
     r'\RIGHTbracket'        : ('cmex10',  93),
     r'\LEFTbrace'           : ('cmex10',  70),
     r'\RIGHTbrace'          : ('cmex10', 107),
@@ -236,6 +237,7 @@
     r'\equiv'               : ('cmsy10',  35),
     r'\subseteq'            : ('cmsy10', 103),
     r'\supseteq'            : ('cmsy10',  42),
+    r'\leq'                 : ('cmsy10',  14),
     r'\geq'                 : ('cmsy10',  29),
     r'\preceq'              : ('cmsy10',  79),
     r'\succeq'              : ('cmsy10', 131),
diff --git a/lib/matplotlib/mathtext.py b/lib/matplotlib/mathtext.py
@@ -956,25 +956,30 @@ def subsuperscript(self, s, loc, toks):
 superscript = Forward().setParseAction(handler.superscript).setName("superscript")
 subsuperscript = Forward().setParseAction(handler.subsuperscript).setName("subsuperscript")
 
+font = Forward().setParseAction(handler.font).setName("font")
 
-group = Group( lbrace + OneOrMore(symbol^subscript^superscript^subsuperscript^space) + rbrace).setParseAction(handler.group).setName("group")
+
+group = Group( lbrace + OneOrMore(symbol^subscript^superscript^subsuperscript^space^font) + rbrace).setParseAction(handler.group).setName("group")
 #~ group = Group( lbrace + OneOrMore(subsuperscript | subscript | superscript | symbol | space ) + rbrace).setParseAction(handler.group).setName("group")
 
 #composite = Group( Combine(bslash + composite) + lbrace + symbol + rbrace + lbrace + symbol + rbrace).setParseAction(handler.composite).setName("composite")
 #~ 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) + Optional(lbrace) + symbol + Optional(rbrace)).setParseAction(handler.accent).setName("accent")
 
-#~ symgroup = symbol ^ group
-symgroup = symbol | group
+
+symgroup = font ^ group ^ symbol 
 
 subscript << Group( Optional(symgroup) + Literal('_') + symgroup  )
 superscript << Group( Optional(symgroup) + Literal('^') + symgroup  )
 subsuperscript << Group( symgroup + Literal('_') + symgroup + Literal('^') + symgroup  )
 
+font << Group( Combine(bslash + fontname) + group)
+
 
-font = Group( Combine(bslash + fontname) + group).setParseAction(handler.font).setName("font")
 
 expression = OneOrMore(
     space ^ font ^ accent ^ symbol ^ subscript ^ superscript ^ subsuperscript ^ group ^ composite  ).setParseAction(handler.expression).setName("expression")
diff --git a/lib/matplotlib/pylab.py b/lib/matplotlib/pylab.py
@@ -892,7 +892,7 @@ def imread(*args, **kwargs):
 imread.__doc__ = _imread.__doc__
 
 
-def load(fname):
+def load(fname,comments='%'):
     """
     Load ASCII data from fname into an array and return the array.
 
@@ -911,6 +911,9 @@ def load(fname):
 
     x = load('test.dat')    # a single column of data
 
+    comments is the character used to indicate the start of a comment
+    in the file
+
     """
 
     if is_string_like(fname):
@@ -919,16 +922,16 @@ def load(fname):
         fh = fname
     else:
         raise ValueError('fname must be a string or file handle')
-    
-    X = []
+     X = []
     numCols = None
     for line in fh:
-        line = line[:line.find('%')].strip()
+        line = line[:line.find(comments)].strip()
         if not len(line): continue
         row = [float(val) for val in line.split()]
         thisLen = len(row)
         if numCols is not None and thisLen != numCols:
-            raise ValueError('All rows must have the same number of columns')
+            raise ValueError('All rows must have the same number of
+columns')
         X.append(row)
 
     X = array(X)
