--- loncom/xml/lontexconvert.pm	2005/02/24 09:54:01	1.55
+++ loncom/xml/lontexconvert.pm	2005/02/24 10:09:32	1.58
@@ -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.58 2005/02/24 10:09:32 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -215,7 +215,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 +225,11 @@ sub algebra {
 	$parser->normalize();
 	my $latex=$parser->tolatex();
 	$latex=&postprocess_algebra($latex);
-	$latex='$'.$latex.'$';
+	if ($style eq 'display') {
+	    $latex='$$'.$latex.'$$x';
+	} else {
+	    $latex='\\ensuremath{'.$latex.'}';
+	}
 	if ($target eq 'web' || $target eq 'analyze') {
 	    $result = &converted(\$latex);
 	} else {
@@ -240,7 +244,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,6 +277,8 @@ sub postprocess_algebra {
     # int( ... dx) -> ...
     $string =~s/\\int\\left\((.+?)d[a-z]\\right\)/$1/gs;
 
+    # 
+    $string =~s/\\lim\\left\((.+?),(.+?),(.+?)\\right\)/\\lim_{$2\\to $3}$1/gs;
     &Apache::lonnet::logthis($string);
     return $string;
 }