Diff for /loncom/xml/lontexconvert.pm between versions 1.82 and 1.105

version 1.82, 2007/06/13 00:21:03 version 1.105, 2011/02/10 19:28:29
Line 47  use Apache::lonlocal; Line 47  use Apache::lonlocal;
 use Apache::lonnet;  use Apache::lonnet;
 use lib '/home/httpd/lib/perl/';  use lib '/home/httpd/lib/perl/';
 use LONCAPA;  use LONCAPA;
    use URI::Escape;
   use IO::Socket::INET;
   
 # ====================================================================== Header  # ====================================================================== Header
   
Line 79  sub init_tth { Line 80  sub init_tth {
   
 $Apache::lontexconvert::messedup=0;  $Apache::lontexconvert::messedup=0;
   
 # we need this routine because &converted can get called from inside  
 # of the safespace (through &xmlparse('<m>stuff</m>') which doesn't  
 # allow the opcode for alarm, so we need to compile this before we get  
 # into the safe space since opcode checks only occur at compile time  
 sub convert_real {  sub convert_real {
     my ($texstring)=@_;      my ($texstring)=@_;
     my ($xmlstring,$errorstring);      my ($xmlstring,$errorstring);
Line 108  sub convert_real { Line 106  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*$//;
       #
       # \rightleftharpoons is not converted by tth but maps
       # reasonably well to &#8660;.  If we get many more of these,
       # we're going to need to have a translation sub.
       #
       my $lrharpoon = pack("U", 0x21cc);
       $xmlstring=~s/\\rightleftharpoons/$lrharpoon/g;
   
     &Apache::lonxml::end_alarm();      &Apache::lonxml::end_alarm();
     return ($xmlstring,$errorstring);      return ($xmlstring,$errorstring);
 }  }
Line 203  sub jsMath_converted { Line 209  sub jsMath_converted {
  return "\n".   return "\n".
     '<script type="text/javascript">jsMath.Process()</script>'."\n";      '<script type="text/javascript">jsMath.Process()</script>'."\n";
     }      }
       sub jsMath_state {
    my ($level) = @_;
    return $jsMath_sent_header[$level];
       }
   }
   
   sub tex_engine {
       if (exists($env{'form.texengine'})) {
    if ($env{'form.texengine'} ne '') {
               return $env{'form.texengine'};
           }
       }    
       if ($env{'request.course.id'}
    && exists($env{'course.'.$env{'request.course.id'}.'.texengine'})) {
    return $env{'course.'.$env{'request.course.id'}.'.texengine'};
       }
       if (exists($env{'environment.texengine'})) {
    return $env{'environment.texengine'};
       }
       return 'tth';
 }  }
   
 sub init_math_support {  sub init_math_support {
       my ($inherit_jsmath) = @_;
     &init_tth();      &init_tth();
     &Apache::lontexconvert::jsMath_push();      &Apache::lontexconvert::jsMath_push();
     if ($env{'environment.texengine'} eq 'jsMath' ||      if (lc(&tex_engine()) eq 'jsmath' ||
  $env{'form.texengine'}        eq 'jsMath' ) {   ($inherit_jsmath && &jsMath_state(-2))) {
  return &Apache::lontexconvert::jsMath_header();   return &Apache::lontexconvert::jsMath_header();
     }      }
     return;      return;
 }  }
   
   sub mimetex_valign {
       my ($esc_texstring)=@_;
       my $valign = 0;
       my $lonhost = $Apache::lonnet::perlvar{'lonHostID'};
       my $hostname = &Apache::lonnet::hostname($lonhost);
       my $path = '/cgi-bin/mimetex.cgi?'.$esc_texstring;
       my $socket;
       &Apache::lonxml::start_alarm();
       my $socket = IO::Socket::INET->new(PeerAddr => $hostname,
                                           PeerPort => 'http(80)',
                                           Proto    => 'tcp');
       if ($socket) {
           my $headreq = "HEAD $path HTTP/1.0\r\n\r\n";
           print $socket $headreq;
           while (<$socket>) {
               if (/Vertical\-Align\:\s*?([\-\d]+)/) {
                   $valign = $1;
               }
           }
           $socket->close();
       }
       &Apache::lonxml::end_alarm();
       return $valign;
   }
   
 sub mimetex_converted {  sub mimetex_converted {
     my $texstring=shift;      my $texstring=shift;
   
   # Alt-Argument for screen readers
       my $alt_string=$$texstring;
       $alt_string=~s/\"/\'\'/g;
   
   # Is this displaystyle?
   
     my $displaystyle=&displaystyle($texstring);      my $displaystyle=&displaystyle($texstring);
   
   # Remove math environment delimiters
   
     &clean_out_math_mode($texstring);      &clean_out_math_mode($texstring);
   
     if ($displaystyle) {      if ($displaystyle) {
  $$texstring='\\displaystyle \\Large '.$$texstring;   $$texstring='\\displaystyle \\Large '.$$texstring;
     }      }
     my $result='<img src="/cgi-bin/mimetex.cgi?'.&escape($$texstring).'" />';      my $esc_texstring = &uri_escape($$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.'" />';
     if ($displaystyle) {      if ($displaystyle) {
  $result='<center>'.$result.'</center>';   $result='<center>'.$result.'</center>';
     }      }
Line 233  sub mimetex_converted { Line 296  sub mimetex_converted {
   
 sub converted {  sub converted {
     my ($string,$mode)=@_;      my ($string,$mode)=@_;
     if ($mode eq '') { $mode=$env{'environment.texengine'}; }      if ($mode eq '') { $mode = &tex_engine(); }
     if ($mode =~ /tth/i) {      if ($mode =~ /tth/i) {
  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 =~ /mimetex/i) {      } elsif ($mode =~ /mimetex/i) {
  return &mimetex_converted($string);   return &mimetex_converted($string);
       } elsif ($mode =~ /raw/i) {
           return $$string;
     }      }
     return &tth_converted($string);      return &tth_converted($string);
 }  }
Line 248  sub converted { Line 313  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 256  sub to_convert { Line 322  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 281  sub smiley { Line 360  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 302  sub msgtexconverted { Line 380  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 323  sub msgtexconverted { Line 402  sub msgtexconverted {
   
 sub algebra {  sub algebra {
     use AlgParser;      use AlgParser;
       my ($string,$target,$style,$parstack,$safeeval,$tth)=@_;
     my ($string,$target,$style)=@_;  
     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 341  sub algebra { Line 420  sub algebra {
     $latex='\\ensuremath{'.$latex.'}';      $latex='\\ensuremath{'.$latex.'}';
  }   }
  if ($target eq 'web' || $target eq 'analyze') {   if ($target eq 'web' || $target eq 'analyze') {
     $result = &converted(\$latex);              my $display=&Apache::lonxml::get_param('display',$parstack,$safeeval);
               $result = &converted(\$latex,$display);
   #    $result = &converted(\$latex);
  } else {   } else {
     $result = $latex;      $result = $latex;
  }   }
Line 388  sub postprocess_algebra { Line 469  sub postprocess_algebra {
 __END__  __END__
   
   
   =pod
   
   =head1 NAME
   
   Apache::lontexconvert;
   
   =head1 SYNOPSIS
   
   Access to tth/ttm
   
   This is part of the LearningOnline Network with CAPA project
   described at http://www.lon-capa.org.
   
   
   =head1 SUBROUTINES
   
   =over
   
   =item init_tth()
   
   Header
   
   =item convert_real()
   
    we need this routine because &converted can get called from inside
    of the safespace (through &xmlparse('<m>stuff</m>') which doesn't
    allow the opcode for alarm, so we need to compile this before we get
    into the safe space since opcode checks only occur at compile time
   
   =item tth_converted()
   
   
   =item clean_out_math_mode()
   
   
   =item displaystyle()
   
   
   =item jsMath_converted()
   
   
   =item tex_engine()
   
   
   =item init_math_support()
   
   =item mimetex_valign()
   
    Makes a HEAD call to /cgi-bin/mimetex.cgi via IO:: to retrieve the 
    vertical alignment, before the subsequent call to mimetex_converted()
    which generates the <img> tag and the corresponding image.
   
    Input: 1.  $esc_texstring (escaped TeX to be rendered by mimetex).
    Output: 1. $valign - number of pixels: positive or negative integer 
               which will be included in <img> tag for mimetex image to
               support vertical alignment of image within a line of text.
   
    If a server is running SSL, and Apache rewrite rules are in place 
    to rewrite requests for http to https, modification will most likely 
    be needed for pass through for HEAD requests for /cgi-bin/mimetex.cgi. 
   
    Example rewrite rules which rewrite all http traffic to https, 
    except HEAD requests for /cgi-bin/mimetex.cgi are:
   
    <IfModule mod_rewrite.c>
        RewriteEngine On
        RewriteLogLevel 0
   
        RewriteCond %{HTTPS} off
        RewriteCond %{HTTP:Host} (.*)
        RewriteCond %{REQUEST_METHOD} !HEAD 
        RewriteRule ^/(.*) https://%1/$1 [R=301,L]
   
        RewriteCond %{HTTPS} off
        RewriteCond %{HTTP:Host} (.*)
        RewriteCond %{REQUEST_METHOD} HEAD
        RewriteCond %{REQUEST_URI} !^/cgi-bin/mimetex.cgi
        RewriteRule ^/(.*) https://%1/$1 [R=301,L]
    </IfModule>
   
   =item mimetex_converted()
   
   
   =item converted()
   
   
   =item to_convert()
   
   message display
   
   =item smiley()
   
   ???
   
   =item msgtexconverted()
   
   =item algebra()
   
   =item prepare_algebra()
   
   =item postprocess_algebra()
   
   =back
   
   =cut
   
   
   

Removed from v.1.82  
changed lines
  Added in v.1.105


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