--- loncom/xml/lontexconvert.pm	2016/08/05 21:04:25	1.112.2.5
+++ loncom/xml/lontexconvert.pm	2014/06/18 06:06:47	1.114
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # TeX Conversion Module
 #
-# $Id: lontexconvert.pm,v 1.112.2.5 2016/08/05 21:04:25 raeburn Exp $
+# $Id: lontexconvert.pm,v 1.114 2014/06/18 06:06:47 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -65,10 +65,10 @@ my %unicode_translations = (
 
     ''             => 0x23a1,
     ''             => 0x23a2,
-    ''             => 0x23a3,
-    ''             => 0x23a4,
+    ''             => 0x23a3,   # when unicode catches up with browsers
+    ''             => 0x23a4,   # use these instead of the cheesey brackets below
     ''             => 0x23a5,
-    ''             => 0x23a6,
+    ''             => 0x23a6, 
 
 #  Parens - unicode for browsers/OS which support it
 
@@ -181,10 +181,10 @@ sub convert_real {
     &Apache::lonxml::end_alarm();
 
     #
-    # Several strings produced by tth require
+    #  Several strings produced by tth require
     # transliteration -> unicode equivalents to render reliably
     # in browsers. %unicode_translations and %unicode_harpoons are tables of
-    # string->substitution which we now apply. (%ascii_8bit_translations used
+    # string->substitution which we now apply. (%ascii_8bit_translations used 
     # instead for Windows XP and mobile devices.
 
     my $use_ascii;
@@ -296,37 +296,89 @@ sub MathJax_converted {
         return
           '<script type="text/javascript" src="/adm/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>'."\n";
     }
+    #sub MathJax_process {
+    #    my $state = pop(@MathJax_sent_header);
+    #    return '' if !$state;
+    #    return "\n".
+    #        '<script type="text/javascript">MathJax.Process()</script>'."\n";
+    #}
+    #sub MathJax_state {
+    #    my ($level) = @_;
+    #    return $MathJax_sent_header[$level];
+    #}
+}
+
+
+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.'</'.$tag.'>';
+}
+
+{
+    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
+            '<script type="text/javascript">
+                     function NoFontMessage () {}
+                     jsMath = {Parser: {prototype: {environments: {\'eqnarray*\' :[\'Array\',null,null,\'rcl\',[5/18,5/18],3,\'D\']}}}};
+                   </script>'."\n".
+	    '<script type="text/javascript" src="/adm/jsMath/jsMath.js"></script>'."\n";
+    }
+    sub jsMath_process {
+	my $state = pop(@jsMath_sent_header);
+	return '' if !$state;
+	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 '') {
-            if (lc($env{'form.texengine'}) eq 'jsmath') {
-                return 'MathJax';
-            }
             return $env{'form.texengine'};
         }
     }    
     if ($env{'request.course.id'}
 	&& exists($env{'course.'.$env{'request.course.id'}.'.texengine'})) {
-        if (lc($env{'course.'.$env{'request.course.id'}.'.texengine'}) eq 'jsmath') {
-            return 'MathJax';
-        }
 	return $env{'course.'.$env{'request.course.id'}.'.texengine'};
     }
     if (exists($env{'environment.texengine'})) {
-        if (lc($env{'environment.texengine'}) eq 'jsmath') {
-            return 'MathJax';
-        }
 	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();
+    }
     &Apache::lontexconvert::MathJax_push();
-    if (lc(&tex_engine()) eq 'mathjax') {
+    if (lc(&tex_engine()) eq 'mathjax') { # ||
+        #($inherit_jsmath && &jsMath_state(-2))) {
         return &Apache::lontexconvert::MathJax_header();
     }
     return;
@@ -388,9 +440,9 @@ sub converted {
     if ($mode =~ /tth/i) {
 	return &tth_converted($string);
     } elsif ($mode =~ /jsmath/i) {
-	return &jMathJax_converted($string);
+	return &jsMath_converted($string);
     } elsif ($mode =~ /mathjax/i) {
-        return &MathJax_converted($string);
+	return &MathJax_converted($string);
     } elsif ($mode =~ /mimetex/i) {
 	return &mimetex_converted($string);
     } elsif ($mode =~ /raw/i) {
@@ -599,7 +651,10 @@ Header
 =item displaystyle()
 
 
+=item jsMath_converted()
+
 =item MathJax_converted()
+	- Mimics the jsMath functionality
 
 =item tex_engine()