--- loncom/xml/lontexconvert.pm	2005/02/24 09:54:01	1.55
+++ loncom/xml/lontexconvert.pm	2005/03/01 03:21:05	1.64
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # TeX Conversion Module
 #
-# $Id: lontexconvert.pm,v 1.55 2005/02/24 09:54:01 albertel Exp $
+# $Id: lontexconvert.pm,v 1.64 2005/03/01 03:21:05 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -98,7 +98,7 @@ sub convert_real {
 	$Apache::lontexconvert::messedup=1;
 	die &mt("TeX unconverted due to errors");
     };
-    alarm($Apache::lonnet::perlvar{'lonScriptTimeout'});
+    &Apache::lonxml::start_alarm();
     if ($ENV{'browser.mathml'}) {
 	$xmlstring=&tth::ttm($$texstring);
 	$xmlstring=~s/\<math\>/\<math xmlns=\"\&mathns\;\"\>/g;
@@ -113,16 +113,18 @@ 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);
 }
 
-sub converted {
+sub tth_converted {
     my $texstring=shift;
     my $xmlstring='['.&mt('UNDISPLAYABLE').']';
     if ($Apache::lontexconvert::messedup) {
 	return '['.&mt('TeX unconverted due to previous errors').']';
     }
+    $$texstring ='\\documentstyle{article}'.$$texstring;
+
     eval(<<'ENDCONV');
     ($xmlstring,$errorstring)=&convert_real($texstring)
 ENDCONV
@@ -140,6 +142,58 @@ 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 (&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') {
+	return &tth_converted;
+    } elsif ($ENV{'environment.texengine'} eq 'jsMath') {
+	return &jsMath_converted;
+    } elsif ($ENV{'environment.texengine'} eq 'mimetex') {
+	return &mimetex_converted;
+    }
+    return &tth_converted;
+}
+
 # ====================================================================== Footer
 
 sub footer {
@@ -205,6 +259,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 {
@@ -215,7 +281,7 @@ sub msgtexconverted {
 sub algebra {
     use AlgParser;
 
-    my ($string,$target)=@_;
+    my ($string,$target,$style)=@_;
     my $parser = new AlgParserWithImplicitExpand;
     $string=&prepare_algebra($string);
     my $ret = $parser->parse($string);
@@ -225,7 +291,12 @@ sub algebra {
 	$parser->normalize();
 	my $latex=$parser->tolatex();
 	$latex=&postprocess_algebra($latex);
-	$latex='$'.$latex.'$';
+	if ($style eq 'display') {
+	    $latex='$$'.$latex.'$$x';
+	} else {
+	    # style is 'inline'
+	    $latex='\\ensuremath{'.$latex.'}';
+	}
 	if ($target eq 'web' || $target eq 'analyze') {
 	    $result = &converted(\$latex);
 	} else {
@@ -240,7 +311,7 @@ sub prepare_algebra {
     my ($string)=@_;
 
     # makes the decision about what is a minus sign easier supposedly
-    $string =~ s/([\=\>\<\%\!\#] *)-/$1 zeroplace -/g;
+    $string =~ s/(\<\>|\<\=|\>\=[\=\>\<] *)-/$1 zeroplace -/g;
 
     return $string;
 }
@@ -273,7 +344,8 @@ sub postprocess_algebra {
     # int( ... dx) -> ...
     $string =~s/\\int\\left\((.+?)d[a-z]\\right\)/$1/gs;
 
-    &Apache::lonnet::logthis($string);
+    # 
+    $string =~s/\\lim\\left\((.+?),(.+?),(.+?)\\right\)/\\lim_{$2\\to $3}$1/gs;
     return $string;
 }
 1;