--- loncom/xml/algebra/AlgParser.pm 2005/02/24 08:24:40 1.3 +++ loncom/xml/algebra/AlgParser.pm 2005/02/24 08:27:17 1.5 @@ -43,10 +43,11 @@ my $binoper1 = '[-+=><%!#]'; 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|da|db|dc|de|df|dg|dh|di|dj|dk|dl|dm|dn|do|dp|dq|dr|ds|dt|du|dv|dw|dx|dy|dz|'.$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 . ')';