Revision: 3616
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=3616&view=rev
Author: mdboom
Date: 2007-07-26 06:46:56 -0700 (Thu, 26 Jul 2007)
Log Message:
-----------
Committing in preparation for merge
Modified Paths:
--------------
branches/mathtext_mgd/examples/mathtext_examples.py
branches/mathtext_mgd/lib/matplotlib/mathtext.py
Modified: branches/mathtext_mgd/examples/mathtext_examples.py
===================================================================
--- branches/mathtext_mgd/examples/mathtext_examples.py 2007-07-26 13:26:26 UTC
(rev 3615)
+++ branches/mathtext_mgd/examples/mathtext_examples.py 2007-07-26 13:46:56 UTC
(rev 3616)
@@ -10,7 +10,7 @@
r'$x\leftarrow y\ x\forall y$',
r'$x \sf x \bf x {\cal X} \rm x$',
r'$\{ \rm braces \}$',
- r'$\left[\left\lfloor\frac{5}{\frac{3}{4}} y\right)\right]$',
+ r'$\left[\left\lfloor\frac{5}{\frac{\left(3\right)}{4}} y\right)\right]$',
r'$\left(x\right)$',
r'$\sin(x)$',
r'$x_2$',
Modified: branches/mathtext_mgd/lib/matplotlib/mathtext.py
===================================================================
--- branches/mathtext_mgd/lib/matplotlib/mathtext.py 2007-07-26 13:26:26 UTC
(rev 3615)
+++ branches/mathtext_mgd/lib/matplotlib/mathtext.py 2007-07-26 13:46:56 UTC
(rev 3616)
@@ -1728,24 +1728,16 @@
bslash = Literal('\\')
- accent = oneOf("hat check dot breve acute ddot grave tilde bar
vec "
- "\" ` ' ~ . ^")
+ accent = oneOf("hat check dot breve acute ddot grave tilde bar "
+ "vec \" ` ' ~ . ^")
- function = oneOf("arccos csc ker min arcsin deg lg Pr arctan det
lim sec "
- "arg dim liminf sin cos exp limsup sinh cosh gcd
ln sup "
- "cot hom log tan coth inf max tanh")
+ function = oneOf("arccos csc ker min arcsin deg lg Pr arctan det "
+ "lim sec arg dim liminf sin cos exp limsup sinh "
+ "cosh gcd ln sup cot hom log tan coth inf max "
+ "tanh")
number = Combine(Word(nums) + Optional(Literal('.')) + Optional(
Word(nums) ))
- plus = Literal('+')
- minus = Literal('-')
- times = Literal('*')
- div = Literal('/')
- binop =(plus
- | minus
- | times
- | div)
-
fontname = oneOf("rm cal it tt sf bf")
latex2efont = oneOf("mathrm mathcal mathit mathtt mathsf mathbf")
@@ -1784,7 +1776,9 @@
group = Group(
start_group
- + OneOrMore(simple)
+ + OneOrMore(
+ autoDelim
+ | simple)
+ end_group
).setParseAction(self.group).setName("group")
@@ -1833,8 +1827,7 @@
\updownarrow \Uparrow \Downarrow
\Updownarrow""")
leftDelim = oneOf(r"( [ { \lfloor \langle \lceil")
- rightDelim = oneOf(r") ] } \rfloot \rangle \rceil")
-
+ rightDelim = oneOf(r") ] } \rfloor \rangle \rceil")
autoDelim <<(Suppress(Literal(r"\left"))
+ (leftDelim | ambiDelim)
+ Group(
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
