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

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

version 1.35, 2004/03/09 15:53:18 version 1.36, 2004/03/19 17:54:17
Line 85  sub header { Line 85  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 { 
    $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*//;
       $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').']';
Line 92  sub converted { Line 124  sub converted {
  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; };  
  local $SIG{ALRM}=sub {   
     $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*//;  
  $xmlstring=~s/\s*$//;  
  alarm(0);  
     }  
 ENDCONV  ENDCONV
     if ($@) {      if ($@) {
  $errorstring.=&mt("Evaluation Error: ").$@;   $errorstring.=&mt("Evaluation Error: ").$@;
Removed from v.1.35  
changed lines
  Added in v.1.36

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