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

Diff for /loncom/xml/lontexconvert.pm between versions 1.46 and 1.55

version 1.46, 2005/02/24 05:26:00 version 1.55, 2005/02/24 09:54:01
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);      $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($string);   $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 237  sub algebra { Line 239  sub algebra {
 sub prepare_algebra {  sub prepare_algebra {
     my ($string)=@_;      my ($string)=@_;
   
     #protect the confusable greek symbols      # makes the decision about what is a minus sign easier supposedly
     $string =~ s/delta/zdelta/g;      $string =~ s/([\=\>\<\%\!\#] *)-/$1 zeroplace -/g;
     $string =~ s/beta/bita/g;  
     $string =~ s/theta/thita/g;  
     $string =~ s/zeta/zita/g;  
     $string =~ s/eta/xeta/g;  
     $string =~ s/epsilon/zepslon/g;  
     $string =~ s/upsilon/zupslon/g;  
     
     return $string;      return $string;
 }  }
   
 sub postprocess_algebra {  sub postprocess_algebra {
     my ($string)=@_;      my ($string)=@_;
       
       # moodle had these and I don't know why, ignoring them for now
       # $string =~s/\\fun/ /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;
   
     # replace some special symbols with the LaTeX equivalents      # int( ... dx) -> ...
     $string =~ s/infty/\\infty/g;      $string =~s/\\int\\left\((.+?)d[a-z]\\right\)/$1/gs;
     $string =~ s/infinity/\\infty/g;  
     $string =~ s/alpha/\\alpha/g;    
     $string =~ s/gamma/\\gamma/g;   
     $string =~ s/iota/\\iota/g;  
     $string =~ s/kappa/\\kappa/g;  
     $string =~ s/lambda/\\lambda/g;  
     $string =~ s/mu/\\mu/g;  
     $string =~ s/nu/\\nu/g;  
     $string =~ s/xi/\\xi/g;  
     $string =~ s/rho/\\rho/g;  
     $string =~ s/sigma/\\sigma/g;  
     $string =~ s/tau/\\tau/g;  
     $string =~ s/phi/\\phi/g;  
     $string =~ s/chi/\\chi/g;  
     $string =~ s/psi/\\psi/g;  
     $string =~ s/omega/\\omega/g;  
     $string =~ s/zdelta/\\delta/g;  
     $string =~ s/bita/\\beta/g;  
     $string =~ s/thita/\\theta/g;  
     $string =~ s/zita/\\zeta/g;  
     $string =~ s/xeta/\\eta/g;  
     $string =~ s/zepslon/\\epsilon/g;  
     $string =~ s/zupslon/\\upsilon/g;  
   
       &Apache::lonnet::logthis($string);
     return $string;      return $string;
 }  }
 1;  1;
Removed from v.1.46  
changed lines
  Added in v.1.55

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