--- loncom/xml/lontexconvert.pm	2005/02/11 16:46:38	1.43
+++ 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.43 2005/02/11 16:46:38 www Exp $
+# $Id: lontexconvert.pm,v 1.51 2005/02/24 09:28:54 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -212,6 +212,55 @@ 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->normalize();
+	my $latex=$parser->tolatex();
+	$latex=&postprocess_algebra($latex);
+	$latex='$'.$latex.'$';
+	if ($target eq 'web' || $target eq 'analyze') {
+	    $result = &converted(\$latex);
+	} else {
+	    $result = $latex;
+	}
+    } else {
+	&Apache::lonxml::error($parser->{'htmlerror'});
+    }
+}
+
+sub prepare_algebra {
+    my ($string)=@_;
+
+    # 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;
+
+    &Apache::lonnet::logthis($string);
+    return $string;
+}
 1;
 __END__