--- loncom/xml/lontexconvert.pm 2005/02/24 01:21:50 1.44 +++ loncom/xml/lontexconvert.pm 2006/09/05 17:33:11 1.76 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # TeX Conversion Module # -# $Id: lontexconvert.pm,v 1.44 2005/02/24 01:21:50 albertel Exp $ +# $Id: lontexconvert.pm,v 1.76 2006/09/05 17:33:11 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -42,44 +42,39 @@ 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; +use lib '/home/httpd/lib/perl/'; +use LONCAPA; + # ====================================================================== 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 ($options =~ /\S/) { + $options = ' '.$options; + } else { + undef($options); + } + if ($env{'browser.mathml'}) { &tth::ttminit(); - if ($ENV{'browser.unicode'}) { - &tth::ttmoptions('-L -u1 '.$options); + if ($env{'browser.unicode'}) { + &tth::ttmoptions('-L -u1'.$options); } else { - &tth::ttmoptions('-L -u0 '.$options); + &tth::ttmoptions('-L -u0'.$options); } } else { &tth::tthinit(); - if ($ENV{'browser.unicode'}) { - &tth::tthoptions('-L -u1 '.$options); + if ($env{'browser.unicode'}) { + &tth::tthoptions('-L -u1'.$options); } else { - &tth::tthoptions('-L -u0 '.$options); + &tth::tthoptions('-L -u0'.$options); } } } -sub header { - $errorstring=''; - my $time=time; - &init_tth(); - return &Apache::lonxml::xmlbegin(). - "\n\n". - &Apache::lonxml::fontsettings(). - &Apache::lonmenu::registerurl(undef,'tex'). - "\n\n"; -} - # ================================================================== Conversion $Apache::lontexconvert::messedup=0; @@ -98,8 +93,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/\/\/g; $xmlstring=~s/\/\/g; @@ -113,16 +108,18 @@ sub convert_real { $xmlstring=~s/^\s*\
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.''; +} -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; +{ + my @jsMath_sent_header; + sub jsMath_reset { + undef(@jsMath_sent_header); + } + sub jsMath_push { + push(@jsMath_sent_header,0); + } + sub jsMath_header { + return '' if $jsMath_sent_header[-1]; + $jsMath_sent_header[-1]=1; + return + ''."\n". + ''."\n"; + } + sub jsMath_process { + my $state = pop(@jsMath_sent_header); + return '' if !$state; + return ''; + } +} + +sub init_math_support { + &init_tth(); + &Apache::lontexconvert::jsMath_push(); + if ($env{'environment.texengine'} eq 'jsMath' || + $env{'form.texengine'} eq 'jsMath' ) { + return &Apache::lontexconvert::jsMath_header(); + } + return; +} + +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 { + 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 +250,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 +289,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 {
@@ -213,15 +309,24 @@ sub msgtexconverted {
 }
 
 sub algebra {
-    my ($string,$target)=@_;
+    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->tostring();
 	$parser->normalize();
 	my $latex=$parser->tolatex();
-	$latex='$$'.$latex.'$$';
+	$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 {
@@ -232,6 +337,43 @@ sub algebra {
     }
 }
 
+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__