--- loncom/xml/lontexconvert.pm	2006/10/23 18:49:47	1.79
+++ loncom/xml/lontexconvert.pm	2008/11/24 17:17:51	1.91
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # TeX Conversion Module
 #
-# $Id: lontexconvert.pm,v 1.79 2006/10/23 18:49:47 albertel Exp $
+# $Id: lontexconvert.pm,v 1.91 2008/11/24 17:17:51 jms Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -79,10 +79,7 @@ sub init_tth {
 
 $Apache::lontexconvert::messedup=0;
 
-# we need this routine because &converted can get called from inside
-# of the safespace (through &xmlparse('<m>stuff</m>') 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);
@@ -108,6 +105,14 @@ sub convert_real {
     $xmlstring=~s/^\s*\<br clear\=\"all\"/\<br/s;
     $xmlstring=~s/^\s*//;
     $xmlstring=~s/\s*$//;
+    #
+    # \rightleftharpoons is not converted by tth but maps
+    # reasonably well to &#8660;.  If we get many more of these,
+    # we're going to need to have a translation sub.
+    #
+    my $lrharpoon = pack("U", 0x21cc);
+    $xmlstring=~s/\\rightleftharpoons/$lrharpoon/g;
+
     &Apache::lonxml::end_alarm();
     return ($xmlstring,$errorstring);
 }
@@ -151,7 +156,7 @@ ENDCONV
 
 sub clean_out_math_mode {
     my ($texstring)=@_;
-    $$texstring=~s/(?!\\)\$//g;
+    $$texstring=~s/(?<!\\)\$//g;
     $$texstring=~s/\\[\)\(\]\[]//g;
     $$texstring=~s/\\ensuremath//g;
     return '';
@@ -184,6 +189,10 @@ sub jsMath_converted {
 	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
@@ -196,15 +205,37 @@ sub jsMath_converted {
     sub jsMath_process {
 	my $state = pop(@jsMath_sent_header);
 	return '' if !$state;
-	return '<script type="text/javascript">jsMath.Process()</script>';
+	return "\n".
+	    '<script type="text/javascript">jsMath.Process()</script>'."\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 ($env{'environment.texengine'} eq 'jsMath' ||
-	$env{'form.texengine'}        eq 'jsMath' ) {
+    if (lc(&tex_engine()) eq 'jsmath' ||
+	($inherit_jsmath && &jsMath_state(-2))) {
 	return &Apache::lontexconvert::jsMath_header();
     }
     return;
@@ -219,7 +250,7 @@ sub mimetex_converted {
     if ($displaystyle) {
 	$$texstring='\\displaystyle \\Large '.$$texstring;
     }
-    my $result='<img src="/cgi-bin/mimetex.cgi?'.&escape($$texstring).'" />';
+    my $result='<img src="/cgi-bin/mimetex.cgi?'.&escape($$texstring).'" alt="$'.$$texstring.'$" />';
     if ($displaystyle) {
 	$result='<center>'.$result.'</center>';
     }
@@ -228,7 +259,7 @@ sub mimetex_converted {
 
 sub converted {
     my ($string,$mode)=@_;
-    if ($mode eq '') { $mode=$env{'environment.texengine'}; }
+    if ($mode eq '') { $mode = &tex_engine(); }
     if ($mode =~ /tth/i) {
 	return &tth_converted($string);
     } elsif ($mode =~ /jsmath/i) {
@@ -319,7 +350,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);
@@ -336,7 +367,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;
 	}
@@ -383,8 +416,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('<m>stuff</m>') 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