--- loncom/xml/lontexconvert.pm	2003/02/25 22:50:11	1.17
+++ loncom/xml/lontexconvert.pm	2003/02/27 21:01:39	1.19
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # TeX Conversion Module
 #
-# $Id: lontexconvert.pm,v 1.17 2003/02/25 22:50:11 albertel Exp $
+# $Id: lontexconvert.pm,v 1.19 2003/02/27 21:01:39 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -44,6 +44,7 @@ package Apache::lontexconvert;
 use strict;
 use tth;
 use vars qw($errorstring);
+use Apache();
 use Apache::lonmsg;
 use Apache::lonxml;
 use Apache::lonmenu;
@@ -77,12 +78,16 @@ sub header {
 
 # ================================================================== 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');
-  { 
-    local $SIG{SEGV}=sub { die; };
+  {
+    local $SIG{SEGV}=sub { $Apache::lontexconvert::messedup=1; die; };
     if ($ENV{'browser.mathml'}) {
       $xmlstring=&tth::ttm($$texstring);
       $xmlstring=~s/\<math\>/\<math xmlns=\"\&mathns\;\"\>/g;
@@ -95,6 +100,12 @@ sub converted {
     }
   }
 ENDCONV
+  if ($Apache::lontexconvert::messedup || &tth::tthmessedup()) {
+      &Apache::lonnet::logthis("Trying to kill myself");
+      $Apache::lontexconvert::messedup=1;
+      my $request=Apache->request();
+      $request->child_terminate();
+  }
   return $xmlstring;
 }
 
@@ -117,6 +128,7 @@ sub footer {
 sub to_convert {
     my ($string) = @_;
     $string=~s/\<br\s*\/?\>/ /g;
+    $string=&HTML::Entities::decode($string);
     return &converted(\$string);
 }