--- loncom/xml/lontexconvert.pm	2005/02/27 17:28:56	1.61
+++ loncom/xml/lontexconvert.pm	2005/06/09 02:17:11	1.66
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # TeX Conversion Module
 #
-# $Id: lontexconvert.pm,v 1.61 2005/02/27 17:28:56 albertel Exp $
+# $Id: lontexconvert.pm,v 1.66 2005/06/09 02:17:11 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -47,21 +47,22 @@ use Apache::lonmsg();
 use Apache::lonxml();
 use Apache::lonmenu();
 use Apache::lonlocal;
+use Apache::lonnet;
 
 # ====================================================================== Header
 
 sub init_tth {
-    my $options=$ENV{'course.'.$ENV{'request.course.id'}.'.tthoptions'};
-    if ($ENV{'browser.mathml'}) {
+    my $options=$env{'course.'.$env{'request.course.id'}.'.tthoptions'};
+    if ($env{'browser.mathml'}) {
 	&tth::ttminit();
-	if ($ENV{'browser.unicode'}) {
+	if ($env{'browser.unicode'}) {
 	    &tth::ttmoptions('-L -u1 '.$options);
 	} else {
 	    &tth::ttmoptions('-L -u0 '.$options);
 	}
     } else {
 	&tth::tthinit();
-	if ($ENV{'browser.unicode'}) {
+	if ($env{'browser.unicode'}) {
 	    &tth::tthoptions('-L -u1 '.$options);
 	} else {
 	    &tth::tthoptions('-L -u0 '.$options);
@@ -98,8 +99,8 @@ sub convert_real {
 	$Apache::lontexconvert::messedup=1;
 	die &mt("TeX unconverted due to errors");
     };
-    alarm($Apache::lonnet::perlvar{'lonScriptTimeout'});
-    if ($ENV{'browser.mathml'}) {
+    &Apache::lonxml::start_alarm();
+    if ($env{'browser.mathml'}) {
 	$xmlstring=&tth::ttm($$texstring);
 	$xmlstring=~s/\<math\>/\<math xmlns=\"\&mathns\;\"\>/g;
 	$xmlstring=~s/\<br\>/\<br\/\>/g;
@@ -113,7 +114,7 @@ sub convert_real {
     $xmlstring=~s/^\s*\<br clear\=\"all\"/\<br/s;
     $xmlstring=~s/^\s*//;
     $xmlstring=~s/\s*$//;
-    alarm(0);
+    &Apache::lonxml::end_alarm();
     return ($xmlstring,$errorstring);
 }
 
@@ -142,23 +143,54 @@ ENDCONV
     return $xmlstring;
 }
 
+sub clean_out_math_mode {
+    my ($texstring)=@_;
+    $$texstring=~s/(?!\\)\$//g;
+    $$texstring=~s/\\[\)\(\]\[]//g;
+    $$texstring=~s/\\ensuremath//g;
+    return '';
+}
+
+sub displaystyle {
+    my ($texstring)=@_;
+    #has a $$ or \[ or \displaystyle in it, guessinng it's display mode
+    if ($$texstring=~/[^\\]\$\$/ ||
+	$$texstring=~/\\\[/ ||
+	$$texstring=~/\\displaystyle/) { return 1; }
+    return 0;
+}
+
 sub jsMath_converted {
     my $texstring=shift;
     my $tag='span';
-    if ($$texstring=~/[^\\]\$\$/) {
-	#has a $$ in it, guessinng it's display mode
-	$tag='div';
-    }
-    $$texstring=~s/(?!\\)\$//g;
-    $$texstring=~s/\\ensuremath//g;
+    if (&displaystyle($texstring)) { $tag='div'; }
+    &clean_out_math_mode($texstring);
     return '<'.$tag.' class="math">'.$$texstring.'</'.$tag.'>';
 }
 
+sub mimetex_converted {
+    my $texstring=shift;
+    my $displaystyle=&displaystyle($texstring);
+
+    &clean_out_math_mode($texstring);
+
+    if ($displaystyle) {
+	$$texstring='\\displaystyle \\Large '.$$texstring;
+    }
+    my $result='<img src="/cgi-bin/mimetex.cgi?'.&Apache::lonnet::escape($$texstring).'" />';
+    if ($displaystyle) {
+	$result='<center>'.$result.'</center>';
+    }
+    return $result;
+}
+
 sub converted {
-    if ($ENV{'environment.texengine'} eq 'tth') {
+    if ($env{'environment.texengine'} eq 'tth') {
 	return &tth_converted;
-    } elsif ($ENV{'environment.texengine'} eq 'jsMath') {
+    } elsif ($env{'environment.texengine'} eq 'jsMath') {
 	return &jsMath_converted;
+    } elsif ($env{'environment.texengine'} eq 'mimetex') {
+	return &mimetex_converted;
     }
     return &tth_converted;
 }
@@ -167,10 +199,10 @@ sub converted {
 
 sub footer {
   my $xmlstring='';
-  if ($ENV{'request.state'} eq 'construct') {
+  if ($env{'request.state'} eq 'construct') {
       $xmlstring.='<address>'.$errorstring.'</address>';
   } else {
-      &Apache::lonmsg::author_res_msg($ENV{'request.filename'},$errorstring);
+      &Apache::lonmsg::author_res_msg($env{'request.filename'},$errorstring);
   }
 # -------------------------------------------------------------------- End Body
   $xmlstring.=&Apache::lonxml::xmlend();
@@ -189,7 +221,7 @@ sub to_convert {
 
 sub smiley {
     my $expression=shift;
-    if ($ENV{'browser.imagesuppress'} eq 'on') { return $expression; }
+    if ($env{'browser.imagesuppress'} eq 'on') { return $expression; }
     my %smileys=('\:\-\)' => 'smiley',
 		 '8\-\)'  => 'coolsmile',
 		 '8\-(I|\|)'   => 'coolindiff',
@@ -228,6 +260,18 @@ sub msgtexconverted {
             $outmessage.=&smiley($_); $tex=1;
 	}
     }
+    $message=$outmessage; $outmessage=''; $tex=0;
+    foreach (split(/(?:\&lt\;|\<)\/*algebra\s*(?:\&gt\;|\>)/i,$message)) {
+	if ($tex) {
+	    if ($email) {
+		$outmessage.='</pre><tt>'.&algebra($_,'web').'</tt><pre>'; $tex=0;
+	    } else {
+		$outmessage.=&algebra($_,'web'); $tex=0;
+	    }
+	} else {
+            $outmessage.=$_; $tex=1;
+	}
+    }
     if (wantarray) {
 	return ($outmessage,$errorstring);
     } else {
@@ -279,10 +323,6 @@ sub postprocess_algebra {
     # moodle had these and I don't know why, ignoring them for now
     # $string =~s/\\fun/ /g;
 
-    # sqrt(3,4) -> \sqrt\let{3,4\right}, which is annoying
-    $string =~s/\\left\{/\{/g;
-    $string =~s/\\right\}/\}/g;
-
     # remove the extra () in the denominator of a \frac
     $string =~s/\\frac{(.+?)}{\\left\((.+?)\\right\)}/\\frac{$1}{$2}/gs;