--- loncom/xml/lontexconvert.pm 2005/02/28 19:08:11 1.62 +++ loncom/xml/lontexconvert.pm 2006/03/27 20:40:42 1.71 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # TeX Conversion Module # -# $Id: lontexconvert.pm,v 1.62 2005/02/28 19:08:11 albertel Exp $ +# $Id: lontexconvert.pm,v 1.71 2006/03/27 20:40:42 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -47,21 +47,22 @@ use Apache::lonmsg(); use Apache::lonxml(); use Apache::lonmenu(); use Apache::lonlocal; +use Apache::lonnet; # ====================================================================== Header sub init_tth { - my $options=$ENV{'course.'.$ENV{'request.course.id'}.'.tthoptions'}; - if ($ENV{'browser.mathml'}) { + my $options=$env{'course.'.$env{'request.course.id'}.'.tthoptions'}; + if ($env{'browser.mathml'}) { &tth::ttminit(); - if ($ENV{'browser.unicode'}) { + if ($env{'browser.unicode'}) { &tth::ttmoptions('-L -u1 '.$options); } else { &tth::ttmoptions('-L -u0 '.$options); } } else { &tth::tthinit(); - if ($ENV{'browser.unicode'}) { + if ($env{'browser.unicode'}) { &tth::tthoptions('-L -u1 '.$options); } else { &tth::tthoptions('-L -u0 '.$options); @@ -69,17 +70,6 @@ sub init_tth { } } -sub header { - $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; @@ -98,8 +88,8 @@ sub convert_real { $Apache::lontexconvert::messedup=1; die &mt("TeX unconverted due to errors"); }; - alarm($Apache::lonnet::perlvar{'lonScriptTimeout'}); - if ($ENV{'browser.mathml'}) { + &Apache::lonxml::start_alarm(); + if ($env{'browser.mathml'}) { $xmlstring=&tth::ttm($$texstring); $xmlstring=~s/\/\/g; $xmlstring=~s/\/\/g; @@ -113,7 +103,7 @@ sub convert_real { $xmlstring=~s/^\s*\
request(); - $request->child_terminate(); + if (ref($Apache::lonxml::request)) { + $Apache::lonxml::request->child_terminate(); + } else { + my $request; + eval { $request=Apache->request; }; + if (!$request) { + eval { $request=Apache2::RequestUtil->request; }; + } + if ($request) { + $request->child_terminate(); + } else { + &Apache::lonnet::logthis("Unable to find a request to do child_terminate on"); + } + } } return $xmlstring; } @@ -164,7 +166,28 @@ sub jsMath_converted { my $tag='span'; if (&displaystyle($texstring)) { $tag='div'; } &clean_out_math_mode($texstring); - return '<'.$tag.' class="math">'.$$texstring.''; + return &jsMath_header(). + '<'.$tag.' class="math">'.$$texstring.''; +} + +{ + my $jsMath_sent_header; + sub jsMath_reset { + $jsMath_sent_header=0; + } + sub jsMath_header { + return '' if $jsMath_sent_header; + $jsMath_sent_header=1; + return + ''."\n". + ''."\n"; + } + sub jsMath_process { + return '' if !$jsMath_sent_header; + return ''; + } } sub mimetex_converted { @@ -184,28 +207,16 @@ sub mimetex_converted { } sub converted { - if ($ENV{'environment.texengine'} eq 'tth') { - return &tth_converted; - } elsif ($ENV{'environment.texengine'} eq 'jsMath') { - return &jsMath_converted; - } elsif ($ENV{'environment.texengine'} eq 'mimetex') { - return &mimetex_converted; - } - return &tth_converted; -} - -# ====================================================================== Footer - -sub footer { - my $xmlstring=''; - if ($ENV{'request.state'} eq 'construct') { - $xmlstring.='
'.$errorstring.'
'; - } else { - &Apache::lonmsg::author_res_msg($ENV{'request.filename'},$errorstring); - } -# -------------------------------------------------------------------- End Body - $xmlstring.=&Apache::lonxml::xmlend(); - return $xmlstring; + my ($string,$mode)=@_; + if ($mode eq '') { $mode=$env{'environment.texengine'}; } + if ($mode =~ /tth/i) { + return &tth_converted($string); + } elsif ($mode =~ /jsmath/i) { + return &jsMath_converted($string); + } elsif ($mode =~ /mimetex/i) { + return &mimetex_converted($string); + } + return &tth_converted($string); } # ------------------------------------------------------------ Message display @@ -220,7 +231,7 @@ sub to_convert { sub smiley { my $expression=shift; - if ($ENV{'browser.imagesuppress'} eq 'on') { return $expression; } + if ($env{'browser.imagesuppress'} eq 'on') { return $expression; } my %smileys=('\:\-\)' => 'smiley', '8\-\)' => 'coolsmile', '8\-(I|\|)' => 'coolindiff', @@ -259,6 +270,18 @@ sub msgtexconverted { $outmessage.=&smiley($_); $tex=1; } } + $message=$outmessage; $outmessage=''; $tex=0; + foreach (split(/(?:\<\;|\<)\/*algebra\s*(?:\>\;|\>)/i,$message)) { + if ($tex) { + if ($email) { + $outmessage.=''.&algebra($_,'web').'
'; $tex=0;
+	    } else {
+		$outmessage.=&algebra($_,'web'); $tex=0;
+	    }
+	} else {
+            $outmessage.=$_; $tex=1;
+	}
+    }
     if (wantarray) {
 	return ($outmessage,$errorstring);
     } else {
@@ -310,10 +333,6 @@ sub postprocess_algebra {
     # 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;