--- loncom/xml/lontexconvert.pm	2005/02/24 08:32:11	1.49
+++ 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.49 2005/02/24 08:32:11 albertel Exp $
+# $Id: lontexconvert.pm,v 1.58 2005/02/24 10:09:32 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -215,17 +215,21 @@ 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);
     my $result='['.&mt('Algebra unconverted due to previous errors').']';
     if ( ref($ret) ) {
-	$parser->tostring();
+	#$parser->tostring();
 	$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 {
@@ -239,13 +243,8 @@ sub algebra {
 sub prepare_algebra {
     my ($string)=@_;
 
-    # change some multi character operators into single character operators
-    $string =~ s/<>/\#/g;
-    $string =~ s/<\=/\%/g;
-    $string =~ s/>\=/\!/g;
-    
-    # makes the decision about what is a minus sign easier
-    $string =~ s/([\=\>\<\%\!\#] *)-/$1 zeroplace -/g;
+    # makes the decision about what is a minus sign easier supposedly
+    $string =~ s/(\<\>|\<\=|\>\=[\=\>\<] *)-/$1 zeroplace -/g;
 
     return $string;
 }
@@ -253,11 +252,34 @@ sub prepare_algebra {
 sub postprocess_algebra {
     my ($string)=@_;
     
-    # exapnd out some operators
-    $string =~ s/\#/\\not= /g;
-    $string =~ s/\%/\\leq /g;
-    $string =~ s/\!/\\geq /g;
+    # 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;
+    
+    # sqrt(3,4) means the 4 root of 3
+    $string =~s/\\sqrt{([^,]+),([^\}]+)}/\\sqrt[$2]{$1}/gs;
+
+    # log(3,4) means the log base 4 of 3
+    $string =~s/\\log\\left\((.+?),(.+?)\\right\)/\\log_{$2}\\left($1\\right)/gs;
+
+    # log(3,4) means the log base 4 of 3
+    $string =~s/\\((?:sin|cos|tan|sec|csc|cot)(?:h)?)\\left\((.+?),(.+?)\\right\)/\\$1^{$3}\\left($2\\right)/gs;
+
+    # int(3,a,b) integral from a to b of 3
+    $string =~s/\\int\\left\((.+?),(.+?),(.+?)\\right\)/\\int_{$2}^{$3}\\left($1\\right)/gs;
+
+    # 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;
 }
 1;