--- loncom/xml/algebra/AlgParser.pm	2005/02/24 08:27:17	1.5
+++ loncom/xml/algebra/AlgParser.pm	2006/03/13 20:28:53	1.16
@@ -39,11 +39,11 @@ $close{'('} = ')';
 
 my $binoper3 = '(?:\\^|\\*\\*)';
 my $binoper2 = '[/*_,]';
-my $binoper1 = '[-+=><%!#]';
+my $binoper1 = '(?:<>|<=|>=|[-+=><%!])';
 my $openparen = '[{(\\[]';
 my $closeparen = '[})\\]]';
 my $varname = '[A-Za-z](?:_[0-9]+)?';
-my $greek='alpha|bita|gamma|zita|thita|iota|kappa|lambda|mu|nu|xi|rho|sigma|tau|phi|chi|psi|omega|zepslon|zdelta|xeta|zupslon|pi';
+my $greek='alpha|(?:(?:(?:var)?(?:[tT]h))|(?:[bz])?)eta|[gG]amma|iota|kappa|[lL]ambda|mu|nu|[xX]i|(?:var)?rho|(?:var)?[sS]igma|tau|(?:var)?(?:[pP])hi|chi|[oO]mega|(?:(?:var)?(?:[eE])|(?:[uU]))psilon|[dD]elta|[pP]si|(?:var)?[pP]i';
 my $delete='zeroplace';
 my $escape='infty';
 my $specialvalue = '(?:'.$escape.'|'.$greek.'|'.$delete.'|d[a-z]|e)';
@@ -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,12 +527,17 @@ sub tostring {
 sub tolatex {
   my($self) = shift;
   my($type, @args) = @$self;
+
   local $_;
   $_ = $type;
   /binop1/ && do {
     my ($p1, $p2) = ('','');
     if ($args[2]->[0] eq 'binop1') {($p1,$p2)=qw{ \left( \right) };}
-    return ($args[1]->tolatex() . $args[0] . $p1 .
+    my $cmd=$args[0];
+    if    ($args[0] eq '<>') { $cmd='\\not= '; }
+    elsif ($args[0] eq '<=') { $cmd='\\leq ';  }
+    elsif ($args[0] eq '>=') { $cmd='\\geq ';  }
+    return ($args[1]->tolatex() . $cmd . $p1 .
             $args[2]->tolatex() . $p2);
   };
   /unop1/ && do {
@@ -543,37 +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('\frac{' . $p1 . $args[1]->tolatex() . $p2 . '}'.
-#               '{' . $p3 . $args[2]->tolatex() . $p4 . '}' );
-	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)=('','','','');
@@ -586,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) };}
 
       #
@@ -594,20 +581,41 @@ sub tolatex {
       #       added missing trig functions
       #
       #$specialfunc = '(?:abs|logten|asin|acos|atan|sech|sgn|step|fact)';
-      my $specialfunc = '(?:abs|logten|a(?:sin|cos|tan|sec|csc|cot)h?|sgn|step|fact)';
+      my $specialfunc = '(?:(logten)|a(sin|cos|tan|sec|csc|cot)(h)?|sgn|step|fact|(abs))';
       #
       #  End DPVC
       #
 
       if ($args[0] =~ /$specialfunc/) {
-         return ('\mbox{' . $args[0] .'}'. $p1 . $args[1]->tolatex() . $p2);
+	  if (defined($1)) {
+	      return ('\log_{10}'. $p1 . $args[1]->tolatex() . $p2);
+	  }
+	  elsif (defined($2)) {
+	      if (defined($3) && ($2 eq 'sec' || $2 eq 'csc' || $2 eq 'cot')) {
+		  return ('\mathrm{' . $2.$3 .'}^{-1}'. $p1 . $args[1]->tolatex() . $p2);
+	      } else {
+		  return ('\\' . $2.$3 .'^{-1}'. $p1 . $args[1]->tolatex() . $p2);
+	      }
+	  }
+	  elsif (defined($4)) {
+	      return ('|' . $args[1]->tolatex() . '|');
+	  }
+	  else {
+	      return ('\mbox{' . $args[0] .'}'. $p1 . $args[1]->tolatex() . $p2);
+	  }
       }
       else {
-        return ('\\' . $args[0] . $p1 . $args[1]->tolatex() . $p2);
+	  if ($args[0] =~/(sec|csc|cot)h/) {
+	      return ('\mathrm{' . $args[0] . '}' . $p1 . $args[1]->tolatex() . $p2);
+	  } else {
+	      return ('\\' . $args[0] . $p1 . $args[1]->tolatex() . $p2);
+	  }
       }
   };
   /special/ && do {
-    if ($args[0] eq 'pi') {return '\pi';} else {return $args[0];}
+      if    ($args[0] =~/($greek|$escape)/) {return '\\'.$1;}
+      elsif ($args[0] =~/$delete/) {return '';}
+      else { return $args[0]; }
   };
   /varname|(:?number$)/ && return $args[0];
   /numberE/ && do {
@@ -616,9 +624,8 @@ sub tolatex {
   };
   /closep/ && do {
     my($backslash) = '';
-    my(%close) = %AlgParser::close;
     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]});
   };