[BACK]Return to lontexconvert.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / xml

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

version 1.49, 2005/02/24 08:32:11 version 1.56, 2005/02/24 09:58:31
Line 221  sub algebra { Line 221  sub algebra {
     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=&postprocess_algebra($latex);
Line 239  sub algebra { Line 239  sub algebra {
 sub prepare_algebra {  sub prepare_algebra {
     my ($string)=@_;      my ($string)=@_;
   
     # change some multi character operators into single character operators      # makes the decision about what is a minus sign easier supposedly
     $string =~ s/<>/\#/g;  
     $string =~ s/<\=/\%/g;  
     $string =~ s/>\=/\!/g;  
       
     # makes the decision about what is a minus sign easier  
     $string =~ s/([\=\>\<\%\!\#] *)-/$1 zeroplace -/g;      $string =~ s/([\=\>\<\%\!\#] *)-/$1 zeroplace -/g;
   
     return $string;      return $string;
Line 253  sub prepare_algebra { Line 248  sub prepare_algebra {
 sub postprocess_algebra {  sub postprocess_algebra {
     my ($string)=@_;      my ($string)=@_;
           
     # exapnd out some operators      # moodle had these and I don't know why, ignoring them for now
     $string =~ s/\#/\\not= /g;      # $string =~s/\\fun/ /g;
     $string =~ s/\%/\\leq /g;  
     $string =~ s/\!/\\geq /g;      # sqrt(3,4) -> \sqrt\let{3,4\right}, which is annoying
       $string =~s/\\left\{/\{/g;
       $string =~s/\\right\}/\}/g;
   
       # remove the extra () in the denominator of a \frac
       $string =~s/\\frac{(.+?)}{\\left\((.+?)\\right\)}/\\frac{$1}{$2}/gs;
       
       # sqrt(3,4) means the 4 root of 3
       $string =~s/\\sqrt{([^,]+),([^\}]+)}/\\sqrt[$2]{$1}/gs;
   
       # log(3,4) means the log base 4 of 3
       $string =~s/\\log\\left\((.+?),(.+?)\\right\)/\\log_{$2}\\left($1\\right)/gs;
   
       # log(3,4) means the log base 4 of 3
       $string =~s/\\((?:sin|cos|tan|sec|csc|cot)(?:h)?)\\left\((.+?),(.+?)\\right\)/\\$1^{$3}\\left($2\\right)/gs;
   
       # int(3,a,b) integral from a to b of 3
       $string =~s/\\int\\left\((.+?),(.+?),(.+?)\\right\)/\\int_{$2}^{$3}\\left($1\\right)/gs;
   
       # int( ... dx) -> ...
       $string =~s/\\int\\left\((.+?)d[a-z]\\right\)/$1/gs;
   
       # 
       $string =~s/\\lim\\left\((.+?),(.+?),(.+?)\\right\)/\\lim_{$2\\to $3}$1/gs;
       &Apache::lonnet::logthis($string);
     return $string;      return $string;
 }  }
 1;  1;
Removed from v.1.49  
changed lines
  Added in v.1.56

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