Diff for /loncom/xml/lontexconvert.pm between versions 1.36 and 1.59

version 1.36, 2004/03/19 17:54:17 version 1.59, 2005/02/25 05:54:01
Line 36 Line 36
 # The C source of the Code may not be distributed by the Licensee  # The C source of the Code may not be distributed by the Licensee
 # to any other parties under any circumstances.  # to any other parties under any circumstances.
 #  #
 # 05/29/00,05/30,10/11,10/20 Gerd Kortemeyer  
 # 5/4 Gerd Kortemeyer  
   
 package Apache::lontexconvert;  package Apache::lontexconvert;
   
Line 76  sub header { Line 74  sub header {
     my $time=time;      my $time=time;
     &init_tth();      &init_tth();
     return &Apache::lonxml::xmlbegin().      return &Apache::lonxml::xmlbegin().
  &Apache::lonxml::fontsettings().  
  "\n<head>\n".   "\n<head>\n".
    &Apache::lonxml::fontsettings().
  &Apache::lonmenu::registerurl(undef,'tex').   &Apache::lonmenu::registerurl(undef,'tex').
  "\n</head>\n";   "\n</head>\n";
 }  }
Line 95  sub convert_real { Line 93  sub convert_real {
     my ($xmlstring,$errorstring);      my ($xmlstring,$errorstring);
     local $SIG{SEGV}=sub { $Apache::lontexconvert::messedup=1; die; };      local $SIG{SEGV}=sub { $Apache::lontexconvert::messedup=1; die; };
     local $SIG{ALRM}=sub {       local $SIG{ALRM}=sub { 
    &Apache::lonnet::logthis("ALRM");
  $xmlstring='['.&mt("TeX unconverted due to errors").']';   $xmlstring='['.&mt("TeX unconverted due to errors").']';
  $Apache::lontexconvert::messedup=1;   $Apache::lontexconvert::messedup=1;
  die &mt("TeX unconverted due to errors");   die &mt("TeX unconverted due to errors");
Line 111  sub convert_real { Line 110  sub convert_real {
  $errorstring.=&tth::ttherror();   $errorstring.=&tth::ttherror();
  $xmlstring=~s-</font(\s*)>-</font>-g;   $xmlstring=~s-</font(\s*)>-</font>-g;
     }      }
       $xmlstring=~s/^\s*\<br clear\=\"all\"/\<br/s;
     $xmlstring=~s/^\s*//;      $xmlstring=~s/^\s*//;
     $xmlstring=~s/\s*$//;      $xmlstring=~s/\s*$//;
     alarm(0);      alarm(0);
     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 130  ENDCONV Line 132  ENDCONV
  $errorstring.=&mt("Evaluation Error: ").$@;   $errorstring.=&mt("Evaluation Error: ").$@;
  $Apache::lontexconvert::messedup=1;   $Apache::lontexconvert::messedup=1;
     }      }
     if ($Apache::lontexconvert::messedup || &tth::tthmessedup()) {      if ($Apache::lontexconvert::messedup || &tth::tthmessedup() || 
    $errorstring) {
  &Apache::lonnet::logthis("Trying to kill myself");   &Apache::lonnet::logthis("Trying to kill myself");
  $Apache::lontexconvert::messedup=1;   $Apache::lontexconvert::messedup=1;
  my $request=Apache->request();   my $request=Apache->request();
Line 139  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';
       }
       &Apache::lonnet::logthis($$texstring);
       $$texstring=~s/(?!\\)\$//g;
       $$texstring=~s/\\ensuremath//g
       &Apache::lonnet::logthis($$texstring);
       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 188  sub smiley { Line 214  sub smiley {
 }  }
   
 sub msgtexconverted {  sub msgtexconverted {
     my $message=shift;      my ($message,$email) = @_;
     my $email=shift;  
     $errorstring='';      $errorstring='';
     &init_tth();      &init_tth();
     my $outmessage='';      my $outmessage='';
Line 212  sub msgtexconverted { Line 237  sub msgtexconverted {
     }      }
 }  }
   
   sub algebra {
       use AlgParser;
   
       my ($string,$target,$style)=@_;
       my $parser = new AlgParserWithImplicitExpand;
       $string=&prepare_algebra($string);
       my $ret = $parser->parse($string);
       my $result='['.&mt('Algebra unconverted due to previous errors').']';
       if ( ref($ret) ) {
    #$parser->tostring();
    $parser->normalize();
    my $latex=$parser->tolatex();
    $latex=&postprocess_algebra($latex);
    if ($style eq 'display') {
       $latex='$$'.$latex.'$$x';
    } else {
       $latex='\\ensuremath{'.$latex.'}';
    }
    if ($target eq 'web' || $target eq 'analyze') {
       $result = &converted(\$latex);
    } else {
       $result = $latex;
    }
       } else {
    &Apache::lonxml::error($parser->{'htmlerror'});
       }
   }
   
   sub prepare_algebra {
       my ($string)=@_;
   
       # makes the decision about what is a minus sign easier supposedly
       $string =~ s/(\<\>|\<\=|\>\=[\=\>\<] *)-/$1 zeroplace -/g;
   
       return $string;
   }
   
   sub postprocess_algebra {
       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;
   
       # 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;
   }
 1;  1;
 __END__  __END__
   

Removed from v.1.36  
changed lines
  Added in v.1.59


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