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

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

version 1.57, 2005/02/24 10:07:47 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 215  sub msgtexconverted { Line 238  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 248  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 {
       # 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 275  sub postprocess_algebra { Line 303  sub postprocess_algebra {
   
     #       # 
     $string =~s/\\lim\\left\((.+?),(.+?),(.+?)\\right\)/\\lim_{$2\\to $3}$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.57  
changed lines
  Added in v.1.61

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