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

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

version 1.40, 2004/10/12 22:55:22 version 1.51, 2005/02/24 09:28:54
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 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 213  sub msgtexconverted { Line 212  sub msgtexconverted {
     }      }
 }  }
   
   sub algebra {
       use AlgParser;
   
       my ($string,$target)=@_;
       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);
    $latex='$'.$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;
       
       # sqrt(3,4) means the 4 root of 3
       $string =~s/\\sqrt{([^,]+),([^}]+)}/\\sqrt[$2]{$1}/gs;
   
       &Apache::lonnet::logthis($string);
       return $string;
   }
 1;  1;
 __END__  __END__
   
Removed from v.1.40  
changed lines
  Added in v.1.51

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