--- loncom/xml/lontexconvert.pm	2016/08/05 21:04:25	1.112.2.5
+++ loncom/xml/lontexconvert.pm	2018/04/23 18:59:28	1.121
@@ -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.121 2018/04/23 18:59:28 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -178,6 +178,7 @@ sub convert_real {
     $xmlstring=~s/^\s*\<br clear\=\"all\"/\<br/s;
     $xmlstring=~s/^\s*//;
     $xmlstring=~s/\s*$//;
+    $xmlstring=~s/^<br \/><table/<table/;
     &Apache::lonxml::end_alarm();
 
     #
@@ -270,11 +271,19 @@ sub displaystyle {
 
 sub MathJax_converted {
     my $texstring=shift;
-    my $tag='math/tex;';
-    if (&displaystyle($texstring)) { $tag='math/tex; mode=display'; }
+    my ($tag,$startspan,$endspan);
+    $tag='math/tex;';
+    if (&displaystyle($texstring)) {
+        $tag='math/tex; mode=display';
+        $startspan='';
+        $endspan='';
+    } else {
+        $startspan='<span style="display:inline-block;">';
+        $endspan='</span>';
+    }
     &clean_out_math_mode($texstring);
-    return &MathJax_header().
-      '<script type="'.$tag.'">'.$$texstring.'</script>';
+    return &MathJax_header().$startspan.
+      '<script type="'.$tag.'">'.$$texstring.'</script>'.$endspan;
 }
 
 {
@@ -296,13 +305,23 @@ 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 tex_engine {
     if (exists($env{'form.texengine'})) {
 	if ($env{'form.texengine'} ne '') {
             if (lc($env{'form.texengine'}) eq 'jsmath') {
-                return 'MathJax';
+                return 'MathJax'; 
             }
             return $env{'form.texengine'};
         }
@@ -320,7 +339,12 @@ sub tex_engine {
         }
 	return $env{'environment.texengine'};
     }
-    return 'tth';
+    my $dom = $env{'request.role.domain'} || $env{'user.domain'};
+    my %domdefaults = &Apache::lonnet::get_domain_defaults($dom);
+    if ($domdefaults{'texengine'} ne '') {
+        return $domdefaults{'texengine'};
+    }
+    return 'MathJax';
 }
 
 sub init_math_support {
@@ -388,9 +412,9 @@ sub converted {
     if ($mode =~ /tth/i) {
 	return &tth_converted($string);
     } elsif ($mode =~ /jsmath/i) {
-	return &jMathJax_converted($string);
-    } elsif ($mode =~ /mathjax/i) {
         return &MathJax_converted($string);
+    } elsif ($mode =~ /mathjax/i) {
+	return &MathJax_converted($string);
     } elsif ($mode =~ /mimetex/i) {
 	return &mimetex_converted($string);
     } elsif ($mode =~ /raw/i) {
@@ -537,7 +561,7 @@ sub postprocess_algebra {
     # $string =~s/\\fun/ /g;
 
     # sqrt(3,4) means the 4 root of 3
-    $string =~s/\\sqrt{([^,]+),([^\}]+)}/\\sqrt[$2]{$1}/gs;
+    $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;
@@ -603,7 +627,6 @@ Header
 
 =item tex_engine()
 
-
 =item init_math_support()
 
 =item mimetex_valign()