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

Diff for /loncom/xml/lontexconvert.pm between versions 1.92 and 1.100

version 1.92, 2008/12/04 09:51:14 version 1.100, 2009/12/22 05:08:04
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 LWP::UserAgent;  use URI::Escape;
    use IO::Socket::INET;
   use IO::Socket::SSL;
   
 # ====================================================================== Header  # ====================================================================== Header
   
Line 243  sub init_math_support { Line 244  sub init_math_support {
 }  }
   
 sub mimetex_valign {  sub mimetex_valign {
     my ($texstring)=@_;      my ($esc_texstring)=@_;
     my $ua = LWP::UserAgent->new; #from the perldoc of LWP::UserAgent      my $valign = 0;
     $ua->timeout(10);       my $lonhost = $Apache::lonnet::perlvar{'lonHostID'};
     $ua->env_proxy;      my $hostname = &Apache::lonnet::hostname($lonhost);
     #header without imagedata saved to response:      my $protocol = $Apache::lonnet::protocol{$lonhost};
     my $response = $ua->head('http://lcdevhost.localdomain/cgi-bin/mimetex.cgi?'.$texstring);      my $path = '/cgi-bin/mimetex.cgi?'.$esc_texstring;
     if ($response->is_success) {      my $socket;
         #get the valign-value:      &Apache::lonxml::start_alarm();
         return($response->headers->{'vertical-align'});}      if ($protocol eq 'https') {
     else {          $socket = IO::Socket::SSL->new(PeerAddr => $hostname,
         return(0); #if (error) than continue without valign                                         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 $esc_texstring = &uri_escape($$texstring);
 # FIXME      my $valign = &mimetex_valign($esc_texstring);
 # this is the line that calls the new function mimetex_valign above:      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?'.&escape($$texstring).'" style="vertical-align:'.&mimetex_valign($$texstring).'px" alt="$'.$$texstring.'$" />';  
 #  
 # this line is the old implementation  without valign of the images:  
     my $result='<img src="/cgi-bin/mimetex.cgi?'.&escape($$texstring).'" alt="$'.$$texstring.'$" />';  
     if ($displaystyle) {      if ($displaystyle) {
  $result='<center>'.$result.'</center>';   $result='<center>'.$result.'</center>';
     }      }
Line 288  sub converted { Line 316  sub converted {
  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 305  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;
 }  }
Removed from v.1.92  
changed lines
  Added in v.1.100

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