version 1.101, 2010/01/26 01:16:30
|
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', |
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(/(?:\<\;|\<)\/*m\s*(?:\>\;|\>)/i,$message)) { |
foreach my $fragment (split(/(?:\<\;|\<)\/*m\s*(?:\>\;|\>)/i,$message)) { |
Line 394 sub msgtexconverted {
|
Line 393 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 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').']'; |