--- loncom/xml/lontexconvert.pm	2002/09/16 19:29:06	1.8
+++ loncom/xml/lontexconvert.pm	2003/03/17 16:52:28	1.15.2.1
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # TeX Conversion Module
 #
-# $Id: lontexconvert.pm,v 1.8 2002/09/16 19:29:06 albertel Exp $
+# $Id: lontexconvert.pm,v 1.15.2.1 2003/03/17 16:52:28 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -37,7 +37,6 @@
 # to any other parties under any circumstances.
 #
 # 05/29/00,05/30,10/11,10/20 Gerd Kortemeyer
-# 05/03/2001 Scott Harrison
 # 5/4 Gerd Kortemeyer
 
 package Apache::lontexconvert;
@@ -55,8 +54,18 @@ sub header {
   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().
@@ -68,18 +77,23 @@ sub header {
 # ================================================================== Conversion
 
 sub converted {
-    my $texstring=shift;
-    my $xmlstring;
+  my $texstring=shift;
+  my $xmlstring='[UNDISPLAYABLE]';
+  eval(<<'ENDCONV');
+  { 
+    local $SIG{SEGV}=sub { 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 {
+    } else {
       $xmlstring=&tth::tth($$texstring);
       $errorstring.=&tth::ttherror();
+    }
   }
+ENDCONV
   return $xmlstring;
 }
 
@@ -99,18 +113,35 @@ sub footer {
 
 # ------------------------------------------------------------ Message display
 
+sub to_convert {
+    my ($string) = @_;
+    $string=~s/\<br\s*\/?\>/ /g;
+    $string=&HTML::Entities::decode($string);
+    return &converted(\$string);
+}
+
 sub msgtexconverted {
     my $message=shift;
+
     if ($ENV{'browser.mathml'}) {
-      &tth::ttminit();
-      &tth::ttmoptions("-L");
+	&tth::ttminit();
+	if ($ENV{'browser.unicode'}) {
+	    &tth::ttmoptions('-L -u1');
+	} else {
+	    &tth::ttmoptions('-L -u0');
+	}
     } else {
-      &tth::tthinit();
-      &tth::tthoptions("-L");
+	&tth::tthinit();
+	if ($ENV{'browser.unicode'}) {
+	    &tth::tthoptions('-L -u1');
+	} else {
+	    &tth::tthoptions('-L -u0');
+	}
     }
-    $message=~s/(\$\$.+?\$\$)/&converted(\$1)/ge;
-    $message=~s/(\$.+?\$)/&converted(\$1)/ge;
-    $message=~s/(\\\[.+?\\\])/&converted(\$1)/ge;
+    $message=~s/(\$\$.+?\$\$)/&to_convert($1)/ge;
+    $message=~s/(\$.+?\$)/&to_convert($1)/ge;
+    $message=~s/(\\\(.+?\\\))/&to_convert($1)/ge;
+    $message=~s/(\\\[.+?\\\])/&to_convert($1)/ge;
     return $message.$errorstring;
 }