version 1.49, 2005/02/24 08:32:11
|
version 1.53, 2005/02/24 09:44:46
|
Line 221 sub algebra {
|
Line 221 sub algebra {
|
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); |
Line 239 sub algebra {
|
Line 239 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/<\=/\%/g; |
|
$string =~ s/>\=/\!/g; |
|
|
|
# makes the decision about what is a minus sign easier |
|
$string =~ s/([\=\>\<\%\!\#] *)-/$1 zeroplace -/g; |
$string =~ s/([\=\>\<\%\!\#] *)-/$1 zeroplace -/g; |
|
|
return $string; |
return $string; |
Line 253 sub prepare_algebra {
|
Line 248 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; |
|
|
|
# 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; |
|
|
|
# remove the extra () in the denominator of a \frac |
|
$string =~s/\\frac{(.+?)}{\\left\((.+?)\\right\)}/\\frac{$1}{$2}/gs; |
|
|
|
|
|
&Apache::lonnet::logthis($string); |
return $string; |
return $string; |
} |
} |
1; |
1; |