version 1.76, 2006/09/05 17:33:11
|
version 1.81, 2006/11/09 21:31:54
|
Line 184 sub jsMath_converted {
|
Line 184 sub jsMath_converted {
|
push(@jsMath_sent_header,0); |
push(@jsMath_sent_header,0); |
} |
} |
sub jsMath_header { |
sub jsMath_header { |
|
if (!@jsMath_sent_header) { |
|
&Apache::lonnet::logthis("mismatched calls of jsMath_header and jsMath_process"); |
|
return ''; |
|
} |
return '' if $jsMath_sent_header[-1]; |
return '' if $jsMath_sent_header[-1]; |
$jsMath_sent_header[-1]=1; |
$jsMath_sent_header[-1]=1; |
return |
return |
'<script type="text/javascript"> |
'<script type="text/javascript"> |
function NoFontMessage () {} |
function NoFontMessage () {} |
|
jsMath = {Parser: {prototype: {environments: {\'eqnarray*\' :[\'Array\',null,null,\'rcl\',[5/18,5/18],3,\'D\']}}}}; |
</script>'."\n". |
</script>'."\n". |
'<script type="text/javascript" src="/adm/jsMath/jsMath.js"></script>'."\n"; |
'<script type="text/javascript" src="/adm/jsMath/jsMath.js"></script>'."\n"; |
} |
} |
sub jsMath_process { |
sub jsMath_process { |
my $state = pop(@jsMath_sent_header); |
my $state = pop(@jsMath_sent_header); |
return '' if !$state; |
return '' if !$state; |
return '<script type="text/javascript">jsMath.Process()</script>'; |
return "\n". |
|
'<script type="text/javascript">jsMath.Process()</script>'."\n"; |
} |
} |
} |
} |
|
|
Line 266 sub smiley {
|
Line 272 sub smiley {
|
'\:\-(X|\#)' => 'lipsrsealed', |
'\:\-(X|\#)' => 'lipsrsealed', |
'\:\-S' => 'huh'); |
'\:\-S' => 'huh'); |
my $iconpath=$Apache::lonnet::perlvar{'lonIconsURL'}; |
my $iconpath=$Apache::lonnet::perlvar{'lonIconsURL'}; |
foreach (keys %smileys) { |
foreach my $smiley (keys(%smileys)) { |
$expression=~s/$_/\<img src="$iconpath\/$smileys{$_}.gif" \/\>/gs; |
$expression=~s/$smiley/\<img src="$iconpath\/$smileys{$smiley}.gif" \/\>/gs; |
} |
} |
return $expression; |
return $expression; |
} |
} |
Line 278 sub msgtexconverted {
|
Line 284 sub msgtexconverted {
|
&init_tth(); |
&init_tth(); |
my $outmessage=''; |
my $outmessage=''; |
my $tex=0; |
my $tex=0; |
foreach (split(/(?:\<\;|\<)\/*m\s*(?:\>\;|\>)/i,$message)) { |
foreach my $fragment (split(/(?:\<\;|\<)\/*m\s*(?:\>\;|\>)/i,$message)) { |
if ($tex) { |
if ($tex) { |
if ($email) { |
if ($email) { |
$outmessage.='</pre><tt>'.&to_convert($_).'</tt><pre>'; $tex=0; |
$outmessage.='</pre><tt>'.&to_convert($fragment).'</tt><pre>'; |
|
$tex=0; |
} else { |
} else { |
$outmessage.=&to_convert($_); $tex=0; |
$outmessage.=&to_convert($fragment); |
|
$tex=0; |
} |
} |
} else { |
} else { |
$outmessage.=&smiley($_); $tex=1; |
$outmessage.=&smiley($fragment); |
|
$tex=1; |
} |
} |
} |
} |
$message=$outmessage; $outmessage=''; $tex=0; |
$message=$outmessage; $outmessage=''; $tex=0; |
foreach (split(/(?:\<\;|\<)\/*algebra\s*(?:\>\;|\>)/i,$message)) { |
foreach my $fragment (split(/(?:\<\;|\<)\/*algebra\s*(?:\>\;|\>)/i, |
|
$message)) { |
if ($tex) { |
if ($tex) { |
if ($email) { |
if ($email) { |
$outmessage.='</pre><tt>'.&algebra($_,'web').'</tt><pre>'; $tex=0; |
$outmessage.='</pre><tt>'.&algebra($fragment,'web').'</tt><pre>'; |
|
$tex=0; |
} else { |
} else { |
$outmessage.=&algebra($_,'web'); $tex=0; |
$outmessage.=&algebra($fragment,'web'); |
|
$tex=0; |
} |
} |
} else { |
} else { |
$outmessage.=$_; $tex=1; |
$outmessage.=$fragment; |
|
$tex=1; |
} |
} |
} |
} |
if (wantarray) { |
if (wantarray) { |
Line 352 sub postprocess_algebra {
|
Line 365 sub postprocess_algebra {
|
# moodle had these and I don't know why, ignoring them for now |
# moodle had these and I don't know why, ignoring them for now |
# $string =~s/\\fun/ /g; |
# $string =~s/\\fun/ /g; |
|
|
# remove the extra () in the denominator of a \frac |
|
$string =~s/\\frac{(.+?)}{\\left\((.+?)\\right\)}/\\frac{$1}{$2}/gs; |
|
|
|
# sqrt(3,4) means the 4 root of 3 |
# sqrt(3,4) means the 4 root of 3 |
$string =~s/\\sqrt{([^,]+),([^\}]+)}/\\sqrt[$2]{$1}/gs; |
$string =~s/\\sqrt{([^,]+),([^\}]+)}/\\sqrt[$2]{$1}/gs; |
|
|