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

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

version 1.33, 2004/03/04 15:46:43 version 1.40, 2004/10/12 22:55:22
Line 76  sub header { Line 76  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 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 { 
    &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*//;
       $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 190  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='';
Removed from v.1.33  
changed lines
  Added in v.1.40

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