version 1.49, 2005/02/24 08:32:11
|
version 1.58, 2005/02/24 10:09:32
|
Line 215 sub msgtexconverted {
|
Line 215 sub msgtexconverted {
|
sub algebra { |
sub algebra { |
use AlgParser; |
use AlgParser; |
|
|
my ($string,$target)=@_; |
my ($string,$target,$style)=@_; |
my $parser = new AlgParserWithImplicitExpand; |
my $parser = new AlgParserWithImplicitExpand; |
$string=&prepare_algebra($string); |
$string=&prepare_algebra($string); |
my $ret = $parser->parse($string); |
my $ret = $parser->parse($string); |
my $result='['.&mt('Algebra unconverted due to previous errors').']'; |
my $result='['.&mt('Algebra unconverted due to previous errors').']'; |
if ( ref($ret) ) { |
if ( ref($ret) ) { |
$parser->tostring(); |
#$parser->tostring(); |
$parser->normalize(); |
$parser->normalize(); |
my $latex=$parser->tolatex(); |
my $latex=$parser->tolatex(); |
$latex=&postprocess_algebra($latex); |
$latex=&postprocess_algebra($latex); |
$latex='$'.$latex.'$'; |
if ($style eq 'display') { |
|
$latex='$$'.$latex.'$$x'; |
|
} else { |
|
$latex='\\ensuremath{'.$latex.'}'; |
|
} |
if ($target eq 'web' || $target eq 'analyze') { |
if ($target eq 'web' || $target eq 'analyze') { |
$result = &converted(\$latex); |
$result = &converted(\$latex); |
} else { |
} else { |
Line 239 sub algebra {
|
Line 243 sub algebra {
|
sub prepare_algebra { |
sub prepare_algebra { |
my ($string)=@_; |
my ($string)=@_; |
|
|
# change some multi character operators into single character operators |
# makes the decision about what is a minus sign easier supposedly |
$string =~ s/<>/\#/g; |
$string =~ s/(\<\>|\<\=|\>\=[\=\>\<] *)-/$1 zeroplace -/g; |
$string =~ s/<\=/\%/g; |
|
$string =~ s/>\=/\!/g; |
|
|
|
# makes the decision about what is a minus sign easier |
|
$string =~ s/([\=\>\<\%\!\#] *)-/$1 zeroplace -/g; |
|
|
|
return $string; |
return $string; |
} |
} |
Line 253 sub prepare_algebra {
|
Line 252 sub prepare_algebra {
|
sub postprocess_algebra { |
sub postprocess_algebra { |
my ($string)=@_; |
my ($string)=@_; |
|
|
# exapnd out some operators |
# moodle had these and I don't know why, ignoring them for now |
$string =~ s/\#/\\not= /g; |
# $string =~s/\\fun/ /g; |
$string =~ s/\%/\\leq /g; |
|
$string =~ s/\!/\\geq /g; |
# sqrt(3,4) -> \sqrt\let{3,4\right}, which is annoying |
|
$string =~s/\\left\{/\{/g; |
|
$string =~s/\\right\}/\}/g; |
|
|
|
# remove the extra () in the denominator of a \frac |
|
$string =~s/\\frac{(.+?)}{\\left\((.+?)\\right\)}/\\frac{$1}{$2}/gs; |
|
|
|
# sqrt(3,4) means the 4 root of 3 |
|
$string =~s/\\sqrt{([^,]+),([^\}]+)}/\\sqrt[$2]{$1}/gs; |
|
|
|
# log(3,4) means the log base 4 of 3 |
|
$string =~s/\\log\\left\((.+?),(.+?)\\right\)/\\log_{$2}\\left($1\\right)/gs; |
|
|
|
# log(3,4) means the log base 4 of 3 |
|
$string =~s/\\((?:sin|cos|tan|sec|csc|cot)(?:h)?)\\left\((.+?),(.+?)\\right\)/\\$1^{$3}\\left($2\\right)/gs; |
|
|
|
# int(3,a,b) integral from a to b of 3 |
|
$string =~s/\\int\\left\((.+?),(.+?),(.+?)\\right\)/\\int_{$2}^{$3}\\left($1\\right)/gs; |
|
|
|
# int( ... dx) -> ... |
|
$string =~s/\\int\\left\((.+?)d[a-z]\\right\)/$1/gs; |
|
|
|
# |
|
$string =~s/\\lim\\left\((.+?),(.+?),(.+?)\\right\)/\\lim_{$2\\to $3}$1/gs; |
|
&Apache::lonnet::logthis($string); |
return $string; |
return $string; |
} |
} |
1; |
1; |