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

version 1.36, 2004/03/19 17:54:17 version 1.42, 2005/02/09 15:45:19
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 95  sub convert_real { Line 95  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 112  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);
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 188  sub smiley { Line 191  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.36  
changed lines
  Added in v.1.42


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