--- loncom/xml/lontexconvert.pm 2003/02/26 20:22:11 1.18 +++ loncom/xml/lontexconvert.pm 2005/06/09 02:17:11 1.66 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # TeX Conversion Module # -# $Id: lontexconvert.pm,v 1.18 2003/02/26 20:22:11 albertel Exp $ +# $Id: lontexconvert.pm,v 1.66 2005/06/09 02:17:11 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -36,76 +36,173 @@ # 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; use strict; -use tth; +use tth(); use vars qw($errorstring); -use Apache::lonmsg; -use Apache::lonxml; -use Apache::lonmenu; +use Apache(); +use Apache::lonmsg(); +use Apache::lonxml(); +use Apache::lonmenu(); +use Apache::lonlocal; +use Apache::lonnet; # ====================================================================== Header +sub init_tth { + my $options=$env{'course.'.$env{'request.course.id'}.'.tthoptions'}; + if ($env{'browser.mathml'}) { + &tth::ttminit(); + if ($env{'browser.unicode'}) { + &tth::ttmoptions('-L -u1 '.$options); + } else { + &tth::ttmoptions('-L -u0 '.$options); + } + } else { + &tth::tthinit(); + if ($env{'browser.unicode'}) { + &tth::tthoptions('-L -u1 '.$options); + } else { + &tth::tthoptions('-L -u0 '.$options); + } + } +} + sub header { - $errorstring=''; - my $time=time; - 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'); - } - } - return &Apache::lonxml::xmlbegin(). - &Apache::lonxml::fontsettings(). - "\n\n". - &Apache::lonmenu::registerurl(undef,'tex'). - "\n\n"; + $errorstring=''; + my $time=time; + &init_tth(); + return &Apache::lonxml::xmlbegin(). + "\n\n". + &Apache::lonxml::fontsettings(). + &Apache::lonmenu::registerurl(undef,'tex'). + "\n\n"; } # ================================================================== Conversion -sub converted { - my $texstring=shift; - my $xmlstring='[UNDISPLAYABLE]'; - eval(<<'ENDCONV'); - { - local $SIG{SEGV}=sub { die; }; - if ($ENV{'browser.mathml'}) { - $xmlstring=&tth::ttm($$texstring); - $xmlstring=~s/\/\/g; - $xmlstring=~s/\/\/g; - $xmlstring=~s/\/\\<\/p\>/g; - $errorstring.=&tth::ttmerror(); +$Apache::lontexconvert::messedup=0; + +# we need this routine because &converted can get called from inside +# of the safespace (through &xmlparse('stuff') which doesn't +# allow the opcode for alarm, so we need to compile this before we get +# into the safe space since opcode checks only occur at compile time +sub convert_real { + my ($texstring)=@_; + 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"); + }; + &Apache::lonxml::start_alarm(); + if ($env{'browser.mathml'}) { + $xmlstring=&tth::ttm($$texstring); + $xmlstring=~s/\/\/g; + $xmlstring=~s/\/\/g; + $xmlstring=~s/\/\\<\/p\>/g; + $errorstring.=&tth::ttmerror(); } else { - $xmlstring=&tth::tth($$texstring); - $errorstring.=&tth::ttherror(); + $xmlstring=&tth::tth($$texstring); + $errorstring.=&tth::ttherror(); + $xmlstring=~s---g; } - } + $xmlstring=~s/^\s*\
request(); + $request->child_terminate(); + } + 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 { my $xmlstring=''; - if ($ENV{'request.state'} eq 'construct') { + if ($env{'request.state'} eq 'construct') { $xmlstring.='
'.$errorstring.'
'; } else { - &Apache::lonmsg::author_res_msg($ENV{'request.filename'},$errorstring); + &Apache::lonmsg::author_res_msg($env{'request.filename'},$errorstring); } # -------------------------------------------------------------------- End Body $xmlstring.=&Apache::lonxml::xmlend(); @@ -116,37 +213,138 @@ sub footer { sub to_convert { my ($string) = @_; - $string=~s/\/ /g; + $string=~s/\/ /gs; +# $string=~s/\s/ /gs; $string=&HTML::Entities::decode($string); return &converted(\$string); } -sub msgtexconverted { - my $message=shift; +sub smiley { + 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,$email) = @_; $errorstring=''; - if ($ENV{'browser.mathml'}) { - &tth::ttminit(); - if ($ENV{'browser.unicode'}) { - &tth::ttmoptions('-L -u1'); + &init_tth(); + my $outmessage=''; + my $tex=0; + foreach (split(/(?:\<\;|\<)\/*m\s*(?:\>\;|\>)/i,$message)) { + if ($tex) { + if ($email) { + $outmessage.=''.&to_convert($_).'
'; $tex=0;
+	    } else {
+		$outmessage.=&to_convert($_); $tex=0;
+	    }
+	} else {
+            $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 {
-	    &tth::ttmoptions('-L -u0');
+            $outmessage.=$_; $tex=1;
 	}
+    }
+    if (wantarray) {
+	return ($outmessage,$errorstring);
     } else {
-	&tth::tthinit();
-	if ($ENV{'browser.unicode'}) {
-	    &tth::tthoptions('-L -u1');
+	return $outmessage.$errorstring;
+    }
+}
+
+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 {
-	    &tth::tthoptions('-L -u0');
+	    # 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'});
     }
-    $message=~s/(\$\$.+?\$\$)/&to_convert($1)/ge;
-    $message=~s/(\$.+?\$)/&to_convert($1)/ge;
-    $message=~s/(\\\(.+?\\\))/&to_convert($1)/ge;
-    $message=~s/(\\\[.+?\\\])/&to_convert($1)/ge;
-    return $message.$errorstring;
 }
 
+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__