Diff for /loncom/xml/lontexconvert.pm between versions 1.80 and 1.101

version 1.80, 2006/10/24 01:28:47 version 1.101, 2010/01/26 01:16:30
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;
   use IO::Socket::SSL;
   
 # ====================================================================== Header  # ====================================================================== Header
   
Line 79  sub init_tth { Line 81  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 107  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 151  ENDCONV Line 158  ENDCONV
   
 sub clean_out_math_mode {  sub clean_out_math_mode {
     my ($texstring)=@_;      my ($texstring)=@_;
     $$texstring=~s/(?!\\)\$//g;      $$texstring=~s/(?<!\\)\$//g;
     $$texstring=~s/\\[\)\(\]\[]//g;      $$texstring=~s/\\[\)\(\]\[]//g;
     $$texstring=~s/\\ensuremath//g;      $$texstring=~s/\\ensuremath//g;
     return '';      return '';
Line 200  sub jsMath_converted { Line 207  sub jsMath_converted {
     sub jsMath_process {      sub jsMath_process {
  my $state = pop(@jsMath_sent_header);   my $state = pop(@jsMath_sent_header);
  return '' if !$state;   return '' if !$state;
  return '<script type="text/javascript">jsMath.Process()</script>';   return "\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 $protocol = $Apache::lonnet::protocol{$lonhost};
       my $path = '/cgi-bin/mimetex.cgi?'.$esc_texstring;
       my $socket;
       &Apache::lonxml::start_alarm();
       if ($protocol eq 'https') {
           $socket = IO::Socket::SSL->new(PeerAddr => $hostname,
                                          PeerPort => 'https(443)',
                                          Proto    => 'tcp');
       } else {
           $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;
               }
           }
           if ($protocol eq 'https') {
               $socket->close(SSL_no_shutdown => 1,
                              SSL_ctx_free => 1);
           } else {
               $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 232  sub mimetex_converted { Line 309  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 256  sub to_convert { Line 335  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=(
  '8\-\)'  => 'coolsmile',      '\:\-*\)' => 'face-smile.png',
  '8\-(I|\|)'   => 'coolindiff',   '8\-\)'  => 'face-cool.png',
  ':\-(I|\|)'   => 'neutral',   '8\-(I|\|)'   => 'face-glasses.png',
  '\:\-(o|O|\(\))' => 'shocked',   '\:\-(I|\|)'   => 'face-plain.png',
  ':\-\('  => 'frowny',   '\:\-(o|O|\(\))' => 'face-surprise.png',
  '\;\-\)' => 'wink',   ':\-\('  => 'face-sad.png',
  '\:\-P'  => 'baeh',   '\;\-\)' => 'face-wink.png',
  '\:\-(\\\|\\/)' => 'hrrm',   '\:\-(P|p)'  => 'face-raspberry.png',
  '\:\-D'  => 'bigsmile',   '\:\-(\\\|\\/)' => 'face-uncertain.png',
  '\:\-C'  => 'angry',   '\:\-D'  => 'face-smile-big.png',
  '\:(\'|\`)\-\(' => 'cry',   '\:\-(C|\@)'  => 'face-angry.png',
  '\:\-(X|\#)' => 'lipsrsealed',   '\:(\'|\`)\-*\(' => 'face-crying.png',
  '\:\-S' => 'huh');   '\:\-(X|x|\#)' => 'face-quiet.png',
    '\:\-(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 323  sub msgtexconverted { Line 416  sub msgtexconverted {
 sub algebra {  sub algebra {
     use AlgParser;      use AlgParser;
   
     my ($string,$target,$style)=@_;      my ($string,$target,$style,$parstack,$safeeval)=@_;
     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 340  sub algebra { Line 433  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 387  sub postprocess_algebra { Line 482  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_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.80  
changed lines
  Added in v.1.101


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