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

Diff for /loncom/xml/lontexconvert.pm between versions 1.48 and 1.61

version 1.48, 2005/02/24 05:40:08 version 1.61, 2005/02/27 17:28:56
Line 117  sub convert_real { Line 117  sub convert_real {
     return ($xmlstring,$errorstring);      return ($xmlstring,$errorstring);
 }  }
   
 sub converted {  sub tth_converted {
     my $texstring=shift;      my $texstring=shift;
     my $xmlstring='['.&mt('UNDISPLAYABLE').']';      my $xmlstring='['.&mt('UNDISPLAYABLE').']';
     if ($Apache::lontexconvert::messedup) {      if ($Apache::lontexconvert::messedup) {
  return '['.&mt('TeX unconverted due to previous errors').']';   return '['.&mt('TeX unconverted due to previous errors').']';
     }      }
       $$texstring ='\\documentstyle{article}'.$$texstring;
   
     eval(<<'ENDCONV');      eval(<<'ENDCONV');
     ($xmlstring,$errorstring)=&convert_real($texstring)      ($xmlstring,$errorstring)=&convert_real($texstring)
 ENDCONV  ENDCONV
Line 140  ENDCONV Line 142  ENDCONV
     return $xmlstring;      return $xmlstring;
 }  }
   
   sub jsMath_converted {
       my $texstring=shift;
       my $tag='span';
       if ($$texstring=~/[^\\]\$\$/) {
    #has a $$ in it, guessinng it's display mode
    $tag='div';
       }
       $$texstring=~s/(?!\\)\$//g;
       $$texstring=~s/\\ensuremath//g;
       return '<'.$tag.' class="math">'.$$texstring.'</'.$tag.'>';
   }
   
   sub converted {
       if ($ENV{'environment.texengine'} eq 'tth') {
    return &tth_converted;
       } elsif ($ENV{'environment.texengine'} eq 'jsMath') {
    return &jsMath_converted;
       }
       return &tth_converted;
   }
   
 # ====================================================================== Footer  # ====================================================================== Footer
   
 sub footer {  sub footer {
Line 213  sub msgtexconverted { Line 236  sub msgtexconverted {
 }  }
   
 sub algebra {  sub algebra {
     my ($string,$target)=@_;      use AlgParser;
   
       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);
     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.'$';   if ($style eq 'display') {
       $latex='$$'.$latex.'$$x';
    } else {
       # style is 'inline'
       $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 237  sub algebra { Line 267  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/(\<\>|\<\=|\>\=[\=\>\<] *)-/$1 zeroplace -/g;
     $string =~ s/<\=/\%/g;  
     $string =~ s/>\=/\!/g;  
       
     # makes the decision about what is a minus sign easier  
     $string =~ s/([\=\>\<\%\!\#] *)-/$1 zeroplace -/g;  
   
     # protect the confusable greek symbols  
     $string =~ s/delta/zdelta/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)=@_;
           
     # remove the chunk used to sepearate out the minus signs      # moodle had these and I don't know why, ignoring them for now
     $string =~ s/zeroplace//g;      # $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;
   
     # exapnd out some operators      # int( ... dx) -> ...
     $string =~ s/\#/\\not= /g;      $string =~s/\\int\\left\((.+?)d[a-z]\\right\)/$1/gs;
     $string =~ s/\%/\\leq /g;  
     $string =~ s/\!/\\geq /g;  
   
     # replace some special symbols with the LaTeX equivalents  
     $string =~ s/infty/\\infty/g;  
     $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;  
   
       # 
       $string =~s/\\lim\\left\((.+?),(.+?),(.+?)\\right\)/\\lim_{$2\\to $3}$1/gs;
     return $string;      return $string;
 }  }
 1;  1;
Removed from v.1.48  
changed lines
  Added in v.1.61

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