Diff for /loncom/xml/lontexconvert.pm between versions 1.45 and 1.49

version 1.45, 2005/02/24 01:25:05 version 1.49, 2005/02/24 08:32:11
Line 213  sub msgtexconverted { Line 213  sub msgtexconverted {
 }  }
   
 sub algebra {  sub algebra {
       use AlgParser;
   
     my ($string,$target)=@_;      my ($string,$target)=@_;
     my $parser = new AlgParserWithImplicitExpand;      my $parser = new AlgParserWithImplicitExpand;
       $string=&prepare_algebra($string);
     my $ret = $parser->parse($string);      my $ret = $parser->parse($string);
     my $result='['.&mt('Algebra unconverted due to previous errors').']';      my $result='['.&mt('Algebra unconverted due to previous errors').']';
     if ( ref($ret) ) {      if ( ref($ret) ) {
  $parser->tostring();   $parser->tostring();
  $parser->normalize();   $parser->normalize();
  my $latex=$parser->tolatex();   my $latex=$parser->tolatex();
    $latex=&postprocess_algebra($latex);
  $latex='$'.$latex.'$';   $latex='$'.$latex.'$';
  if ($target eq 'web' || $target eq 'analyze') {   if ($target eq 'web' || $target eq 'analyze') {
     $result = &converted(\$latex);      $result = &converted(\$latex);
Line 232  sub algebra { Line 236  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;
   
       return $string;
   }
   
   sub postprocess_algebra {
       my ($string)=@_;
       
       # exapnd out some operators
       $string =~ s/\#/\\not= /g;
       $string =~ s/\%/\\leq /g;
       $string =~ s/\!/\\geq /g;
   
       return $string;
   }
 1;  1;
 __END__  __END__
   

Removed from v.1.45  
changed lines
  Added in v.1.49


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>