--- loncom/xml/lontexconvert.pm 2003/04/19 20:32:24 1.22 +++ loncom/xml/lontexconvert.pm 2005/02/09 15:45:19 1.42 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # TeX Conversion Module # -# $Id: lontexconvert.pm,v 1.22 2003/04/19 20:32:24 www Exp $ +# $Id: lontexconvert.pm,v 1.42 2005/02/09 15:45:19 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -42,71 +42,104 @@ 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 +sub init_tth { + my $options=$ENV{'course.'.$ENV{'request.course.id'}.'.tthoptions'}; + if ($ENV{'browser.mathml'}) { + &tth::ttminit(); + if ($ENV{'browser.unicode'}) { + &tth::ttmoptions('-L -u1 '.$options); + } else { + &tth::ttmoptions('-L -u0 '.$options); + } + } else { + &tth::tthinit(); + if ($ENV{'browser.unicode'}) { + &tth::tthoptions('-L -u1 '.$options); + } else { + &tth::tthoptions('-L -u0 '.$options); + } + } +} + sub header { - $errorstring=''; - my $time=time; - if ($ENV{'browser.mathml'}) { - &tth::ttminit(); - if ($ENV{'browser.unicode'}) { - &tth::ttmoptions('-L -u1'); - } else { - &tth::ttmoptions('-L -u0'); - } - } else { - &tth::tthinit(); - if ($ENV{'browser.unicode'}) { - &tth::tthoptions('-L -u1'); - } else { - &tth::tthoptions('-L -u0'); - } - } - 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 '[Uncoverted 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=&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; } # ====================================================================== Footer @@ -128,58 +161,57 @@ sub footer { sub to_convert { my ($string) = @_; $string=~s/\/ /gs; - $string=~s/\s/ /gs; +# $string=~s/\s/ /gs; $string=&HTML::Entities::decode($string); return &converted(\$string); } sub smiley { - my $expression=shift; - if ($ENV{'browser.imagesuppress'} eq 'on') { return $expression; } - my %smileys=('\:\-*\)' => 'smiley', - '8\-*\)' => 'coolsmile', - '8\-*I' => 'coolindiff', - ':\-*\(' => 'frowny', - '\:\-*(o|O|\(\))' => 'shocked', - '\;\-*\)' => '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 ($message,$email) = @_; $errorstring=''; - if ($ENV{'browser.mathml'}) { - &tth::ttminit(); - if ($ENV{'browser.unicode'}) { - &tth::ttmoptions('-L -u1'); + &init_tth(); + my $outmessage=''; + my $tex=0; + foreach (split(/(?:\<\;|\<)\/*m\s*(?:\>\;|\>)/i,$message)) { + if ($tex) { + if ($email) { + $outmessage.=''.&to_convert($_).'
'; $tex=0;
+	    } else {
+		$outmessage.=&to_convert($_); $tex=0;
+	    }
 	} else {
-	    &tth::ttmoptions('-L -u0');
+            $outmessage.=&smiley($_); $tex=1;
 	}
+    }
+    if (wantarray) {
+	return ($outmessage,$errorstring);
     } else {
-	&tth::tthinit();
-	if ($ENV{'browser.unicode'}) {
-	    &tth::tthoptions('-L -u1');
-	} else {
-	    &tth::tthoptions('-L -u0');
-	}
+	return $outmessage.$errorstring;
     }
-    $message=~s/(\$\$.+?\$\$)/&to_convert($1)/gse;
-    $message=~s/(\$.+?\$)/&to_convert($1)/gse;
-    $message=~s/(\\\(.+?\\\))/&to_convert($1)/gse;
-    $message=~s/(\\\[.+?\\\])/&to_convert($1)/gse;
-    return &smiley($message).$errorstring;
 }
 
 1;