--- loncom/xml/lontexconvert.pm	2004/03/09 15:09:14	1.34
+++ loncom/xml/lontexconvert.pm	2004/07/22 23:18:00	1.38
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # TeX Conversion Module
 #
-# $Id: lontexconvert.pm,v 1.34 2004/03/09 15:09:14 www Exp $
+# $Id: lontexconvert.pm,v 1.38 2004/07/22 23:18:00 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -85,35 +85,54 @@ sub header {
 # ================================================================== Conversion
 
 $Apache::lontexconvert::messedup=0;
+
+# we need this routine because &converted can get called from inside
+# of the safespace (through &xmlparse('<m>stuff</m>') 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/\<math\>/\<math xmlns=\"\&mathns\;\"\>/g;
+	$xmlstring=~s/\<br\>/\<br\/\>/g;
+	$xmlstring=~s/\<p\>/\<p\>\<\/p\>/g;
+	$errorstring.=&tth::ttmerror();
+    } else {
+	$xmlstring=&tth::tth($$texstring);
+	$errorstring.=&tth::ttherror();
+	$xmlstring=~s-</font(\s*)>-</font>-g;
+    }
+    $xmlstring=~s/^\s*//;
+    $xmlstring=~s/\s*$//;
+    alarm(0);
+    return ($xmlstring,$errorstring);
+}
+
 sub converted {
     my $texstring=shift;
     my $xmlstring='['.&mt('UNDISPLAYABLE').']';
     if ($Apache::lontexconvert::messedup) {
-	return &mt('[TeX Unconverted Due To Previous Errors]');
+	return '['.&mt('TeX unconverted due to previous errors').']';
     }
     eval(<<'ENDCONV');
-    {
-	local $SIG{SEGV}=sub { $Apache::lontexconvert::messedup=1; die; };
-	if ($ENV{'browser.mathml'}) {
-	    $xmlstring=&tth::ttm($$texstring);
-	    $xmlstring=~s/\<math\>/\<math xmlns=\"\&mathns\;\"\>/g;
-	    $xmlstring=~s/\<br\>/\<br\/\>/g;
-	    $xmlstring=~s/\<p\>/\<p\>\<\/p\>/g;
-	    $errorstring.=&tth::ttmerror();
-	} else {
-	    $xmlstring=&tth::tth($$texstring);
-	    $errorstring.=&tth::ttherror();
-	    $xmlstring=~s-</font(\s*)>-</font>-g;
-	}
-	$xmlstring=~s/^\s*//;
-	$xmlstring=~s/\s*$//;
-    }
+    ($xmlstring,$errorstring)=&convert_real($texstring)
 ENDCONV
     if ($@) {
-	$errorstring.=&mt("Evaluation Error ").$@;
+	$errorstring.=&mt("Evaluation Error: ").$@;
 	$Apache::lontexconvert::messedup=1;
     }
-    if ($Apache::lontexconvert::messedup || &tth::tthmessedup()) {
+    if ($Apache::lontexconvert::messedup || &tth::tthmessedup() || 
+	$errorstring) {
 	&Apache::lonnet::logthis("Trying to kill myself");
 	$Apache::lontexconvert::messedup=1;
 	my $request=Apache->request();
@@ -171,12 +190,16 @@ sub smiley {
 }
 
 sub msgtexconverted {
-    my $message=shift;
-    my $email=shift;
+    my ($message,$email,$priorversions) = @_;
     $errorstring='';
     &init_tth();
     my $outmessage='';
     my $tex=0;
+    if ($priorversions > 0) {
+        if ($message =~ /::::\d+::::(.+)$/) {
+            $message = $1;
+        }
+    }
     foreach (split(/(?:\&lt\;|\<)\/*m\s*(?:\&gt\;|\>)/i,$message)) {
 	if ($tex) {
 	    if ($email) {