--- loncom/xml/lontexconvert.pm	2002/09/16 21:25:22	1.9
+++ loncom/xml/lontexconvert.pm	2003/02/03 18:03:53	1.14
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # TeX Conversion Module
 #
-# $Id: lontexconvert.pm,v 1.9 2002/09/16 21:25:22 albertel Exp $
+# $Id: lontexconvert.pm,v 1.14 2003/02/03 18:03:53 harris41 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;
 }
 
@@ -101,6 +115,7 @@ sub footer {
 
 sub to_convert {
     my ($string) = @_;
+    $string=~s/\<br\s*\/?\>/ /g;
     return &converted(\$string);
 }