--- loncom/xml/lontexconvert.pm	2005/02/24 05:26:00	1.46
+++ loncom/xml/lontexconvert.pm	2005/02/24 09:28:54	1.51
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # TeX Conversion Module
 #
-# $Id: lontexconvert.pm,v 1.46 2005/02/24 05:26:00 albertel Exp $
+# $Id: lontexconvert.pm,v 1.51 2005/02/24 09:28:54 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -213,16 +213,18 @@ sub msgtexconverted {
 }
 
 sub algebra {
+    use AlgParser;
+
     my ($string,$target)=@_;
     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($string);
+	$latex=&postprocess_algebra($latex);
 	$latex='$'.$latex.'$';
 	if ($target eq 'web' || $target eq 'analyze') {
 	    $result = &converted(\$latex);
@@ -237,47 +239,26 @@ sub algebra {
 sub prepare_algebra {
     my ($string)=@_;
 
-    #protect the confusable greek symbols
-    $string =~ s/delta/zdelta/g;
-    $string =~ s/beta/bita/g;
-    $string =~ s/theta/thita/g;
-    $string =~ s/zeta/zita/g;
-    $string =~ s/eta/xeta/g;
-    $string =~ s/epsilon/zepslon/g;
-    $string =~ s/upsilon/zupslon/g;
-  
+    # makes the decision about what is a minus sign easier supposedly
+    $string =~ s/([\=\>\<\%\!\#] *)-/$1 zeroplace -/g;
+
     return $string;
 }
 
 sub postprocess_algebra {
     my ($string)=@_;
+    
+    # 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;
+    
+    # sqrt(3,4) means the 4 root of 3
+    $string =~s/\\sqrt{([^,]+),([^}]+)}/\\sqrt[$2]{$1}/gs;
 
-    # replace some special symbols with the LaTeX equivalents
-    $string =~ s/infty/\\infty/g;
-    $string =~ s/infinity/\\infty/g;
-    $string =~ s/alpha/\\alpha/g;  
-    $string =~ s/gamma/\\gamma/g; 
-    $string =~ s/iota/\\iota/g;
-    $string =~ s/kappa/\\kappa/g;
-    $string =~ s/lambda/\\lambda/g;
-    $string =~ s/mu/\\mu/g;
-    $string =~ s/nu/\\nu/g;
-    $string =~ s/xi/\\xi/g;
-    $string =~ s/rho/\\rho/g;
-    $string =~ s/sigma/\\sigma/g;
-    $string =~ s/tau/\\tau/g;
-    $string =~ s/phi/\\phi/g;
-    $string =~ s/chi/\\chi/g;
-    $string =~ s/psi/\\psi/g;
-    $string =~ s/omega/\\omega/g;
-    $string =~ s/zdelta/\\delta/g;
-    $string =~ s/bita/\\beta/g;
-    $string =~ s/thita/\\theta/g;
-    $string =~ s/zita/\\zeta/g;
-    $string =~ s/xeta/\\eta/g;
-    $string =~ s/zepslon/\\epsilon/g;
-    $string =~ s/zupslon/\\upsilon/g;
-
+    &Apache::lonnet::logthis($string);
     return $string;
 }
 1;