--- loncom/xml/lontexconvert.pm 2005/02/27 17:28:56 1.61 +++ loncom/xml/lontexconvert.pm 2008/09/10 19:45:23 1.89 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # TeX Conversion Module # -# $Id: lontexconvert.pm,v 1.61 2005/02/27 17:28:56 albertel Exp $ +# $Id: lontexconvert.pm,v 1.89 2008/09/10 19:45:23 droeschl Exp $ # # Copyright Michigan State University Board of Trustees # @@ -42,44 +42,39 @@ package Apache::lontexconvert; use strict; use tth(); use vars qw($errorstring); -use Apache(); -use Apache::lonmsg(); -use Apache::lonxml(); -use Apache::lonmenu(); +#use Apache::lonxml(); use Apache::lonlocal; +use Apache::lonnet; +use lib '/home/httpd/lib/perl/'; +use LONCAPA; + # ====================================================================== 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 ($options =~ /\S/) { + $options = ' '.$options; + } else { + undef($options); + } + if ($env{'browser.mathml'}) { &tth::ttminit(); - if ($ENV{'browser.unicode'}) { - &tth::ttmoptions('-L -u1 '.$options); + if ($env{'browser.unicode'}) { + &tth::ttmoptions('-L -u1'.$options); } else { - &tth::ttmoptions('-L -u0 '.$options); + &tth::ttmoptions('-L -u0'.$options); } } else { &tth::tthinit(); - if ($ENV{'browser.unicode'}) { - &tth::tthoptions('-L -u1 '.$options); + if ($env{'browser.unicode'}) { + &tth::tthoptions('-L -u1'.$options); } else { - &tth::tthoptions('-L -u0 '.$options); + &tth::tthoptions('-L -u0'.$options); } } } -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 +93,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 +108,15 @@ 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; } +sub clean_out_math_mode { + my ($texstring)=@_; + $$texstring=~s/(?'.$$texstring.''; +} + +{ + my @jsMath_sent_header; + sub jsMath_reset { + undef(@jsMath_sent_header); + } + sub jsMath_push { + push(@jsMath_sent_header,0); + } + sub jsMath_header { + if (!@jsMath_sent_header) { + &Apache::lonnet::logthis("mismatched calls of jsMath_header and jsMath_process"); + return ''; + } + return '' if $jsMath_sent_header[-1]; + $jsMath_sent_header[-1]=1; + return + ''."\n". + ''."\n"; + } + sub jsMath_process { + my $state = pop(@jsMath_sent_header); + return '' if !$state; + return "\n". + ''."\n"; + } + sub jsMath_state { + my ($level) = @_; + return $jsMath_sent_header[$level]; } - $$texstring=~s/(?!\\)\$//g; - $$texstring=~s/\\ensuremath//g; - return '<'.$tag.' class="math">'.$$texstring.''; +} + +sub tex_engine { + if (exists($env{'form.texengine'})) { + if ($env{'form.texengine'} ne '') { + return $env{'form.texengine'}; + } + } + if ($env{'request.course.id'} + && exists($env{'course.'.$env{'request.course.id'}.'.texengine'})) { + return $env{'course.'.$env{'request.course.id'}.'.texengine'}; + } + if (exists($env{'environment.texengine'})) { + return $env{'environment.texengine'}; + } + return 'tth'; +} + +sub init_math_support { + my ($inherit_jsmath) = @_; + &init_tth(); + &Apache::lontexconvert::jsMath_push(); + if (lc(&tex_engine()) eq 'jsmath' || + ($inherit_jsmath && &jsMath_state(-2))) { + return &Apache::lontexconvert::jsMath_header(); + } + return; +} + +sub mimetex_converted { + my $texstring=shift; + my $displaystyle=&displaystyle($texstring); + + &clean_out_math_mode($texstring); + + if ($displaystyle) { + $$texstring='\\displaystyle \\Large '.$$texstring; + } + my $result=''; + if ($displaystyle) { + $result='
'.$result.'
'; + } + return $result; } 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 { - 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 = &tex_engine(); } + 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 @@ -189,7 +285,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', @@ -205,8 +301,8 @@ sub smiley { '\:\-(X|\#)' => 'lipsrsealed', '\:\-S' => 'huh'); my $iconpath=$Apache::lonnet::perlvar{'lonIconsURL'}; - foreach (keys %smileys) { - $expression=~s/$_/\/gs; + foreach my $smiley (keys(%smileys)) { + $expression=~s/$smiley/\/gs; } return $expression; } @@ -217,15 +313,34 @@ sub msgtexconverted { &init_tth(); my $outmessage=''; my $tex=0; - foreach (split(/(?:\<\;|\<)\/*m\s*(?:\>\;|\>)/i,$message)) { + foreach my $fragment (split(/(?:\<\;|\<)\/*m\s*(?:\>\;|\>)/i,$message)) { if ($tex) { if ($email) { - $outmessage.=''.&to_convert($_).'
'; $tex=0;
+		$outmessage.='
'.&to_convert($fragment).'
';
+		$tex=0;
 	    } else {
-		$outmessage.=&to_convert($_); $tex=0;
+		$outmessage.=&to_convert($fragment);
+		$tex=0;
 	    }
 	} else {
-            $outmessage.=&smiley($_); $tex=1;
+            $outmessage.=&smiley($fragment);
+	    $tex=1;
+	}
+    }
+    $message=$outmessage; $outmessage=''; $tex=0;
+    foreach my $fragment (split(/(?:\<\;|\<)\/*algebra\s*(?:\>\;|\>)/i,
+				$message)) {
+	if ($tex) {
+	    if ($email) {
+		$outmessage.='
'.&algebra($fragment,'web').'
';
+		$tex=0;
+	    } else {
+		$outmessage.=&algebra($fragment,'web');
+		$tex=0;
+	    }
+	} else {
+            $outmessage.=$fragment;
+	    $tex=1;
 	}
     }
     if (wantarray) {
@@ -238,7 +353,7 @@ sub msgtexconverted {
 sub algebra {
     use AlgParser;
 
-    my ($string,$target,$style)=@_;
+    my ($string,$target,$style,$parstack,$safeeval)=@_;
     my $parser = new AlgParserWithImplicitExpand;
     $string=&prepare_algebra($string);
     my $ret = $parser->parse($string);
@@ -255,7 +370,9 @@ sub algebra {
 	    $latex='\\ensuremath{'.$latex.'}';
 	}
 	if ($target eq 'web' || $target eq 'analyze') {
-	    $result = &converted(\$latex);
+            my $display=&Apache::lonxml::get_param('display',$parstack,$safeeval);
+            $result = &converted(\$latex,$display);
+#	    $result = &converted(\$latex);
 	} else {
 	    $result = $latex;
 	}
@@ -279,13 +396,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;
-    
     # sqrt(3,4) means the 4 root of 3
     $string =~s/\\sqrt{([^,]+),([^\}]+)}/\\sqrt[$2]{$1}/gs;