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

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

version 1.99, 2009/12/09 23:02:43 version 1.104, 2010/06/10 15:54:06
Line 326  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 334  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=(
     '\:\-*\)' => 'face-smile.png',      '\:\-*\)' => 'face-smile.png',
  '8\-*\)'  => 'face-cool.png',   '8\-\)'  => 'face-cool.png',
  '8\-*(I|\|)'   => 'face-glasses.png',   '8\-(I|\|)'   => 'face-glasses.png',
  ':\-*(I|\|)'   => 'face-plain.png',   '\:\-(I|\|)'   => 'face-plain.png',
  '\:\-(o|O|\(\))' => 'face-surprise.png',   '\:\-(o|O|\(\))' => 'face-surprise.png',
  ':\-*\('  => 'face-sad.png',   ':\-\('  => 'face-sad.png',
  '\;\-*\)' => 'face-wink.png',   '\;\-\)' => 'face-wink.png',
  '\:\-*(P|p)'  => 'face-raspberry.png',   '\:\-(P|p)'  => 'face-raspberry.png',
  '\:\-*(\\\|\\/)' => 'face-uncertain.png',   '\:\-(\\\|\\/)' => 'face-uncertain.png',
  '\:\-*D'  => 'face-smile-big.png',   '\:\-D'  => 'face-smile-big.png',
  '\:\-*(C|\@)'  => 'face-angry.png',   '\:\-(C|\@)'  => 'face-angry.png',
  '\:(\'|\`)\-*\(' => 'face-crying.png',   '\:(\'|\`)\-*\(' => 'face-crying.png',
  '\:\-*(X|x|\#)' => 'face-quiet.png',   '\:\-(X|x|\#)' => 'face-quiet.png',
  '\:\-*(s|S)' => 'face-uncertain.png',   '\:\-(s|S)' => 'face-uncertain.png',
  '\:\-*\$' => 'face-embarrassed.png',   '\:\-\$' => 'face-embarrassed.png',
  '\:\-*\*' => 'face-kiss.png',   '\:\-\*' => 'face-kiss.png',
  '\+O\(' => 'face-sick.png',   '\+O\(' => 'face-sick.png',
  '(\&lt\;3|\(heart\))' => 'heart.png',   '(\&lt\;3|\(heart\))' => 'heart.png',
  '\(rose\)' => 'rose.png',   '\(rose\)' => 'rose.png',
Line 361  sub smiley { Line 361  sub smiley {
  '\(pirate\)' => 'face-pirate.png',   '\(pirate\)' => 'face-pirate.png',
  '\((agree|yes)\)' => 'opinion-agree.png',   '\((agree|yes)\)' => 'opinion-agree.png',
  '\((disagree|nay)\)' => 'opinion-disagree.png',   '\((disagree|nay)\)' => 'opinion-disagree.png',
  '(o|O)\-*\)' => 'face-angel.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)) {
Line 373  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 394  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 415  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.99  
changed lines
  Added in v.1.104

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