--- loncom/xml/lontexconvert.pm 2004/03/04 15:41:18 1.32 +++ loncom/xml/lontexconvert.pm 2005/02/24 08:32:11 1.49 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # TeX Conversion Module # -# $Id: lontexconvert.pm,v 1.32 2004/03/04 15:41:18 albertel Exp $ +# $Id: lontexconvert.pm,v 1.49 2005/02/24 08:32:11 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -36,18 +36,17 @@ # 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; use strict; -use tth; +use tth(); use vars qw($errorstring); use Apache(); -use Apache::lonmsg; -use Apache::lonxml; -use Apache::lonmenu; +use Apache::lonmsg(); +use Apache::lonxml(); +use Apache::lonmenu(); +use Apache::lonlocal; # ====================================================================== Header @@ -75,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"; } @@ -84,35 +83,55 @@ sub header { # ================================================================== Conversion $Apache::lontexconvert::messedup=0; + +# we need this routine because &converted can get called from inside +# of the safespace (through &xmlparse('stuff') which doesn't +# allow the opcode for alarm, so we need to compile this before we get +# into the safe space since opcode checks only occur at compile time +sub convert_real { + my ($texstring)=@_; + my ($xmlstring,$errorstring); + local $SIG{SEGV}=sub { $Apache::lontexconvert::messedup=1; die; }; + local $SIG{ALRM}=sub { + &Apache::lonnet::logthis("ALRM"); + $xmlstring='['.&mt("TeX unconverted due to errors").']'; + $Apache::lontexconvert::messedup=1; + die &mt("TeX unconverted due to errors"); + }; + alarm($Apache::lonnet::perlvar{'lonScriptTimeout'}); + if ($ENV{'browser.mathml'}) { + $xmlstring=&tth::ttm($$texstring); + $xmlstring=~s/\/\/g; + $xmlstring=~s/\/\/g; + $xmlstring=~s/\/\\<\/p\>/g; + $errorstring.=&tth::ttmerror(); + } else { + $xmlstring=&tth::tth($$texstring); + $errorstring.=&tth::ttherror(); + $xmlstring=~s---g; + } + $xmlstring=~s/^\s*\
/\/g; - $xmlstring=~s/\/\/g; - $xmlstring=~s/\/\\<\/p\>/g; - $errorstring.=&tth::ttmerror(); - } else { - $xmlstring=&tth::tth($$texstring); - $errorstring.=&tth::ttherror(); - $xmlstring=~s---g; - } - $xmlstring=~s/^\s*//; - $xmlstring=~s/\s*$//; - } + ($xmlstring,$errorstring)=&convert_real($texstring) ENDCONV if ($@) { - $errorstring.="Evaluation Error $@"; + $errorstring.=&mt("Evaluation Error: ").$@; $Apache::lontexconvert::messedup=1; } - if ($Apache::lontexconvert::messedup || &tth::tthmessedup()) { + if ($Apache::lontexconvert::messedup || &tth::tthmessedup() || + $errorstring) { &Apache::lonnet::logthis("Trying to kill myself"); $Apache::lontexconvert::messedup=1; my $request=Apache->request(); @@ -170,8 +189,7 @@ sub smiley { } sub msgtexconverted { - my $message=shift; - my $email=shift; + my ($message,$email) = @_; $errorstring=''; &init_tth(); my $outmessage=''; @@ -194,6 +212,54 @@ sub msgtexconverted { } } +sub algebra { + use AlgParser; + + my ($string,$target)=@_; + 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); + $latex='$'.$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)=@_; + + # change some multi character operators into single character operators + $string =~ s/<>/\#/g; + $string =~ s/<\=/\%/g; + $string =~ s/>\=/\!/g; + + # makes the decision about what is a minus sign easier + $string =~ s/([\=\>\<\%\!\#] *)-/$1 zeroplace -/g; + + return $string; +} + +sub postprocess_algebra { + my ($string)=@_; + + # exapnd out some operators + $string =~ s/\#/\\not= /g; + $string =~ s/\%/\\leq /g; + $string =~ s/\!/\\geq /g; + + return $string; +} 1; __END__