--- loncom/xml/lontexconvert.pm 2004/03/19 17:54:17 1.36 +++ loncom/xml/lontexconvert.pm 2005/02/24 05:40:08 1.48 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # TeX Conversion Module # -# $Id: lontexconvert.pm,v 1.36 2004/03/19 17:54:17 albertel Exp $ +# $Id: lontexconvert.pm,v 1.48 2005/02/24 05:40:08 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"; } @@ -95,6 +93,7 @@ sub convert_real { 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"); @@ -111,6 +110,7 @@ sub convert_real { $errorstring.=&tth::ttherror(); $xmlstring=~s---g; } + $xmlstring=~s/^\s*\
request(); @@ -188,8 +189,7 @@ sub smiley { } sub msgtexconverted { - my $message=shift; - my $email=shift; + my ($message,$email) = @_; $errorstring=''; &init_tth(); my $outmessage=''; @@ -212,6 +212,90 @@ sub msgtexconverted { } } +sub algebra { + 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($string); + $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; + + # protect the confusable greek symbols + $string =~ s/delta/zdelta/g; + $string =~ s/beta/bita/g; + $string =~ s/theta/thita/g; + $string =~ s/zeta/zita/g; + $string =~ s/eta/xeta/g; + $string =~ s/epsilon/zepslon/g; + $string =~ s/upsilon/zupslon/g; + + return $string; +} + +sub postprocess_algebra { + my ($string)=@_; + + # remove the chunk used to sepearate out the minus signs + $string =~ s/zeroplace//g; + + # exapnd out some operators + $string =~ s/\#/\\not= /g; + $string =~ s/\%/\\leq /g; + $string =~ s/\!/\\geq /g; + + # replace some special symbols with the LaTeX equivalents + $string =~ s/infty/\\infty/g; + $string =~ s/infinity/\\infty/g; + $string =~ s/alpha/\\alpha/g; + $string =~ s/gamma/\\gamma/g; + $string =~ s/iota/\\iota/g; + $string =~ s/kappa/\\kappa/g; + $string =~ s/lambda/\\lambda/g; + $string =~ s/mu/\\mu/g; + $string =~ s/nu/\\nu/g; + $string =~ s/xi/\\xi/g; + $string =~ s/rho/\\rho/g; + $string =~ s/sigma/\\sigma/g; + $string =~ s/tau/\\tau/g; + $string =~ s/phi/\\phi/g; + $string =~ s/chi/\\chi/g; + $string =~ s/psi/\\psi/g; + $string =~ s/omega/\\omega/g; + $string =~ s/zdelta/\\delta/g; + $string =~ s/bita/\\beta/g; + $string =~ s/thita/\\theta/g; + $string =~ s/zita/\\zeta/g; + $string =~ s/xeta/\\eta/g; + $string =~ s/zepslon/\\epsilon/g; + $string =~ s/zupslon/\\upsilon/g; + + return $string; +} 1; __END__