version 1.44, 2005/02/24 01:21:50
|
version 1.51, 2005/02/24 09:28:54
|
Line 213 sub msgtexconverted {
|
Line 213 sub msgtexconverted {
|
} |
} |
|
|
sub algebra { |
sub algebra { |
|
use AlgParser; |
|
|
my ($string,$target)=@_; |
my ($string,$target)=@_; |
my $parser = new AlgParserWithImplicitExpand; |
my $parser = new AlgParserWithImplicitExpand; |
|
$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='$$'.$latex.'$$'; |
$latex=&postprocess_algebra($latex); |
|
$latex='$'.$latex.'$'; |
if ($target eq 'web' || $target eq 'analyze') { |
if ($target eq 'web' || $target eq 'analyze') { |
$result = &converted(\$latex); |
$result = &converted(\$latex); |
} else { |
} else { |
Line 232 sub algebra {
|
Line 236 sub algebra {
|
} |
} |
} |
} |
|
|
|
sub prepare_algebra { |
|
my ($string)=@_; |
|
|
|
# makes the decision about what is a minus sign easier supposedly |
|
$string =~ s/([\=\>\<\%\!\#] *)-/$1 zeroplace -/g; |
|
|
|
return $string; |
|
} |
|
|
|
sub postprocess_algebra { |
|
my ($string)=@_; |
|
|
|
# moodle had these and I don't know why, ignoring them for now |
|
# $string =~s/\\fun/ /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; |
|
|
|
&Apache::lonnet::logthis($string); |
|
return $string; |
|
} |
1; |
1; |
__END__ |
__END__ |
|
|