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

Diff for /loncom/xml/lontexconvert.pm between versions 1.95 and 1.104

version 1.95, 2009/01/12 04:46:48 version 1.104, 2010/06/10 15:54:06
Line 262  sub mimetex_valign { Line 262  sub mimetex_valign {
                                         Proto    => 'tcp');                                          Proto    => 'tcp');
     }      }
     if ($socket) {      if ($socket) {
         my $headreq = "HEAD $path HTTP/1.0\r\nUser-Agent: Mozilla/5.0\r\n\r\n";          my $headreq = "HEAD $path HTTP/1.0\r\n\r\n";
         print $socket $headreq;          print $socket $headreq;
         while (<$socket>) {          while (<$socket>) {
             if (/Vertical\-Align\:\s*?([\-\d]+)/) {              if (/Vertical\-Align\:\s*?([\-\d]+)/) {
Line 282  sub mimetex_valign { Line 282  sub mimetex_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) {
Line 291  sub mimetex_converted { Line 300  sub mimetex_converted {
     }      }
     my $esc_texstring = &uri_escape($$texstring);      my $esc_texstring = &uri_escape($$texstring);
     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="$'.$$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 307  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 315  sub converted { Line 326  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 323  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; }      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 348  sub smiley { Line 373  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 369  sub msgtexconverted { Line 393  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 390  sub msgtexconverted { Line 415  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').']';
Removed from v.1.95  
changed lines
  Added in v.1.104

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