--- loncom/xml/algebra/AlgParser.pm 2005/02/24 08:24:40 1.3 +++ loncom/xml/algebra/AlgParser.pm 2005/02/24 08:32:11 1.7 @@ -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|(?:(?:(?:var)?(?:[tT]h))|(?:[bz])?)eta|[gG]amma|iota|kappa|[lL]ambda|mu|nu|[xX]i|(?:var)?rho|(?:var)?[sS]igma|tau|(?:var)?(?:[pP])hi|chi|[oO]mega|(?:(?:var)?(?:[eE])|(?:[uU]))psilon|[dD]elta|[pP]si|(?:var)?[pP]i'; 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 . ')'; @@ -606,7 +607,9 @@ sub tolatex { } }; /special/ && do { - if ($args[0] eq 'pi') {return '\pi';} else {return $args[0];} + if ($args[0] =~/($greek|$escape)/) {return '\\'.$1;} + elsif ($args[0] =~/$delete/) {return '';} + else { return $args[0]; } }; /varname|(:?number$)/ && return $args[0]; /numberE/ && do {