--- loncom/xml/lontexconvert.pm 2016/08/05 21:04:25 1.112.2.5
+++ loncom/xml/lontexconvert.pm 2019/02/15 17:52:54 1.112.2.8
@@ -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.112.2.8 2019/02/15 17:52:54 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -270,11 +270,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='';
+ $endspan='';
+ }
&clean_out_math_mode($texstring);
- return &MathJax_header().
- '';
+ return &MathJax_header().$startspan.
+ ''.$endspan;
}
{
@@ -320,6 +328,11 @@ sub tex_engine {
}
return $env{'environment.texengine'};
}
+ 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 'tth';
}
@@ -388,7 +401,7 @@ sub converted {
if ($mode =~ /tth/i) {
return &tth_converted($string);
} elsif ($mode =~ /jsmath/i) {
- return &jMathJax_converted($string);
+ return &MathJax_converted($string);
} elsif ($mode =~ /mathjax/i) {
return &MathJax_converted($string);
} elsif ($mode =~ /mimetex/i) {
@@ -537,7 +550,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 +616,6 @@ Header
=item tex_engine()
-
=item init_math_support()
=item mimetex_valign()