--- loncom/xml/lontexconvert.pm 2004/03/19 17:54:17 1.36
+++ loncom/xml/lontexconvert.pm 2005/02/28 19:08:11 1.62
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# TeX Conversion Module
#
-# $Id: lontexconvert.pm,v 1.36 2004/03/19 17:54:17 albertel Exp $
+# $Id: lontexconvert.pm,v 1.62 2005/02/28 19:08:11 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -36,8 +36,6 @@
# The C source of the Code may not be distributed by the Licensee
# to any other parties under any circumstances.
#
-# 05/29/00,05/30,10/11,10/20 Gerd Kortemeyer
-# 5/4 Gerd Kortemeyer
package Apache::lontexconvert;
@@ -76,8 +74,8 @@ sub header {
my $time=time;
&init_tth();
return &Apache::lonxml::xmlbegin().
- &Apache::lonxml::fontsettings().
"\n\n".
+ &Apache::lonxml::fontsettings().
&Apache::lonmenu::registerurl(undef,'tex').
"\n\n";
}
@@ -95,6 +93,7 @@ sub convert_real {
my ($xmlstring,$errorstring);
local $SIG{SEGV}=sub { $Apache::lontexconvert::messedup=1; die; };
local $SIG{ALRM}=sub {
+ &Apache::lonnet::logthis("ALRM");
$xmlstring='['.&mt("TeX unconverted due to errors").']';
$Apache::lontexconvert::messedup=1;
die &mt("TeX unconverted due to errors");
@@ -111,18 +110,21 @@ sub convert_real {
$errorstring.=&tth::ttherror();
$xmlstring=~s---g;
}
+ $xmlstring=~s/^\s*\
request();
@@ -139,6 +142,58 @@ ENDCONV
return $xmlstring;
}
+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 '<'.$tag.' class="math">'.$$texstring.'';
+}
+
+sub mimetex_converted {
+ my $texstring=shift;
+ my $displaystyle=&displaystyle($texstring);
+
+ &clean_out_math_mode($texstring);
+
+ if ($displaystyle) {
+ $$texstring='\\displaystyle \\Large '.$$texstring;
+ }
+ my $result='.')
';
+ if ($displaystyle) {
+ $result=''.$result.'';
+ }
+ return $result;
+}
+
+sub converted {
+ if ($ENV{'environment.texengine'} eq 'tth') {
+ return &tth_converted;
+ } elsif ($ENV{'environment.texengine'} eq 'jsMath') {
+ return &jsMath_converted;
+ } elsif ($ENV{'environment.texengine'} eq 'mimetex') {
+ return &mimetex_converted;
+ }
+ return &tth_converted;
+}
+
# ====================================================================== Footer
sub footer {
@@ -188,8 +243,7 @@ sub smiley {
}
sub msgtexconverted {
- my $message=shift;
- my $email=shift;
+ my ($message,$email) = @_;
$errorstring='';
&init_tth();
my $outmessage='';
@@ -212,6 +266,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 {
+ # 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;
+
+ # 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;
+ return $string;
+}
1;
__END__