Diff for /loncom/xml/lontexconvert.pm between versions 1.54 and 1.79

version 1.54, 2005/02/24 09:48:05 version 1.79, 2006/10/23 18:49:47
Line 42  package Apache::lontexconvert; Line 42  package Apache::lontexconvert;
 use strict;  use strict;
 use tth();  use tth();
 use vars qw($errorstring);  use vars qw($errorstring);
 use Apache();  #use Apache::lonxml();
 use Apache::lonmsg();  
 use Apache::lonxml();  
 use Apache::lonmenu();  
 use Apache::lonlocal;  use Apache::lonlocal;
   use Apache::lonnet;
   use lib '/home/httpd/lib/perl/';
   use LONCAPA;
    
   
 # ====================================================================== Header  # ====================================================================== Header
   
 sub init_tth {  sub init_tth {
     my $options=$ENV{'course.'.$ENV{'request.course.id'}.'.tthoptions'};      my $options=$env{'course.'.$env{'request.course.id'}.'.tthoptions'};
     if ($ENV{'browser.mathml'}) {      if ($options =~ /\S/) {
    $options = ' '.$options;
       } else {
    undef($options);
       }
       if ($env{'browser.mathml'}) {
  &tth::ttminit();   &tth::ttminit();
  if ($ENV{'browser.unicode'}) {   if ($env{'browser.unicode'}) {
     &tth::ttmoptions('-L -u1 '.$options);      &tth::ttmoptions('-L -u1'.$options);
  } else {   } else {
     &tth::ttmoptions('-L -u0 '.$options);      &tth::ttmoptions('-L -u0'.$options);
  }   }
     } else {      } else {
  &tth::tthinit();   &tth::tthinit();
  if ($ENV{'browser.unicode'}) {   if ($env{'browser.unicode'}) {
     &tth::tthoptions('-L -u1 '.$options);      &tth::tthoptions('-L -u1'.$options);
  } else {   } else {
     &tth::tthoptions('-L -u0 '.$options);      &tth::tthoptions('-L -u0'.$options);
  }   }
     }      }
 }  }
   
 sub header {  
     $errorstring='';  
     my $time=time;  
     &init_tth();  
     return &Apache::lonxml::xmlbegin().  
  "\n<head>\n".  
  &Apache::lonxml::fontsettings().  
  &Apache::lonmenu::registerurl(undef,'tex').  
  "\n</head>\n";  
 }  
   
 # ================================================================== Conversion  # ================================================================== Conversion
   
 $Apache::lontexconvert::messedup=0;  $Apache::lontexconvert::messedup=0;
Line 98  sub convert_real { Line 93  sub convert_real {
  $Apache::lontexconvert::messedup=1;   $Apache::lontexconvert::messedup=1;
  die &mt("TeX unconverted due to errors");   die &mt("TeX unconverted due to errors");
     };      };
     alarm($Apache::lonnet::perlvar{'lonScriptTimeout'});      &Apache::lonxml::start_alarm();
     if ($ENV{'browser.mathml'}) {      if ($env{'browser.mathml'}) {
  $xmlstring=&tth::ttm($$texstring);   $xmlstring=&tth::ttm($$texstring);
  $xmlstring=~s/\<math\>/\<math xmlns=\"\&mathns\;\"\>/g;   $xmlstring=~s/\<math\>/\<math xmlns=\"\&mathns\;\"\>/g;
  $xmlstring=~s/\<br\>/\<br\/\>/g;   $xmlstring=~s/\<br\>/\<br\/\>/g;
Line 113  sub convert_real { Line 108  sub convert_real {
     $xmlstring=~s/^\s*\<br clear\=\"all\"/\<br/s;      $xmlstring=~s/^\s*\<br clear\=\"all\"/\<br/s;
     $xmlstring=~s/^\s*//;      $xmlstring=~s/^\s*//;
     $xmlstring=~s/\s*$//;      $xmlstring=~s/\s*$//;
     alarm(0);      &Apache::lonxml::end_alarm();
     return ($xmlstring,$errorstring);      return ($xmlstring,$errorstring);
 }  }
   
 sub converted {  sub tth_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').']';
     }      }
       $$texstring ='\\documentstyle{article}'.$$texstring;
   
     eval(<<'ENDCONV');      eval(<<'ENDCONV');
     ($xmlstring,$errorstring)=&convert_real($texstring)      ($xmlstring,$errorstring)=&convert_real($texstring)
 ENDCONV  ENDCONV
Line 134  ENDCONV Line 131  ENDCONV
  $errorstring) {   $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();   if (ref($Apache::lonxml::request)) {
  $request->child_terminate();      $Apache::lonxml::request->child_terminate();
    } else {
       my $request;
       eval { $request=Apache->request; };
       if (!$request) {
    eval { $request=Apache2::RequestUtil->request; };
       }
       if ($request) {
    $request->child_terminate();
       } else {
    &Apache::lonnet::logthis("Unable to find a request to do child_terminate on");
       }
    }
     }      }
     return $xmlstring;      return $xmlstring;
 }  }
   
 # ====================================================================== Footer  sub clean_out_math_mode {
       my ($texstring)=@_;
       $$texstring=~s/(?!\\)\$//g;
       $$texstring=~s/\\[\)\(\]\[]//g;
       $$texstring=~s/\\ensuremath//g;
       return '';
   }
   
   sub displaystyle {
       my ($texstring)=@_;
       #has a $$ or \[ or \displaystyle in it, guessinng it's display mode
       if ($$texstring=~/[^\\]\$\$/ ||
    $$texstring=~/\\\[/ ||
    $$texstring=~/\\displaystyle/) { return 1; }
       return 0;
   }
   
   sub jsMath_converted {
       my $texstring=shift;
       my $tag='span';
       if (&displaystyle($texstring)) { $tag='div'; }
       &clean_out_math_mode($texstring);
       return &jsMath_header().
    '<'.$tag.' class="math">'.$$texstring.'</'.$tag.'>';
   }
   
   {
       my @jsMath_sent_header;
       sub jsMath_reset {
    undef(@jsMath_sent_header);
       }
       sub jsMath_push {
    push(@jsMath_sent_header,0);
       }
       sub jsMath_header {
    return '' if $jsMath_sent_header[-1];
    $jsMath_sent_header[-1]=1;
    return
               '<script type="text/javascript">
                        function NoFontMessage () {}
                        jsMath = {Parser: {prototype: {environments: {\'eqnarray*\' :[\'Array\',null,null,\'rcl\',[5/18,5/18],3,\'D\']}}}};
                      </script>'."\n".
       '<script type="text/javascript" src="/adm/jsMath/jsMath.js"></script>'."\n";
       }
       sub jsMath_process {
    my $state = pop(@jsMath_sent_header);
    return '' if !$state;
    return '<script type="text/javascript">jsMath.Process()</script>';
       }
   }
   
   sub init_math_support {
       &init_tth();
       &Apache::lontexconvert::jsMath_push();
       if ($env{'environment.texengine'} eq 'jsMath' ||
    $env{'form.texengine'}        eq 'jsMath' ) {
    return &Apache::lontexconvert::jsMath_header();
       }
       return;
   }
   
   sub mimetex_converted {
       my $texstring=shift;
       my $displaystyle=&displaystyle($texstring);
   
 sub footer {      &clean_out_math_mode($texstring);
   my $xmlstring='';  
   if ($ENV{'request.state'} eq 'construct') {      if ($displaystyle) {
       $xmlstring.='<address>'.$errorstring.'</address>';   $$texstring='\\displaystyle \\Large '.$$texstring;
   } else {      }
       &Apache::lonmsg::author_res_msg($ENV{'request.filename'},$errorstring);      my $result='<img src="/cgi-bin/mimetex.cgi?'.&escape($$texstring).'" />';
   }      if ($displaystyle) {
 # -------------------------------------------------------------------- End Body   $result='<center>'.$result.'</center>';
   $xmlstring.=&Apache::lonxml::xmlend();      }
   return $xmlstring;      return $result;
   }
   
   sub converted {
       my ($string,$mode)=@_;
       if ($mode eq '') { $mode=$env{'environment.texengine'}; }
       if ($mode =~ /tth/i) {
    return &tth_converted($string);
       } elsif ($mode =~ /jsmath/i) {
    return &jsMath_converted($string);
       } elsif ($mode =~ /mimetex/i) {
    return &mimetex_converted($string);
       }
       return &tth_converted($string);
 }  }
   
 # ------------------------------------------------------------ Message display  # ------------------------------------------------------------ Message display
Line 166  sub to_convert { Line 251  sub to_convert {
   
 sub smiley {  sub smiley {
     my $expression=shift;      my $expression=shift;
     if ($ENV{'browser.imagesuppress'} eq 'on') { return $expression; }      if ($env{'browser.imagesuppress'} eq 'on') { return $expression; }
     my %smileys=('\:\-\)' => 'smiley',      my %smileys=('\:\-\)' => 'smiley',
  '8\-\)'  => 'coolsmile',   '8\-\)'  => 'coolsmile',
  '8\-(I|\|)'   => 'coolindiff',   '8\-(I|\|)'   => 'coolindiff',
Line 182  sub smiley { Line 267  sub smiley {
  '\:\-(X|\#)' => 'lipsrsealed',   '\:\-(X|\#)' => 'lipsrsealed',
  '\:\-S' => 'huh');   '\:\-S' => 'huh');
     my $iconpath=$Apache::lonnet::perlvar{'lonIconsURL'};      my $iconpath=$Apache::lonnet::perlvar{'lonIconsURL'};
     foreach (keys %smileys) {      foreach my $smiley (keys(%smileys)) {
  $expression=~s/$_/\<img src="$iconpath\/$smileys{$_}.gif" \/\>/gs;    $expression=~s/$smiley/\<img src="$iconpath\/$smileys{$smiley}.gif" \/\>/gs; 
     }      }
     return $expression;      return $expression;
 }  }
Line 194  sub msgtexconverted { Line 279  sub msgtexconverted {
     &init_tth();      &init_tth();
     my $outmessage='';      my $outmessage='';
     my $tex=0;      my $tex=0;
     foreach (split(/(?:\&lt\;|\<)\/*m\s*(?:\&gt\;|\>)/i,$message)) {      foreach my $fragment (split(/(?:\&lt\;|\<)\/*m\s*(?:\&gt\;|\>)/i,$message)) {
  if ($tex) {   if ($tex) {
     if ($email) {      if ($email) {
  $outmessage.='</pre><tt>'.&to_convert($_).'</tt><pre>'; $tex=0;   $outmessage.='</pre><tt>'.&to_convert($fragment).'</tt><pre>';
    $tex=0;
     } else {      } else {
  $outmessage.=&to_convert($_); $tex=0;   $outmessage.=&to_convert($fragment);
    $tex=0;
     }      }
  } else {   } else {
             $outmessage.=&smiley($_); $tex=1;              $outmessage.=&smiley($fragment);
       $tex=1;
    }
       }
       $message=$outmessage; $outmessage=''; $tex=0;
       foreach my $fragment (split(/(?:\&lt\;|\<)\/*algebra\s*(?:\&gt\;|\>)/i,
    $message)) {
    if ($tex) {
       if ($email) {
    $outmessage.='</pre><tt>'.&algebra($fragment,'web').'</tt><pre>';
    $tex=0;
       } else {
    $outmessage.=&algebra($fragment,'web');
    $tex=0;
       }
    } else {
               $outmessage.=$fragment;
       $tex=1;
  }   }
     }      }
     if (wantarray) {      if (wantarray) {
Line 215  sub msgtexconverted { Line 319  sub msgtexconverted {
 sub algebra {  sub algebra {
     use AlgParser;      use AlgParser;
   
     my ($string,$target)=@_;      my ($string,$target,$style)=@_;
     my $parser = new AlgParserWithImplicitExpand;      my $parser = new AlgParserWithImplicitExpand;
     $string=&prepare_algebra($string);      $string=&prepare_algebra($string);
     my $ret = $parser->parse($string);      my $ret = $parser->parse($string);
Line 225  sub algebra { Line 329  sub algebra {
  $parser->normalize();   $parser->normalize();
  my $latex=$parser->tolatex();   my $latex=$parser->tolatex();
  $latex=&postprocess_algebra($latex);   $latex=&postprocess_algebra($latex);
  $latex='$'.$latex.'$';   if ($style eq 'display') {
       $latex='$$'.$latex.'$$x';
    } else {
       # style is 'inline'
       $latex='\\ensuremath{'.$latex.'}';
    }
  if ($target eq 'web' || $target eq 'analyze') {   if ($target eq 'web' || $target eq 'analyze') {
     $result = &converted(\$latex);      $result = &converted(\$latex);
  } else {   } else {
Line 240  sub prepare_algebra { Line 349  sub prepare_algebra {
     my ($string)=@_;      my ($string)=@_;
   
     # makes the decision about what is a minus sign easier supposedly      # makes the decision about what is a minus sign easier supposedly
     $string =~ s/([\=\>\<\%\!\#] *)-/$1 zeroplace -/g;      $string =~ s/(\<\>|\<\=|\>\=[\=\>\<] *)-/$1 zeroplace -/g;
   
     return $string;      return $string;
 }  }
Line 251  sub postprocess_algebra { Line 360  sub postprocess_algebra {
     # moodle had these and I don't know why, ignoring them for now      # moodle had these and I don't know why, ignoring them for now
     # $string =~s/\\fun/ /g;      # $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      # sqrt(3,4) means the 4 root of 3
     $string =~s/\\sqrt{([^,]+),([^\}]+)}/\\sqrt[$2]{$1}/gs;      $string =~s/\\sqrt{([^,]+),([^\}]+)}/\\sqrt[$2]{$1}/gs;
   
Line 264  sub postprocess_algebra { Line 369  sub postprocess_algebra {
     # log(3,4) means the log base 4 of 3      # log(3,4) means the log base 4 of 3
     $string =~s/\\((?:sin|cos|tan|sec|csc|cot)(?:h)?)\\left\((.+?),(.+?)\\right\)/\\$1^{$3}\\left($2\\right)/gs;      $string =~s/\\((?:sin|cos|tan|sec|csc|cot)(?:h)?)\\left\((.+?),(.+?)\\right\)/\\$1^{$3}\\left($2\\right)/gs;
   
     # remove the extra () in the denominator of a \frac      # int(3,a,b) integral from a to b of 3
     $string =~s/\\frac{(.+?)}{\\left\((.+?)\\right\)}/\\frac{$1}{$2}/gs;      $string =~s/\\int\\left\((.+?),(.+?),(.+?)\\right\)/\\int_{$2}^{$3}\\left($1\\right)/gs;
   
           # int( ... dx) -> ...
     &Apache::lonnet::logthis($string);      $string =~s/\\int\\left\((.+?)d[a-z]\\right\)/$1/gs;
   
       # 
       $string =~s/\\lim\\left\((.+?),(.+?),(.+?)\\right\)/\\lim_{$2\\to $3}$1/gs;
     return $string;      return $string;
 }  }
 1;  1;

Removed from v.1.54  
changed lines
  Added in v.1.79


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>
500 Internal Server Error

Internal Server Error

The server encountered an internal error or misconfiguration and was unable to complete your request.

Please contact the server administrator at root@localhost to inform them of the time this error occurred, and the actions you performed just before this error.

More information about this error may be available in the server error log.