--- loncom/xml/algebra/AlgParser.pm	2005/02/25 06:42:35	1.12
+++ loncom/xml/algebra/AlgParser.pm	2006/03/13 20:28:53	1.16
@@ -482,6 +482,7 @@ sub tostring {
 # print STDERR Data::Dumper->Dump([@_]);
   my($self) = shift;
   my($type, @args) = @$self;
+
   local $_;
   $_ = $type;
   /binop1/ && do {
@@ -518,9 +519,6 @@ sub tostring {
   };
   /special|varname|numberE?/ && return $args[0];
   /closep/ && do {
-    my(%close) = %AlgParser::close;
-
-
 
     return ($args[0] . $args[1]->tostring() . $close{$args[0]});
   };
@@ -529,6 +527,7 @@ sub tostring {
 sub tolatex {
   my($self) = shift;
   my($type, @args) = @$self;
+
   local $_;
   $_ = $type;
   /binop1/ && do {
@@ -547,35 +546,21 @@ sub tolatex {
     return ($args[0] . $p1 . $args[1]->tolatex() . $p2);
   };
   /binop2/ && do {
-    my ($p1, $p2, $p3, $p4) = ('','','','');
-    if ($args[0] =~ /implicit/) {
-      if ( (($args[1]->head eq qq(number)) &&
-            ($args[2]->head eq qq(number))) ||
-           (($args[1]->head eq qq(binop2)) &&
-            ($args[1]->[2]->head eq qq(number))) ) {
-        $args[0] = '\\,';
-      } else {
-        $args[0] = ' ';
-      }
-    }
-    if ($args[1]->[0] =~ /binop1|numberE/)
-      {($p1,$p2)=qw{ \left( \right) };}
- #   if ($args[2]->[0] =~ /binop[12]|numberE/)
-	if ($args[2]->[0] =~ /binop[12]|numberE|unop1/)
-      {($p3,$p4)=qw{ \left( \right) };}
+    my ($lop,$rop) = ($args[1]->tolatex,$args[2]->tolatex);
     if ($args[0] eq '/'){
-#	return('\frac{' . $p1 . $args[1]->tolatex() . $p2 . '}'.
-#               '{' . $p3 . $args[2]->tolatex() . $p4 . '}' );
-	return('\frac{' . $args[1]->tolatex() . '}'.
-               '{' . $args[2]->tolatex() . '}' ); 
+	return('\frac{'.$lop.'}{'.$rop.'}');
     }
-    elsif ($args[0] eq '*'){
-	return($args[1]->tolatex() . '\cdot ' . $args[2]->tolatex() ); 
+    my $op = $args[0];
+    if ($args[0] eq '*'){
+	$op = '\cdot ';
     }
-    else{
-    return ($p1 . $args[1]->tolatex() . $p2 . $args[0] . $p3 .
-            $args[2]->tolatex() . $p4);
+    $lop = '\left('.$lop.'\right)' if ($args[1]->[0] =~ /binop1|numberE/);
+    $rop = '\left('.$rop.'\right)' if ($args[2]->[0] =~ /binop[12]|numberE|unop1/);
+    if ($args[0] =~ /implicit/) {
+	$op = ($lop =~ m/[.0-9]$/ && $rop =~ m/^[-+.0-9]/) ? '\cdot ' : ' ';
     }
+    return ($lop.$op.$rop);
+
   };
   /binop3/ && do {
     my ($p1, $p2, $p3, $p4)=('','','','');
@@ -588,7 +573,7 @@ sub tolatex {
   };
   /func1/ && do {
       my($p1,$p2);
-      if($args[0] eq "sqrt"){($p1,$p2)=qw{ \left{ \right} };}
+      if($args[0] eq "sqrt"){($p1,$p2)=('{','}');}
       else {($p1,$p2)=qw{ \left( \right) };}
 
       #
@@ -640,7 +625,7 @@ sub tolatex {
   /closep/ && do {
     my($backslash) = '';
     if ($args[0] eq '{') {$backslash = '\\';}
-#This is for editors to match: }
+#This is for editors to match: }     
     return ('\left' . $backslash . $args[0] . $args[1]->tolatex() .
             '\right' . $backslash . $close{$args[0]});
   };