/ /gs;
- $string=~s/\s/ /gs;
+# $string=~s/\s/ /gs;
$string=&HTML::Entities::decode($string);
return &converted(\$string);
}
sub smiley {
- my $expression=shift;
- if ($ENV{'browser.imagesuppress'} eq 'on') { return $expression; }
- my %smileys=('\:\-*\)' => 'smiley',
- '8\-*\)' => 'coolsmile',
- '8\-*I' => 'coolindiff',
- ':\-*\(' => 'frowny',
- '\:\-*(o|O|\(\))' => 'shocked',
- '\;\-*\)' => 'wink',
- '\:\-*P' => 'baeh',
- '\:\-(\\\|\\/)' => 'hrrm',
- '\:\-*D' => 'bigsmile',
- '\:\-*C' => 'angry',
- '\:(\'|\`)\-*\(' => 'cry',
- '\:\-*(X|\#)' => 'lipsrsealed',
- '\:\-*S' => 'huh');
- my $iconpath=$Apache::lonnet::perlvar{'lonIconsURL'};
- foreach (keys %smileys) {
- $expression=~s/$_/\
/gs;
- }
- return $expression;
+ my $expression=shift;
+ if ($ENV{'browser.imagesuppress'} eq 'on') { return $expression; }
+ my %smileys=('\:\-\)' => 'smiley',
+ '8\-\)' => 'coolsmile',
+ '8\-(I|\|)' => 'coolindiff',
+ ':\-(I|\|)' => 'neutral',
+ '\:\-(o|O|\(\))' => 'shocked',
+ ':\-\(' => 'frowny',
+ '\;\-\)' => 'wink',
+ '\:\-P' => 'baeh',
+ '\:\-(\\\|\\/)' => 'hrrm',
+ '\:\-D' => 'bigsmile',
+ '\:\-C' => 'angry',
+ '\:(\'|\`)\-\(' => 'cry',
+ '\:\-(X|\#)' => 'lipsrsealed',
+ '\:\-S' => 'huh');
+ my $iconpath=$Apache::lonnet::perlvar{'lonIconsURL'};
+ foreach (keys %smileys) {
+ $expression=~s/$_/\/gs;
+ }
+ return $expression;
}
sub msgtexconverted {
- my $message=shift;
-
+ my ($message,$email) = @_;
$errorstring='';
- if ($ENV{'browser.mathml'}) {
- &tth::ttminit();
- if ($ENV{'browser.unicode'}) {
- &tth::ttmoptions('-L -u1');
- } else {
- &tth::ttmoptions('-L -u0');
- }
- } else {
- &tth::tthinit();
- if ($ENV{'browser.unicode'}) {
- &tth::tthoptions('-L -u1');
- } else {
- &tth::tthoptions('-L -u0');
- }
- }
+ &init_tth();
my $outmessage='';
my $tex=0;
foreach (split(/(?:\<\;|\<)\/*m\s*(?:\>\;|\>)/i,$message)) {
if ($tex) {
- $outmessage.=&to_convert($_); $tex=0;
+ if ($email) {
+ $outmessage.=''.&to_convert($_).''; $tex=0;
+ } else {
+ $outmessage.=&to_convert($_); $tex=0;
+ }
} else {
$outmessage.=&smiley($_); $tex=1;
}
@@ -193,6 +235,76 @@ sub msgtexconverted {
}
}
+sub algebra {
+ use AlgParser;
+
+ my ($string,$target,$style)=@_;
+ my $parser = new AlgParserWithImplicitExpand;
+ $string=&prepare_algebra($string);
+ my $ret = $parser->parse($string);
+ my $result='['.&mt('Algebra unconverted due to previous errors').']';
+ if ( ref($ret) ) {
+ #$parser->tostring();
+ $parser->normalize();
+ my $latex=$parser->tolatex();
+ $latex=&postprocess_algebra($latex);
+ if ($style eq 'display') {
+ $latex='$$'.$latex.'$$x';
+ } else {
+ $latex='\\ensuremath{'.$latex.'}';
+ }
+ if ($target eq 'web' || $target eq 'analyze') {
+ $result = &converted(\$latex);
+ } else {
+ $result = $latex;
+ }
+ } else {
+ &Apache::lonxml::error($parser->{'htmlerror'});
+ }
+}
+
+sub prepare_algebra {
+ my ($string)=@_;
+
+ # makes the decision about what is a minus sign easier supposedly
+ $string =~ s/(\<\>|\<\=|\>\=[\=\>\<] *)-/$1 zeroplace -/g;
+
+ return $string;
+}
+
+sub postprocess_algebra {
+ my ($string)=@_;
+
+ # moodle had these and I don't know why, ignoring them for now
+ # $string =~s/\\fun/ /g;
+
+ # sqrt(3,4) -> \sqrt\let{3,4\right}, which is annoying
+ $string =~s/\\left\{/\{/g;
+ $string =~s/\\right\}/\}/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
+ $string =~s/\\sqrt{([^,]+),([^\}]+)}/\\sqrt[$2]{$1}/gs;
+
+ # log(3,4) means the log base 4 of 3
+ $string =~s/\\log\\left\((.+?),(.+?)\\right\)/\\log_{$2}\\left($1\\right)/gs;
+
+ # log(3,4) means the log base 4 of 3
+ $string =~s/\\((?:sin|cos|tan|sec|csc|cot)(?:h)?)\\left\((.+?),(.+?)\\right\)/\\$1^{$3}\\left($2\\right)/gs;
+
+ # int(3,a,b) integral from a to b of 3
+ $string =~s/\\int\\left\((.+?),(.+?),(.+?)\\right\)/\\int_{$2}^{$3}\\left($1\\right)/gs;
+
+ # int( ... dx) -> ...
+ $string =~s/\\int\\left\((.+?)d[a-z]\\right\)/$1/gs;
+
+ #
+ $string =~s/\\lim\\left\((.+?),(.+?),(.+?)\\right\)/\\lim_{$2\\to $3}$1/gs;
+ &Apache::lonnet::logthis($string);
+ return $string;
+}
1;
__END__