\<\/p\>/g;
- $errorstring.=&tth::ttmerror();
- } else {
- $xmlstring=&tth::tth($$texstring);
- $errorstring.=&tth::ttherror();
- $xmlstring=~s---g;
- }
- $xmlstring=~s/^\s*//;
- $xmlstring=~s/\s*$//;
- }
+ ($xmlstring,$errorstring)=&convert_real($texstring)
ENDCONV
if ($@) {
- $errorstring.=&mt("Evaluation Error ").$@;
+ $errorstring.=&mt("Evaluation Error: ").$@;
$Apache::lontexconvert::messedup=1;
}
- if ($Apache::lontexconvert::messedup || &tth::tthmessedup()) {
+ if ($Apache::lontexconvert::messedup || &tth::tthmessedup() ||
+ $errorstring) {
&Apache::lonnet::logthis("Trying to kill myself");
$Apache::lontexconvert::messedup=1;
- my $request=Apache->request();
- $request->child_terminate();
+ if (ref($Apache::lonxml::request)) {
+ $Apache::lonxml::request->child_terminate();
+ } else {
+ my $request;
+ eval { $request=Apache->request; };
+ if (!$request) {
+ eval { $request=Apache2::RequestUtil->request; };
+ }
+ if ($request) {
+ $request->child_terminate();
+ } else {
+ &Apache::lonnet::logthis("Unable to find a request to do child_terminate on");
+ }
+ }
}
return $xmlstring;
}
-# ====================================================================== Footer
+sub clean_out_math_mode {
+ my ($texstring)=@_;
+ $$texstring=~s/(?!\\)\$//g;
+ $$texstring=~s/\\[\)\(\]\[]//g;
+ $$texstring=~s/\\ensuremath//g;
+ return '';
+}
+
+sub displaystyle {
+ my ($texstring)=@_;
+ #has a $$ or \[ or \displaystyle in it, guessinng it's display mode
+ if ($$texstring=~/[^\\]\$\$/ ||
+ $$texstring=~/\\\[/ ||
+ $$texstring=~/\\displaystyle/) { return 1; }
+ return 0;
+}
+
+sub jsMath_converted {
+ my $texstring=shift;
+ my $tag='span';
+ if (&displaystyle($texstring)) { $tag='div'; }
+ &clean_out_math_mode($texstring);
+ return &jsMath_header().
+ '<'.$tag.' class="math">'.$$texstring.'';
+}
+
+{
+ my $jsMath_sent_header;
+ sub jsMath_reset {
+ $jsMath_sent_header=0;
+ }
+ sub jsMath_header {
+ return '' if $jsMath_sent_header;
+ $jsMath_sent_header=1;
+ return
+ ''."\n".
+ ''."\n";
+ }
+ sub jsMath_process {
+ return '' if !$jsMath_sent_header;
+ return '';
+ }
+}
+
+sub mimetex_converted {
+ my $texstring=shift;
+ my $displaystyle=&displaystyle($texstring);
+
+ &clean_out_math_mode($texstring);
-sub footer {
- my $xmlstring='';
- if ($ENV{'request.state'} eq 'construct') {
- $xmlstring.=''.$errorstring.'';
- } else {
- &Apache::lonmsg::author_res_msg($ENV{'request.filename'},$errorstring);
- }
-# -------------------------------------------------------------------- End Body
- $xmlstring.=&Apache::lonxml::xmlend();
- return $xmlstring;
+ if ($displaystyle) {
+ $$texstring='\\displaystyle \\Large '.$$texstring;
+ }
+ my $result='.')
';
+ if ($displaystyle) {
+ $result=''.$result.'';
+ }
+ return $result;
+}
+
+sub converted {
+ my ($string,$mode)=@_;
+ if ($mode eq '') { $mode=$env{'environment.texengine'}; }
+ if ($mode =~ /tth/i) {
+ return &tth_converted($string);
+ } elsif ($mode =~ /jsmath/i) {
+ return &jsMath_converted($string);
+ } elsif ($mode =~ /mimetex/i) {
+ return &mimetex_converted($string);
+ }
+ return &tth_converted($string);
}
# ------------------------------------------------------------ Message display
@@ -148,7 +231,7 @@ sub to_convert {
sub smiley {
my $expression=shift;
- if ($ENV{'browser.imagesuppress'} eq 'on') { return $expression; }
+ if ($env{'browser.imagesuppress'} eq 'on') { return $expression; }
my %smileys=('\:\-\)' => 'smiley',
'8\-\)' => 'coolsmile',
'8\-(I|\|)' => 'coolindiff',
@@ -171,8 +254,7 @@ sub smiley {
}
sub msgtexconverted {
- my $message=shift;
- my $email=shift;
+ my ($message,$email) = @_;
$errorstring='';
&init_tth();
my $outmessage='';
@@ -188,6 +270,18 @@ sub msgtexconverted {
$outmessage.=&smiley($_); $tex=1;
}
}
+ $message=$outmessage; $outmessage=''; $tex=0;
+ foreach (split(/(?:\<\;|\<)\/*algebra\s*(?:\>\;|\>)/i,$message)) {
+ if ($tex) {
+ if ($email) {
+ $outmessage.=''.&algebra($_,'web').''; $tex=0;
+ } else {
+ $outmessage.=&algebra($_,'web'); $tex=0;
+ }
+ } else {
+ $outmessage.=$_; $tex=1;
+ }
+ }
if (wantarray) {
return ($outmessage,$errorstring);
} else {
@@ -195,6 +289,72 @@ 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 {
+ # style is 'inline'
+ $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;
+
+ # 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;
+ return $string;
+}
1;
__END__