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

Diff for /loncom/xml/lontexconvert.pm between versions 1.98.2.1 and 1.109

version 1.98.2.1, 2011/02/10 20:07:00 version 1.109, 2011/12/06 16:10:53
Line 165  sub clean_out_math_mode { Line 165  sub clean_out_math_mode {
   
 sub displaystyle {  sub displaystyle {
     my ($texstring)=@_;      my ($texstring)=@_;
     #has a $$ or \[ or \displaystyle in it, guessinng it's display mode      #has a $$ or \[ or \displaystyle or eqnarray in it, guessinng it's display mode
     if ($$texstring=~/[^\\]\$\$/ ||      if ($$texstring=~/[^\\]\$\$/ ||
  $$texstring=~/\\\[/ ||          $$texstring=~/\\\[/ ||
  $$texstring=~/\\displaystyle/) { return 1; }          $$texstring=~/\\displaystyle/ ||
           $$texstring=~/eqnarray/
          ) { return 1; }
     return 0;      return 0;
 }  }
   
   sub MathJax_converted {
       my $texstring=shift;
       my $tag='math/tex;';
       if (&displaystyle($texstring)) { $tag='math/tex; mode=display'; }
       &clean_out_math_mode($texstring);
       return &MathJax_header().
         '<script type="'.$tag.'">'.$$texstring.'</script>';
   }
   
   {
       #Relies heavily on the previous jsMath installation
       my @MathJax_sent_header;
       sub MathJax_reset {
           undef(@MathJax_sent_header);
       }
       sub MathJax_push {
           push(@MathJax_sent_header,0);
       }
       sub MathJax_header {
           if (!@MathJax_sent_header) {
               &Apache::lonnet::logthis("mismatched calls of MathJax_header and MathJax_process");
               return '';
           }
           return '' if $MathJax_sent_header[-1];
           $MathJax_sent_header[-1]=1;
           return
             '<script type="text/javascript" src="/adm/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>'."\n";
       }
       #sub MathJax_process {
       #    my $state = pop(@MathJax_sent_header);
       #    return '' if !$state;
       #    return "\n".
       #        '<script type="text/javascript">MathJax.Process()</script>'."\n";
       #}
       #sub MathJax_state {
       #    my ($level) = @_;
       #    return $MathJax_sent_header[$level];
       #}
   }
   
   
 sub jsMath_converted {  sub jsMath_converted {
     my $texstring=shift;      my $texstring=shift;
     my $tag='span';      my $tag='span';
Line 239  sub init_math_support { Line 282  sub init_math_support {
  ($inherit_jsmath && &jsMath_state(-2))) {   ($inherit_jsmath && &jsMath_state(-2))) {
  return &Apache::lontexconvert::jsMath_header();   return &Apache::lontexconvert::jsMath_header();
     }      }
       &Apache::lontexconvert::MathJax_push();
       if (lc(&tex_engine()) eq 'mathjax') { # ||
           #($inherit_jsmath && &jsMath_state(-2))) {
           return &Apache::lontexconvert::MathJax_header();
       }
     return;      return;
 }  }
   
 sub mimetex_valign {  sub mimetex_valign {
     my ($esc_texstring)=@_;      my ($esc_texstring)=@_;
     my $valign = 0;      my $valign = 0;
     my $lonhost = $Apache::lonnet::perlvar{'lonHostID'};  
     my $hostname = &Apache::lonnet::hostname($lonhost);  
     my $path = '/cgi-bin/mimetex.cgi?'.$esc_texstring;      my $path = '/cgi-bin/mimetex.cgi?'.$esc_texstring;
     my $socket;      my $socket;
     &Apache::lonxml::start_alarm();      &Apache::lonxml::start_alarm();
     my $socket = IO::Socket::INET->new(PeerAddr => $hostname,      $socket = IO::Socket::INET->new(PeerAddr => 'localhost',
                                        PeerPort => 'http(80)',                                      PeerPort => 'http(80)',
                                        Proto    => 'tcp');                                      Proto    => 'tcp');
     if ($socket) {      if ($socket) {
         my $headreq = "HEAD $path HTTP/1.0\r\n\r\n";          my $headreq = "HEAD $path HTTP/1.0\r\n\r\n";
         print $socket $headreq;          print $socket $headreq;
Line 289  sub mimetex_converted { Line 335  sub mimetex_converted {
     my $valign = &mimetex_valign($esc_texstring);      my $valign = &mimetex_valign($esc_texstring);
     my $result='<img src="/cgi-bin/mimetex.cgi?'.$esc_texstring.'" style="vertical-align:'.$valign.'px" alt="'.$alt_string.'" />';      my $result='<img src="/cgi-bin/mimetex.cgi?'.$esc_texstring.'" style="vertical-align:'.$valign.'px" alt="'.$alt_string.'" />';
     if ($displaystyle) {      if ($displaystyle) {
  $result='<center>'.$result.'</center>';   $result='<div style="text-align:center">'.$result.'</div>';
     }      }
     return $result;      return $result;
 }  }
Line 301  sub converted { Line 347  sub converted {
  return &tth_converted($string);   return &tth_converted($string);
     } elsif ($mode =~ /jsmath/i) {      } elsif ($mode =~ /jsmath/i) {
  return &jsMath_converted($string);   return &jsMath_converted($string);
       } elsif ($mode =~ /mathjax/i) {
    return &MathJax_converted($string);
     } elsif ($mode =~ /mimetex/i) {      } elsif ($mode =~ /mimetex/i) {
  return &mimetex_converted($string);   return &mimetex_converted($string);
     } elsif ($mode =~ /raw/i) {      } elsif ($mode =~ /raw/i) {
Line 313  sub converted { Line 361  sub converted {
   
 sub to_convert {  sub to_convert {
     my ($string) = @_;      my ($string) = @_;
       &init_tth();
     $string=~s/\<br\s*\/?\>/ /gs;      $string=~s/\<br\s*\/?\>/ /gs;
 #    $string=~s/\s/ /gs;  #    $string=~s/\s/ /gs;
     $string=&HTML::Entities::decode($string);      $string=&HTML::Entities::decode($string);
Line 321  sub to_convert { Line 370  sub to_convert {
   
 sub smiley {  sub smiley {
     my $expression=shift;      my $expression=shift;
     if ($env{'browser.imagesuppress'} eq 'on') { return $expression; }      my %smileys=(
     my %smileys=('\:\-\)' => 'smiley',      '\:\-*\)' => 'face-smile.png',
  '8\-\)'  => 'coolsmile',   '8\-\)'  => 'face-cool.png',
  '8\-(I|\|)'   => 'coolindiff',   '8\-(I|\|)'   => 'face-glasses.png',
  ':\-(I|\|)'   => 'neutral',   '\:\-(I|\|)'   => 'face-plain.png',
  '\:\-(o|O|\(\))' => 'shocked',   '\:\-(o|O|\(\))' => 'face-surprise.png',
  ':\-\('  => 'frowny',   ':\-\('  => 'face-sad.png',
  '\;\-\)' => 'wink',   '\;\-\)' => 'face-wink.png',
  '\:\-P'  => 'baeh',   '\:\-(P|p)'  => 'face-raspberry.png',
  '\:\-(\\\|\\/)' => 'hrrm',   '\:\-(\\\|\\/)' => 'face-uncertain.png',
  '\:\-D'  => 'bigsmile',   '\:\-D'  => 'face-smile-big.png',
  '\:\-C'  => 'angry',   '\:\-(C|\@)'  => 'face-angry.png',
  '\:(\'|\`)\-\(' => 'cry',   '\:(\'|\`)\-*\(' => 'face-crying.png',
  '\:\-(X|\#)' => 'lipsrsealed',   '\:\-(X|x|\#)' => 'face-quiet.png',
  '\:\-S' => 'huh');   '\:\-(s|S)' => 'face-uncertain.png',
    '\:\-\$' => 'face-embarrassed.png',
    '\:\-\*' => 'face-kiss.png',
    '\+O\(' => 'face-sick.png',
    '(\&lt\;3|\(heart\))' => 'heart.png',
    '\(rose\)' => 'rose.png',
    '\(pizza\)' => 'food-pizza.png',
    '\(cake\)' => 'food-cake.png',
    '\(ninja\)' => 'face-ninja.png',
    '\(pirate\)' => 'face-pirate.png',
    '\((agree|yes)\)' => 'opinion-agree.png',
    '\((disagree|nay)\)' => 'opinion-disagree.png',
    '(o|O)\-\)' => 'face-angel.png',
    );
     my $iconpath=$Apache::lonnet::perlvar{'lonIconsURL'};      my $iconpath=$Apache::lonnet::perlvar{'lonIconsURL'};
     foreach my $smiley (keys(%smileys)) {      foreach my $smiley (keys(%smileys)) {
  $expression=~s/$smiley/\<img src="$iconpath\/$smileys{$smiley}.gif" \/\>/gs;    $expression=~s/$smiley/\<img src="$iconpath\/$smileys{$smiley}" \/\>/gs; 
     }      }
     return $expression;      return $expression;
 }  }
Line 346  sub smiley { Line 408  sub smiley {
 sub msgtexconverted {  sub msgtexconverted {
     my ($message,$email) = @_;      my ($message,$email) = @_;
     $errorstring='';      $errorstring='';
     &init_tth();  
     my $outmessage='';      my $outmessage='';
     my $tex=0;      my $tex=0;
     foreach my $fragment (split(/(?:\&lt\;|\<)\/*m\s*(?:\&gt\;|\>)/i,$message)) {      foreach my $fragment (split(/(?:\&lt\;|\<)\/*m\s*(?:\&gt\;|\>)/i,$message)) {
Line 367  sub msgtexconverted { Line 428  sub msgtexconverted {
     foreach my $fragment (split(/(?:\&lt\;|\<)\/*algebra\s*(?:\&gt\;|\>)/i,      foreach my $fragment (split(/(?:\&lt\;|\<)\/*algebra\s*(?:\&gt\;|\>)/i,
  $message)) {   $message)) {
  if ($tex) {   if ($tex) {
           my $algebra = &algebra($fragment, 'web', undef, undef, undef, undef, 'tth');
     if ($email) {      if ($email) {
  $outmessage.='</pre><tt>'.&algebra($fragment,'web').'</tt><pre>';   $outmessage.='</pre><tt>'.$algebra.'</tt><pre>';
  $tex=0;   $tex=0;
     } else {      } else {
  $outmessage.=&algebra($fragment,'web');   $outmessage.=$algebra;
  $tex=0;   $tex=0;
     }      }
  } else {   } else {
             $outmessage.=$fragment;          $outmessage.=$fragment;
     $tex=1;      $tex=1;
  }   }
     }      }
Line 388  sub msgtexconverted { Line 450  sub msgtexconverted {
   
 sub algebra {  sub algebra {
     use AlgParser;      use AlgParser;
       my ($string,$target,$style,$parstack,$safeeval,$tth)=@_;
     my ($string,$target,$style,$parstack,$safeeval)=@_;  
     my $parser = new AlgParserWithImplicitExpand;      my $parser = new AlgParserWithImplicitExpand;
       if ($tth eq 'tth') {&init_tth();}
     $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').']';
Line 495  Header Line 557  Header
   
 =item jsMath_converted()  =item jsMath_converted()
   
   =item MathJax_converted()
    - Mimics the jsMath functionality
   
 =item tex_engine()  =item tex_engine()
   
Line 503  Header Line 567  Header
   
 =item mimetex_valign()  =item mimetex_valign()
   
  Makes a HEAD call to /cgi-bin/mimetex.cgi via IO:: to retrieve the   Makes a HEAD call to /cgi-bin/mimetex.cgi via IO:: to retrieve the 
  vertical alignment, before the subsequent call to mimetex_converted()   vertical alignment, before the subsequent call to mimetex_converted()
  which generates the <img> tag and the corresponding image.   which generates the <img> tag and the corresponding image.
   
  Input: 1.  $esc_texstring (escaped TeX to be rendered by mimetex).   Input: 1.  $esc_texstring (escaped TeX to be rendered by mimetex).
  Output: 1. $valign - number of pixels: positive or negative integer   Output: 1. $valign - number of pixels: positive or negative integer 
             which will be included in <img> tag for mimetex image to              which will be included in <img> tag for mimetex image to
             support vertical alignment of image within a line of text.              support vertical alignment of image within a line of text.
   
  If a server is running SSL, and Apache rewrite rules are in place   If a server is running SSL, and Apache rewrite rules are in place 
  to rewrite requests for http to https, modification will most likely   to rewrite requests for http to https, modification will most likely 
  be needed for pass through for HEAD requests for /cgi-bin/mimetex.cgi.   be needed for pass through for HEAD requests for /cgi-bin/mimetex.cgi. 
   
  Example rewrite rules which rewrite all http traffic to https,   Example rewrite rules which rewrite all http traffic to https, 
  except HEAD requests for /cgi-bin/mimetex.cgi are:   except HEAD requests for /cgi-bin/mimetex.cgi are:
   
  <IfModule mod_rewrite.c>   <IfModule mod_rewrite.c>
Line 525  Header Line 589  Header
   
      RewriteCond %{HTTPS} off       RewriteCond %{HTTPS} off
      RewriteCond %{HTTP:Host} (.*)       RewriteCond %{HTTP:Host} (.*)
      RewriteCond %{REQUEST_METHOD} !HEAD       RewriteCond %{REQUEST_METHOD} !HEAD 
      RewriteRule ^/(.*) https://%1/$1 [R=301,L]       RewriteRule ^/(.*) https://%1/$1 [R=301,L]
   
      RewriteCond %{HTTPS} off       RewriteCond %{HTTPS} off
Removed from v.1.98.2.1  
changed lines
  Added in v.1.109

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