version 1.98, 2009/08/12 20:43:25
|
version 1.103, 2010/04/27 20:29:20
|
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 335 sub to_convert {
|
Line 336 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', |
|
'(\<\;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 359 sub smiley {
|
Line 374 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(/(?:\<\;|\<)\/*m\s*(?:\>\;|\>)/i,$message)) { |
foreach my $fragment (split(/(?:\<\;|\<)\/*m\s*(?:\>\;|\>)/i,$message)) { |
Line 380 sub msgtexconverted {
|
Line 394 sub msgtexconverted {
|
foreach my $fragment (split(/(?:\<\;|\<)\/*algebra\s*(?:\>\;|\>)/i, |
foreach my $fragment (split(/(?:\<\;|\<)\/*algebra\s*(?:\>\;|\>)/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 401 sub msgtexconverted {
|
Line 416 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').']'; |