version 1.112.2.4, 2014/06/18 06:48:47
|
version 1.112.2.8, 2019/02/15 17:52:54
|
Line 270 sub displaystyle {
|
Line 270 sub displaystyle {
|
|
|
sub MathJax_converted { |
sub MathJax_converted { |
my $texstring=shift; |
my $texstring=shift; |
my $tag='math/tex;'; |
my ($tag,$startspan,$endspan); |
if (&displaystyle($texstring)) { $tag='math/tex; mode=display'; } |
$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); |
&clean_out_math_mode($texstring); |
return &MathJax_header(). |
return &MathJax_header().$startspan. |
'<script type="'.$tag.'">'.$$texstring.'</script>'; |
'<script type="'.$tag.'">'.$$texstring.'</script>'.$endspan; |
} |
} |
|
|
{ |
{ |
Line 298 sub MathJax_converted {
|
Line 306 sub MathJax_converted {
|
} |
} |
} |
} |
|
|
|
|
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 { |
sub tex_engine { |
if (exists($env{'form.texengine'})) { |
if (exists($env{'form.texengine'})) { |
if ($env{'form.texengine'} ne '') { |
if ($env{'form.texengine'} ne '') { |
|
if (lc($env{'form.texengine'}) eq 'jsmath') { |
|
return 'MathJax'; |
|
} |
return $env{'form.texengine'}; |
return $env{'form.texengine'}; |
} |
} |
} |
} |
if ($env{'request.course.id'} |
if ($env{'request.course.id'} |
&& exists($env{'course.'.$env{'request.course.id'}.'.texengine'})) { |
&& 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'}; |
return $env{'course.'.$env{'request.course.id'}.'.texengine'}; |
} |
} |
if (exists($env{'environment.texengine'})) { |
if (exists($env{'environment.texengine'})) { |
|
if (lc($env{'environment.texengine'}) eq 'jsmath') { |
|
return 'MathJax'; |
|
} |
return $env{'environment.texengine'}; |
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'; |
return 'tth'; |
} |
} |
|
|
sub init_math_support { |
sub init_math_support { |
my ($inherit_jsmath) = @_; |
|
&init_tth(); |
&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(); |
&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 &Apache::lontexconvert::MathJax_header(); |
} |
} |
return; |
return; |
Line 430 sub converted {
|
Line 401 sub converted {
|
if ($mode =~ /tth/i) { |
if ($mode =~ /tth/i) { |
return &tth_converted($string); |
return &tth_converted($string); |
} elsif ($mode =~ /jsmath/i) { |
} elsif ($mode =~ /jsmath/i) { |
return &jsMath_converted($string); |
return &MathJax_converted($string); |
} elsif ($mode =~ /mathjax/i) { |
} elsif ($mode =~ /mathjax/i) { |
return &MathJax_converted($string); |
return &MathJax_converted($string); |
} elsif ($mode =~ /mimetex/i) { |
} elsif ($mode =~ /mimetex/i) { |
Line 579 sub postprocess_algebra {
|
Line 550 sub postprocess_algebra {
|
# $string =~s/\\fun/ /g; |
# $string =~s/\\fun/ /g; |
|
|
# sqrt(3,4) means the 4 root of 3 |
# 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 |
# log(3,4) means the log base 4 of 3 |
$string =~s/\\log\\left\((.+?),(.+?)\\right\)/\\log_{$2}\\left($1\\right)/gs; |
$string =~s/\\log\\left\((.+?),(.+?)\\right\)/\\log_{$2}\\left($1\\right)/gs; |
Line 641 Header
|
Line 612 Header
|
=item displaystyle() |
=item displaystyle() |
|
|
|
|
=item jsMath_converted() |
|
|
|
=item MathJax_converted() |
=item MathJax_converted() |
- Mimics the jsMath functionality |
|
|
|
=item tex_engine() |
=item tex_engine() |
|
|
|
|
=item init_math_support() |
=item init_math_support() |
|
|
=item mimetex_valign() |
=item mimetex_valign() |