[LON-CAPA-cvs] cvs: modules /TexConvert/algebra AlgParser.pm
albertel
lon-capa-cvs@mail.lon-capa.org
Thu, 24 Feb 2005 08:27:17 -0000
albertel Thu Feb 24 03:27:17 2005 EDT
Modified files:
/modules/TexConvert/algebra AlgParser.pm
Log:
- reorder, so the mathcing 'e' isn't the first thing we try to do
Index: modules/TexConvert/algebra/AlgParser.pm
diff -u modules/TexConvert/algebra/AlgParser.pm:1.4 modules/TexConvert/algebra/AlgParser.pm:1.5
--- modules/TexConvert/algebra/AlgParser.pm:1.4 Thu Feb 24 03:25:21 2005
+++ modules/TexConvert/algebra/AlgParser.pm Thu Feb 24 03:27:17 2005
@@ -43,10 +43,11 @@
my $openparen = '[{(\\[]';
my $closeparen = '[})\\]]';
my $varname = '[A-Za-z](?:_[0-9]+)?';
-my $greek='alpha|bita|gamma|zita|thita|iota|kappa|lambda|mu|nu|xi|rho|sigma|tau|phi|chi|psi|omega|zepslon|zdelta|xeta|zupslon';
+my $greek='alpha|bita|gamma|zita|thita|iota|kappa|lambda|mu|nu|xi|rho|sigma|tau|phi|chi|psi|omega|zepslon|zdelta|xeta|zupslon|pi';
my $delete='zeroplace';
my $escape='infty';
-my $specialvalue = '(?:e|pi|d[a-z]|'.$escape.'|'.$greek.'|'.$delete.')';
+my $specialvalue = '(?:'.$escape.'|'.$greek.'|'.$delete.'|d[a-z]|e)';
+
my $numberplain = '(?:\d+(?:\.\d*)?|\.\d+)';
my $numberE = '(?:' . $numberplain . 'E[-+]?\d+)';
my $number = '(?:' . $numberE . '|' . $numberplain . ')';