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

version 1.33, 2004/03/04 15:46:43 version 1.58, 2005/02/24 10:09:32
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 85  sub header { Line 83  sub header {
 # ================================================================== Conversion  # ================================================================== Conversion
   
 $Apache::lontexconvert::messedup=0;  $Apache::lontexconvert::messedup=0;
   
   # we need this routine because &converted can get called from inside
   # of the safespace (through &xmlparse('<m>stuff</m>') which doesn't
   # allow the opcode for alarm, so we need to compile this before we get
   # into the safe space since opcode checks only occur at compile time
   sub convert_real {
       my ($texstring)=@_;
       my ($xmlstring,$errorstring);
       local $SIG{SEGV}=sub { $Apache::lontexconvert::messedup=1; die; };
       local $SIG{ALRM}=sub { 
    &Apache::lonnet::logthis("ALRM");
    $xmlstring='['.&mt("TeX unconverted due to errors").']';
    $Apache::lontexconvert::messedup=1;
    die &mt("TeX unconverted due to errors");
       };
       alarm($Apache::lonnet::perlvar{'lonScriptTimeout'});
       if ($ENV{'browser.mathml'}) {
    $xmlstring=&tth::ttm($$texstring);
    $xmlstring=~s/\<math\>/\<math xmlns=\"\&mathns\;\"\>/g;
    $xmlstring=~s/\<br\>/\<br\/\>/g;
    $xmlstring=~s/\<p\>/\<p\>\<\/p\>/g;
    $errorstring.=&tth::ttmerror();
       } else {
    $xmlstring=&tth::tth($$texstring);
    $errorstring.=&tth::ttherror();
    $xmlstring=~s-</font(\s*)>-</font>-g;
       }
       $xmlstring=~s/^\s*\<br clear\=\"all\"/\<br/s;
       $xmlstring=~s/^\s*//;
       $xmlstring=~s/\s*$//;
       alarm(0);
       return ($xmlstring,$errorstring);
   }
   
 sub converted {  sub 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').']';
     }      }
     eval(<<'ENDCONV');      eval(<<'ENDCONV');
     {      ($xmlstring,$errorstring)=&convert_real($texstring)
  local $SIG{SEGV}=sub { $Apache::lontexconvert::messedup=1; die; };  
  if ($ENV{'browser.mathml'}) {  
     $xmlstring=&tth::ttm($$texstring);  
     $xmlstring=~s/\<math\>/\<math xmlns=\"\&mathns\;\"\>/g;  
     $xmlstring=~s/\<br\>/\<br\/\>/g;  
     $xmlstring=~s/\<p\>/\<p\>\<\/p\>/g;  
     $errorstring.=&tth::ttmerror();  
  } else {  
     $xmlstring=&tth::tth($$texstring);  
     $errorstring.=&tth::ttherror();  
     $xmlstring=~s-</font(\s*)>-</font>-g;  
  }  
  $xmlstring=~s/^\s*//;  
  $xmlstring=~s/\s*$//;  
     }  
 ENDCONV  ENDCONV
     if ($@) {      if ($@) {
  $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 171  sub smiley { Line 189  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 195  sub msgtexconverted { Line 212  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.33  
changed lines
  Added in v.1.58


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