--- loncom/xml/lontexconvert.pm 2004/01/28 20:48:35 1.30 +++ loncom/xml/lontexconvert.pm 2005/02/27 17:28:56 1.61 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # TeX Conversion Module # -# $Id: lontexconvert.pm,v 1.30 2004/01/28 20:48:35 albertel Exp $ +# $Id: lontexconvert.pm,v 1.61 2005/02/27 17:28:56 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 @@ -71,50 +70,97 @@ sub init_tth { } sub header { - $errorstring=''; - my $time=time; - &init_tth(); - return &Apache::lonxml::xmlbegin(). - &Apache::lonxml::fontsettings(). - "\n\n". - &Apache::lonmenu::registerurl(undef,'tex'). - "\n\n"; + $errorstring=''; + my $time=time; + &init_tth(); + return &Apache::lonxml::xmlbegin(). + "\n\n". + &Apache::lonxml::fontsettings(). + &Apache::lonmenu::registerurl(undef,'tex'). + "\n\n"; } # ================================================================== Conversion $Apache::lontexconvert::messedup=0; -sub converted { - my $texstring=shift; - my $xmlstring='[UNDISPLAYABLE]'; - if ($Apache::lontexconvert::messedup) { - return '[TeX Unconverted Due To Previous Errors]'; - } - eval(<<'ENDCONV'); - { + +# 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(); + $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=&tth::tth($$texstring); + $errorstring.=&tth::ttherror(); + $xmlstring=~s---g; } + $xmlstring=~s/^\s*\
request(); - $request->child_terminate(); - } - return $xmlstring; + if ($@) { + $errorstring.=&mt("Evaluation Error: ").$@; + $Apache::lontexconvert::messedup=1; + } + if ($Apache::lontexconvert::messedup || &tth::tthmessedup() || + $errorstring) { + &Apache::lonnet::logthis("Trying to kill myself"); + $Apache::lontexconvert::messedup=1; + my $request=Apache->request(); + $request->child_terminate(); + } + return $xmlstring; +} + +sub jsMath_converted { + my $texstring=shift; + my $tag='span'; + if ($$texstring=~/[^\\]\$\$/) { + #has a $$ in it, guessinng it's display mode + $tag='div'; + } + $$texstring=~s/(?!\\)\$//g; + $$texstring=~s/\\ensuremath//g; + return '<'.$tag.' class="math">'.$$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 @@ -142,32 +188,31 @@ sub to_convert { } sub smiley { - my $expression=shift; - if ($ENV{'browser.imagesuppress'} eq 'on') { return $expression; } - my %smileys=('\:\-\)' => 'smiley', - '8\-\)' => 'coolsmile', - '8\-(I|\|)' => 'coolindiff', - ':\-(I|\|)' => 'neutral', - '\:\-(o|O|\(\))' => 'shocked', - ':\-\(' => 'frowny', - '\;\-\)' => 'wink', - '\:\-P' => 'baeh', - '\:\-(\\\|\\/)' => 'hrrm', - '\:\-D' => 'bigsmile', - '\:\-C' => 'angry', - '\:(\'|\`)\-\(' => 'cry', - '\:\-(X|\#)' => 'lipsrsealed', - '\:\-S' => 'huh'); - my $iconpath=$Apache::lonnet::perlvar{'lonIconsURL'}; - foreach (keys %smileys) { - $expression=~s/$_/\/gs; - } - return $expression; + my $expression=shift; + if ($ENV{'browser.imagesuppress'} eq 'on') { return $expression; } + my %smileys=('\:\-\)' => 'smiley', + '8\-\)' => 'coolsmile', + '8\-(I|\|)' => 'coolindiff', + ':\-(I|\|)' => 'neutral', + '\:\-(o|O|\(\))' => 'shocked', + ':\-\(' => 'frowny', + '\;\-\)' => 'wink', + '\:\-P' => 'baeh', + '\:\-(\\\|\\/)' => 'hrrm', + '\:\-D' => 'bigsmile', + '\:\-C' => 'angry', + '\:(\'|\`)\-\(' => 'cry', + '\:\-(X|\#)' => 'lipsrsealed', + '\:\-S' => 'huh'); + my $iconpath=$Apache::lonnet::perlvar{'lonIconsURL'}; + foreach (keys %smileys) { + $expression=~s/$_/\/gs; + } + return $expression; } sub msgtexconverted { - my $message=shift; - my $email=shift; + my ($message,$email) = @_; $errorstring=''; &init_tth(); my $outmessage=''; @@ -190,6 +235,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 { + # style is 'inline' + $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; + return $string; +} 1; __END__