--- loncom/xml/lontexconvert.pm 2005/02/24 09:28:54 1.51
+++ loncom/xml/lontexconvert.pm 2006/05/17 22:08:08 1.73
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# TeX Conversion Module
#
-# $Id: lontexconvert.pm,v 1.51 2005/02/24 09:28:54 albertel Exp $
+# $Id: lontexconvert.pm,v 1.73 2006/05/17 22:08:08 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -42,26 +42,24 @@ package Apache::lontexconvert;
use strict;
use tth();
use vars qw($errorstring);
-use Apache();
-use Apache::lonmsg();
-use Apache::lonxml();
-use Apache::lonmenu();
+#use Apache::lonxml();
use Apache::lonlocal;
+use Apache::lonnet;
# ====================================================================== Header
sub init_tth {
- my $options=$ENV{'course.'.$ENV{'request.course.id'}.'.tthoptions'};
- if ($ENV{'browser.mathml'}) {
+ my $options=$env{'course.'.$env{'request.course.id'}.'.tthoptions'};
+ if ($env{'browser.mathml'}) {
&tth::ttminit();
- if ($ENV{'browser.unicode'}) {
+ if ($env{'browser.unicode'}) {
&tth::ttmoptions('-L -u1 '.$options);
} else {
&tth::ttmoptions('-L -u0 '.$options);
}
} else {
&tth::tthinit();
- if ($ENV{'browser.unicode'}) {
+ if ($env{'browser.unicode'}) {
&tth::tthoptions('-L -u1 '.$options);
} else {
&tth::tthoptions('-L -u0 '.$options);
@@ -69,17 +67,6 @@ sub init_tth {
}
}
-sub header {
- $errorstring='';
- my $time=time;
- &init_tth();
- return &Apache::lonxml::xmlbegin().
- "\n<head>\n".
- &Apache::lonxml::fontsettings().
- &Apache::lonmenu::registerurl(undef,'tex').
- "\n</head>\n";
-}
-
# ================================================================== Conversion
$Apache::lontexconvert::messedup=0;
@@ -98,8 +85,8 @@ sub convert_real {
$Apache::lontexconvert::messedup=1;
die &mt("TeX unconverted due to errors");
};
- alarm($Apache::lonnet::perlvar{'lonScriptTimeout'});
- if ($ENV{'browser.mathml'}) {
+ &Apache::lonxml::start_alarm();
+ if ($env{'browser.mathml'}) {
$xmlstring=&tth::ttm($$texstring);
$xmlstring=~s/\<math\>/\<math xmlns=\"\&mathns\;\"\>/g;
$xmlstring=~s/\<br\>/\<br\/\>/g;
@@ -113,16 +100,18 @@ sub convert_real {
$xmlstring=~s/^\s*\<br clear\=\"all\"/\<br/s;
$xmlstring=~s/^\s*//;
$xmlstring=~s/\s*$//;
- alarm(0);
+ &Apache::lonxml::end_alarm();
return ($xmlstring,$errorstring);
}
-sub converted {
+sub tth_converted {
my $texstring=shift;
my $xmlstring='['.&mt('UNDISPLAYABLE').']';
if ($Apache::lontexconvert::messedup) {
return '['.&mt('TeX unconverted due to previous errors').']';
}
+ $$texstring ='\\documentstyle{article}'.$$texstring;
+
eval(<<'ENDCONV');
($xmlstring,$errorstring)=&convert_real($texstring)
ENDCONV
@@ -134,24 +123,107 @@ ENDCONV
$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.'</'.$tag.'>';
+}
+
+{
+ my $jsMath_sent_header;
+ sub jsMath_reset {
+ $jsMath_sent_header=0;
+ }
+ sub jsMath_header {
+ return '' if $jsMath_sent_header;
+ $jsMath_sent_header=1;
+ return
+ '<script type="text/javascript">
+ function NoFontMessage () {}
+ </script>'."\n".
+ '<script type="text/javascript" src="/adm/jsMath/jsMath.js"></script>'."\n";
+ }
+ sub jsMath_process {
+ return '' if !$jsMath_sent_header;
+ return '<script type="text/javascript">jsMath.Process()</script>';
+ }
+}
+
+sub init_math_support {
+ &init_tth();
+ &Apache::lontexconvert::jsMath_reset();
+ if ($env{'environment.texengine'} eq 'jsMath' ||
+ $env{'form.texengine'} eq 'jsMath' ) {
+ return &Apache::lontexconvert::jsMath_header();
+ }
+ return;
+}
-sub footer {
- my $xmlstring='';
- if ($ENV{'request.state'} eq 'construct') {
- $xmlstring.='<address>'.$errorstring.'</address>';
- } else {
- &Apache::lonmsg::author_res_msg($ENV{'request.filename'},$errorstring);
- }
-# -------------------------------------------------------------------- End Body
- $xmlstring.=&Apache::lonxml::xmlend();
- return $xmlstring;
+sub mimetex_converted {
+ my $texstring=shift;
+ my $displaystyle=&displaystyle($texstring);
+
+ &clean_out_math_mode($texstring);
+
+ if ($displaystyle) {
+ $$texstring='\\displaystyle \\Large '.$$texstring;
+ }
+ my $result='<img src="/cgi-bin/mimetex.cgi?'.&Apache::lonnet::escape($$texstring).'" />';
+ if ($displaystyle) {
+ $result='<center>'.$result.'</center>';
+ }
+ 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
@@ -166,7 +238,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',
@@ -205,6 +277,18 @@ sub msgtexconverted {
$outmessage.=&smiley($_); $tex=1;
}
}
+ $message=$outmessage; $outmessage=''; $tex=0;
+ foreach (split(/(?:\<\;|\<)\/*algebra\s*(?:\>\;|\>)/i,$message)) {
+ if ($tex) {
+ if ($email) {
+ $outmessage.='</pre><tt>'.&algebra($_,'web').'</tt><pre>'; $tex=0;
+ } else {
+ $outmessage.=&algebra($_,'web'); $tex=0;
+ }
+ } else {
+ $outmessage.=$_; $tex=1;
+ }
+ }
if (wantarray) {
return ($outmessage,$errorstring);
} else {
@@ -215,7 +299,7 @@ sub msgtexconverted {
sub algebra {
use AlgParser;
- my ($string,$target)=@_;
+ my ($string,$target,$style)=@_;
my $parser = new AlgParserWithImplicitExpand;
$string=&prepare_algebra($string);
my $ret = $parser->parse($string);
@@ -225,7 +309,12 @@ sub algebra {
$parser->normalize();
my $latex=$parser->tolatex();
$latex=&postprocess_algebra($latex);
- $latex='$'.$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 {
@@ -240,7 +329,7 @@ sub prepare_algebra {
my ($string)=@_;
# makes the decision about what is a minus sign easier supposedly
- $string =~ s/([\=\>\<\%\!\#] *)-/$1 zeroplace -/g;
+ $string =~ s/(\<\>|\<\=|\>\=[\=\>\<] *)-/$1 zeroplace -/g;
return $string;
}
@@ -251,14 +340,26 @@ sub postprocess_algebra {
# 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;
+ $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;
- &Apache::lonnet::logthis($string);
+ #
+ $string =~s/\\lim\\left\((.+?),(.+?),(.+?)\\right\)/\\lim_{$2\\to $3}$1/gs;
return $string;
}
1;