--- loncom/xml/lontexconvert.pm 2004/07/22 23:18:00 1.38 +++ loncom/xml/lontexconvert.pm 2005/02/25 05:54:01 1.59 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # TeX Conversion Module # -# $Id: lontexconvert.pm,v 1.38 2004/07/22 23:18:00 raeburn Exp $ +# $Id: lontexconvert.pm,v 1.59 2005/02/25 05:54:01 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -36,8 +36,6 @@ # The C source of the Code may not be distributed by the Licensee # to any other parties under any circumstances. # -# 05/29/00,05/30,10/11,10/20 Gerd Kortemeyer -# 5/4 Gerd Kortemeyer package Apache::lontexconvert; @@ -76,8 +74,8 @@ sub header { my $time=time; &init_tth(); return &Apache::lonxml::xmlbegin(). - &Apache::lonxml::fontsettings(). "\n\n". + &Apache::lonxml::fontsettings(). &Apache::lonmenu::registerurl(undef,'tex'). "\n\n"; } @@ -112,18 +110,21 @@ sub convert_real { $errorstring.=&tth::ttherror(); $xmlstring=~s---g; } + $xmlstring=~s/^\s*\
'.$$texstring.''; +} + +sub converted { + if ($ENV{'environment.texengine'} eq 'tth') { + return &tth_converted; + } elsif ($ENV{'environment.texengine'} eq 'jsMath') { + return &jsMath_converted; + } + return &tth_converted; +} + # ====================================================================== Footer sub footer { @@ -190,16 +214,11 @@ sub smiley { } sub msgtexconverted { - my ($message,$email,$priorversions) = @_; + my ($message,$email) = @_; $errorstring=''; &init_tth(); my $outmessage=''; my $tex=0; - if ($priorversions > 0) { - if ($message =~ /::::\d+::::(.+)$/) { - $message = $1; - } - } foreach (split(/(?:\<\;|\<)\/*m\s*(?:\>\;|\>)/i,$message)) { if ($tex) { if ($email) { @@ -218,6 +237,76 @@ sub msgtexconverted { } } +sub algebra { + use AlgParser; + + my ($string,$target,$style)=@_; + my $parser = new AlgParserWithImplicitExpand; + $string=&prepare_algebra($string); + my $ret = $parser->parse($string); + my $result='['.&mt('Algebra unconverted due to previous errors').']'; + if ( ref($ret) ) { + #$parser->tostring(); + $parser->normalize(); + my $latex=$parser->tolatex(); + $latex=&postprocess_algebra($latex); + if ($style eq 'display') { + $latex='$$'.$latex.'$$x'; + } else { + $latex='\\ensuremath{'.$latex.'}'; + } + if ($target eq 'web' || $target eq 'analyze') { + $result = &converted(\$latex); + } else { + $result = $latex; + } + } else { + &Apache::lonxml::error($parser->{'htmlerror'}); + } +} + +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; + + # 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; +} 1; __END__