--- loncom/xml/lontexconvert.pm 2005/06/09 02:17:11 1.66 +++ loncom/xml/lontexconvert.pm 2008/12/04 09:51:14 1.92 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # TeX Conversion Module # -# $Id: lontexconvert.pm,v 1.66 2005/06/09 02:17:11 albertel Exp $ +# $Id: lontexconvert.pm,v 1.92 2008/12/04 09:51:14 hauer Exp $ # # Copyright Michigan State University Board of Trustees # @@ -42,53 +42,45 @@ 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; +use LWP::UserAgent; + # ====================================================================== Header sub init_tth { 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); + &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); + &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; -# 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); @@ -114,6 +106,14 @@ 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; } sub clean_out_math_mode { my ($texstring)=@_; - $$texstring=~s/(?!\\)\$//g; + $$texstring=~s/(?'.$$texstring.''; + return &jsMath_header(). + '<'.$tag.' class="math">'.$$texstring.''; +} + +{ + my @jsMath_sent_header; + sub jsMath_reset { + undef(@jsMath_sent_header); + } + sub jsMath_push { + push(@jsMath_sent_header,0); + } + sub jsMath_header { + if (!@jsMath_sent_header) { + &Apache::lonnet::logthis("mismatched calls of jsMath_header and jsMath_process"); + return ''; + } + 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 "\n". + ''."\n"; + } + sub jsMath_state { + my ($level) = @_; + return $jsMath_sent_header[$level]; + } +} + +sub tex_engine { + if (exists($env{'form.texengine'})) { + if ($env{'form.texengine'} ne '') { + return $env{'form.texengine'}; + } + } + if ($env{'request.course.id'} + && exists($env{'course.'.$env{'request.course.id'}.'.texengine'})) { + return $env{'course.'.$env{'request.course.id'}.'.texengine'}; + } + if (exists($env{'environment.texengine'})) { + return $env{'environment.texengine'}; + } + return 'tth'; +} + +sub init_math_support { + my ($inherit_jsmath) = @_; + &init_tth(); + &Apache::lontexconvert::jsMath_push(); + if (lc(&tex_engine()) eq 'jsmath' || + ($inherit_jsmath && &jsMath_state(-2))) { + return &Apache::lontexconvert::jsMath_header(); + } + return; +} + +sub mimetex_valign { + my ($texstring)=@_; + my $ua = LWP::UserAgent->new; #from the perldoc of LWP::UserAgent + $ua->timeout(10); + $ua->env_proxy; + #header without imagedata saved to response: + my $response = $ua->head('http://lcdevhost.localdomain/cgi-bin/mimetex.cgi?'.$texstring); + if ($response->is_success) { + #get the valign-value: + return($response->headers->{'vertical-align'});} + else { + return(0); #if (error) than continue without valign + } } sub mimetex_converted { @@ -177,7 +266,13 @@ sub mimetex_converted { if ($displaystyle) { $$texstring='\\displaystyle \\Large '.$$texstring; } - my $result=''; + +# FIXME +# this is the line that calls the new function mimetex_valign above: +# my $result='$'.$$texstring.'$'; +# +# this line is the old implementation without valign of the images: + my $result='$'.$$texstring.'$'; if ($displaystyle) { $result='
'.$result.'
'; } @@ -185,28 +280,16 @@ sub mimetex_converted { } 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') { - $xmlstring.='
'.$errorstring.'
'; - } else { - &Apache::lonmsg::author_res_msg($env{'request.filename'},$errorstring); - } -# -------------------------------------------------------------------- End Body - $xmlstring.=&Apache::lonxml::xmlend(); - return $xmlstring; + my ($string,$mode)=@_; + if ($mode eq '') { $mode = &tex_engine(); } + 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 @@ -237,8 +320,8 @@ sub smiley { '\:\-(X|\#)' => 'lipsrsealed', '\:\-S' => 'huh'); my $iconpath=$Apache::lonnet::perlvar{'lonIconsURL'}; - foreach (keys %smileys) { - $expression=~s/$_/\/gs; + foreach my $smiley (keys(%smileys)) { + $expression=~s/$smiley/\/gs; } return $expression; } @@ -249,27 +332,34 @@ sub msgtexconverted { &init_tth(); my $outmessage=''; my $tex=0; - foreach (split(/(?:\<\;|\<)\/*m\s*(?:\>\;|\>)/i,$message)) { + foreach my $fragment (split(/(?:\<\;|\<)\/*m\s*(?:\>\;|\>)/i,$message)) { if ($tex) { if ($email) { - $outmessage.=''.&to_convert($_).'
'; $tex=0;
+		$outmessage.='
'.&to_convert($fragment).'
';
+		$tex=0;
 	    } else {
-		$outmessage.=&to_convert($_); $tex=0;
+		$outmessage.=&to_convert($fragment);
+		$tex=0;
 	    }
 	} else {
-            $outmessage.=&smiley($_); $tex=1;
+            $outmessage.=&smiley($fragment);
+	    $tex=1;
 	}
     }
     $message=$outmessage; $outmessage=''; $tex=0;
-    foreach (split(/(?:\<\;|\<)\/*algebra\s*(?:\>\;|\>)/i,$message)) {
+    foreach my $fragment (split(/(?:\<\;|\<)\/*algebra\s*(?:\>\;|\>)/i,
+				$message)) {
 	if ($tex) {
 	    if ($email) {
-		$outmessage.='
'.&algebra($_,'web').'
'; $tex=0;
+		$outmessage.='
'.&algebra($fragment,'web').'
';
+		$tex=0;
 	    } else {
-		$outmessage.=&algebra($_,'web'); $tex=0;
+		$outmessage.=&algebra($fragment,'web');
+		$tex=0;
 	    }
 	} else {
-            $outmessage.=$_; $tex=1;
+            $outmessage.=$fragment;
+	    $tex=1;
 	}
     }
     if (wantarray) {
@@ -282,7 +372,7 @@ sub msgtexconverted {
 sub algebra {
     use AlgParser;
 
-    my ($string,$target,$style)=@_;
+    my ($string,$target,$style,$parstack,$safeeval)=@_;
     my $parser = new AlgParserWithImplicitExpand;
     $string=&prepare_algebra($string);
     my $ret = $parser->parse($string);
@@ -299,7 +389,9 @@ sub algebra {
 	    $latex='\\ensuremath{'.$latex.'}';
 	}
 	if ($target eq 'web' || $target eq 'analyze') {
-	    $result = &converted(\$latex);
+            my $display=&Apache::lonxml::get_param('display',$parstack,$safeeval);
+            $result = &converted(\$latex,$display);
+#	    $result = &converted(\$latex);
 	} else {
 	    $result = $latex;
 	}
@@ -323,9 +415,6 @@ sub postprocess_algebra {
     # 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;
 
@@ -349,8 +438,78 @@ sub postprocess_algebra {
 __END__
 
 
+=pod
+
+=head1 NAME
+
+Apache::lontexconvert;
+
+=head1 SYNOPSIS
+
+Access to tth/ttm
+
+This is part of the LearningOnline Network with CAPA project
+described at http://www.lon-capa.org.
+
+
+=head1 SUBROUTINES
+
+=over
+
+=item init_tth()
+
+Header
+
+=item convert_real()
+
+ 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
+
+=item tth_converted()
+
+
+=item clean_out_math_mode()
+
+
+=item displaystyle()
+
+
+=item jsMath_converted()
+
+
+=item tex_engine()
+
+
+=item init_math_support()
+
+
+=item mimetex_converted()
+
+
+=item converted()
+
+
+=item to_convert()
+
+message display
+
+=item smiley()
+
+???
+
+=item msgtexconverted()
+
+=item algebra()
+
+=item prepare_algebra()
+
+=item postprocess_algebra()
 
+=back
 
+=cut