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

Diff for /loncom/xml/lontexconvert.pm between versions 1.51 and 1.58

version 1.51, 2005/02/24 09:28:54 version 1.58, 2005/02/24 10:09:32
Line 215  sub msgtexconverted { Line 215  sub msgtexconverted {
 sub algebra {  sub algebra {
     use AlgParser;      use AlgParser;
   
     my ($string,$target)=@_;      my ($string,$target,$style)=@_;
     my $parser = new AlgParserWithImplicitExpand;      my $parser = new AlgParserWithImplicitExpand;
     $string=&prepare_algebra($string);      $string=&prepare_algebra($string);
     my $ret = $parser->parse($string);      my $ret = $parser->parse($string);
Line 225  sub algebra { Line 225  sub algebra {
  $parser->normalize();   $parser->normalize();
  my $latex=$parser->tolatex();   my $latex=$parser->tolatex();
  $latex=&postprocess_algebra($latex);   $latex=&postprocess_algebra($latex);
  $latex='$'.$latex.'$';   if ($style eq 'display') {
       $latex='$$'.$latex.'$$x';
    } else {
       $latex='\\ensuremath{'.$latex.'}';
    }
  if ($target eq 'web' || $target eq 'analyze') {   if ($target eq 'web' || $target eq 'analyze') {
     $result = &converted(\$latex);      $result = &converted(\$latex);
  } else {   } else {
Line 240  sub prepare_algebra { Line 244  sub prepare_algebra {
     my ($string)=@_;      my ($string)=@_;
   
     # makes the decision about what is a minus sign easier supposedly      # makes the decision about what is a minus sign easier supposedly
     $string =~ s/([\=\>\<\%\!\#] *)-/$1 zeroplace -/g;      $string =~ s/(\<\>|\<\=|\>\=[\=\>\<] *)-/$1 zeroplace -/g;
   
     return $string;      return $string;
 }  }
Line 254  sub postprocess_algebra { Line 258  sub postprocess_algebra {
     # sqrt(3,4) -> \sqrt\let{3,4\right}, which is annoying      # sqrt(3,4) -> \sqrt\let{3,4\right}, which is annoying
     $string =~s/\\left\{/\{/g;      $string =~s/\\left\{/\{/g;
     $string =~s/\\right\}/\}/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      # sqrt(3,4) means the 4 root of 3
     $string =~s/\\sqrt{([^,]+),([^}]+)}/\\sqrt[$2]{$1}/gs;      $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);      &Apache::lonnet::logthis($string);
     return $string;      return $string;
 }  }
Removed from v.1.51  
changed lines
  Added in v.1.58

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