Diff for /loncom/xml/lontexconvert.pm between versions 1.38 and 1.45

version 1.38, 2004/07/22 23:18:00 version 1.45, 2005/02/24 01:25:05
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 112  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);
Line 190  sub smiley { Line 189  sub smiley {
 }  }
   
 sub msgtexconverted {  sub msgtexconverted {
     my ($message,$email,$priorversions) = @_;      my ($message,$email) = @_;
     $errorstring='';      $errorstring='';
     &init_tth();      &init_tth();
     my $outmessage='';      my $outmessage='';
     my $tex=0;      my $tex=0;
     if ($priorversions > 0) {  
         if ($message =~ /::::\d+::::(.+)$/) {  
             $message = $1;  
         }  
     }  
     foreach (split(/(?:\&lt\;|\<)\/*m\s*(?:\&gt\;|\>)/i,$message)) {      foreach (split(/(?:\&lt\;|\<)\/*m\s*(?:\&gt\;|\>)/i,$message)) {
  if ($tex) {   if ($tex) {
     if ($email) {      if ($email) {
Line 218  sub msgtexconverted { Line 212  sub msgtexconverted {
     }      }
 }  }
   
   sub algebra {
       my ($string,$target)=@_;
       my $parser = new AlgParserWithImplicitExpand;
       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='$'.$latex.'$';
    if ($target eq 'web' || $target eq 'analyze') {
       $result = &converted(\$latex);
    } else {
       $result = $latex;
    }
       } else {
    &Apache::lonxml::error($parser->{'htmlerror'});
       }
   }
   
 1;  1;
 __END__  __END__
   

Removed from v.1.38  
changed lines
  Added in v.1.45


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