--- loncom/xml/lontexconvert.pm	2005/02/24 05:26:00	1.46
+++ loncom/xml/lontexconvert.pm	2005/04/07 06:56:27	1.65
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # TeX Conversion Module
 #
-# $Id: lontexconvert.pm,v 1.46 2005/02/24 05:26:00 albertel Exp $
+# $Id: lontexconvert.pm,v 1.65 2005/04/07 06:56:27 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -47,21 +47,22 @@ 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'}) {
+    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);
@@ -98,8 +99,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 +114,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
@@ -140,14 +143,66 @@ 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.'</'.$tag.'>';
+}
+
+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 {
+    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.='<address>'.$errorstring.'</address>';
   } 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();
@@ -166,7 +221,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 +260,18 @@ sub msgtexconverted {
             $outmessage.=&smiley($_); $tex=1;
 	}
     }
+    $message=$outmessage; $outmessage=''; $tex=0;
+    foreach (split(/(?:\&lt\;|\<)\/*algebra\s*(?:\&gt\;|\>)/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 {
@@ -213,17 +280,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=&postprocess_algebra($string);
-	$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 {
@@ -237,47 +311,42 @@ sub algebra {
 sub prepare_algebra {
     my ($string)=@_;
 
-    #protect the confusable greek symbols
-    $string =~ s/delta/zdelta/g;
-    $string =~ s/beta/bita/g;
-    $string =~ s/theta/thita/g;
-    $string =~ s/zeta/zita/g;
-    $string =~ s/eta/xeta/g;
-    $string =~ s/epsilon/zepslon/g;
-    $string =~ s/upsilon/zupslon/g;
-  
+    # 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;
 
-    # replace some special symbols with the LaTeX equivalents
-    $string =~ s/infty/\\infty/g;
-    $string =~ s/infinity/\\infty/g;
-    $string =~ s/alpha/\\alpha/g;  
-    $string =~ s/gamma/\\gamma/g; 
-    $string =~ s/iota/\\iota/g;
-    $string =~ s/kappa/\\kappa/g;
-    $string =~ s/lambda/\\lambda/g;
-    $string =~ s/mu/\\mu/g;
-    $string =~ s/nu/\\nu/g;
-    $string =~ s/xi/\\xi/g;
-    $string =~ s/rho/\\rho/g;
-    $string =~ s/sigma/\\sigma/g;
-    $string =~ s/tau/\\tau/g;
-    $string =~ s/phi/\\phi/g;
-    $string =~ s/chi/\\chi/g;
-    $string =~ s/psi/\\psi/g;
-    $string =~ s/omega/\\omega/g;
-    $string =~ s/zdelta/\\delta/g;
-    $string =~ s/bita/\\beta/g;
-    $string =~ s/thita/\\theta/g;
-    $string =~ s/zita/\\zeta/g;
-    $string =~ s/xeta/\\eta/g;
-    $string =~ s/zepslon/\\epsilon/g;
-    $string =~ s/zupslon/\\upsilon/g;
+    # 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;