Diff for /loncom/xml/lontexconvert.pm between versions 1.49 and 1.65

version 1.49, 2005/02/24 08:32:11 version 1.65, 2005/04/07 06:56:27
Line 47  use Apache::lonmsg(); Line 47  use Apache::lonmsg();
 use Apache::lonxml();  use Apache::lonxml();
 use Apache::lonmenu();  use Apache::lonmenu();
 use Apache::lonlocal;  use Apache::lonlocal;
   use Apache::lonnet;
   
 # ====================================================================== 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 ($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);
Line 98  sub convert_real { Line 99  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 114  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 140  ENDCONV Line 143  ENDCONV
     return $xmlstring;      return $xmlstring;
 }  }
   
   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 '<'.$tag.' class="math">'.$$texstring.'</'.$tag.'>';
   }
   
   sub mimetex_converted {
       my $texstring=shift;
       my $displaystyle=&displaystyle($texstring);
   
       &clean_out_math_mode($texstring);
   
       if ($displaystyle) {
    $$texstring='\\displaystyle \\Large '.$$texstring;
       }
       my $result='<img src="/cgi-bin/mimetex.cgi?'.&Apache::lonnet::escape($$texstring).'" />';
       if ($displaystyle) {
    $result='<center>'.$result.'</center>';
       }
       return $result;
   }
   
   sub converted {
       if ($env{'environment.texengine'} eq 'tth') {
    return &tth_converted;
       } elsif ($env{'environment.texengine'} eq 'jsMath') {
    return &jsMath_converted;
       } elsif ($env{'environment.texengine'} eq 'mimetex') {
    return &mimetex_converted;
       }
       return &tth_converted;
   }
   
 # ====================================================================== Footer  # ====================================================================== Footer
   
 sub footer {  sub footer {
   my $xmlstring='';    my $xmlstring='';
   if ($ENV{'request.state'} eq 'construct') {    if ($env{'request.state'} eq 'construct') {
       $xmlstring.='<address>'.$errorstring.'</address>';        $xmlstring.='<address>'.$errorstring.'</address>';
   } else {    } else {
       &Apache::lonmsg::author_res_msg($ENV{'request.filename'},$errorstring);        &Apache::lonmsg::author_res_msg($env{'request.filename'},$errorstring);
   }    }
 # -------------------------------------------------------------------- End Body  # -------------------------------------------------------------------- End Body
   $xmlstring.=&Apache::lonxml::xmlend();    $xmlstring.=&Apache::lonxml::xmlend();
Line 166  sub to_convert { Line 221  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 205  sub msgtexconverted { Line 260  sub msgtexconverted {
             $outmessage.=&smiley($_); $tex=1;              $outmessage.=&smiley($_); $tex=1;
  }   }
     }      }
       $message=$outmessage; $outmessage=''; $tex=0;
       foreach (split(/(?:\&lt\;|\<)\/*algebra\s*(?:\&gt\;|\>)/i,$message)) {
    if ($tex) {
       if ($email) {
    $outmessage.='</pre><tt>'.&algebra($_,'web').'</tt><pre>'; $tex=0;
       } else {
    $outmessage.=&algebra($_,'web'); $tex=0;
       }
    } else {
               $outmessage.=$_; $tex=1;
    }
       }
     if (wantarray) {      if (wantarray) {
  return ($outmessage,$errorstring);   return ($outmessage,$errorstring);
     } else {      } else {
Line 215  sub msgtexconverted { Line 282  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);
     my $result='['.&mt('Algebra unconverted due to previous errors').']';      my $result='['.&mt('Algebra unconverted due to previous errors').']';
     if ( ref($ret) ) {      if ( ref($ret) ) {
  $parser->tostring();   #$parser->tostring();
  $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 239  sub algebra { Line 311  sub algebra {
 sub prepare_algebra {  sub prepare_algebra {
     my ($string)=@_;      my ($string)=@_;
   
     # change some multi character operators into single character operators      # makes the decision about what is a minus sign easier supposedly
     $string =~ s/<>/\#/g;      $string =~ s/(\<\>|\<\=|\>\=[\=\>\<] *)-/$1 zeroplace -/g;
     $string =~ s/<\=/\%/g;  
     $string =~ s/>\=/\!/g;  
       
     # makes the decision about what is a minus sign easier  
     $string =~ s/([\=\>\<\%\!\#] *)-/$1 zeroplace -/g;  
   
     return $string;      return $string;
 }  }
Line 253  sub prepare_algebra { Line 320  sub prepare_algebra {
 sub postprocess_algebra {  sub postprocess_algebra {
     my ($string)=@_;      my ($string)=@_;
           
     # exapnd out some operators      # moodle had these and I don't know why, ignoring them for now
     $string =~ s/\#/\\not= /g;      # $string =~s/\\fun/ /g;
     $string =~ s/\%/\\leq /g;  
     $string =~ s/\!/\\geq /g;      # sqrt(3,4) -> \sqrt\let{3,4\right}, which is annoying
       $string =~s/\\left\{/\{/g;
       $string =~s/\\right\}/\}/g;
   
       # remove the extra () in the denominator of a \frac
       $string =~s/\\frac{(.+?)}{\\left\((.+?)\\right\)}/\\frac{$1}{$2}/gs;
       
       # sqrt(3,4) means the 4 root of 3
       $string =~s/\\sqrt{([^,]+),([^\}]+)}/\\sqrt[$2]{$1}/gs;
   
       # log(3,4) means the log base 4 of 3
       $string =~s/\\log\\left\((.+?),(.+?)\\right\)/\\log_{$2}\\left($1\\right)/gs;
   
       # 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;
   
       # int(3,a,b) integral from a to b of 3
       $string =~s/\\int\\left\((.+?),(.+?),(.+?)\\right\)/\\int_{$2}^{$3}\\left($1\\right)/gs;
   
       # int( ... dx) -> ...
       $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.49  
changed lines
  Added in v.1.65


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