version 1.112.2.8, 2019/02/15 17:52:54
|
version 1.118, 2016/02/20 00:12:45
|
Line 178 sub convert_real {
|
Line 178 sub convert_real {
|
$xmlstring=~s/^\s*\<br clear\=\"all\"/\<br/s; |
$xmlstring=~s/^\s*\<br clear\=\"all\"/\<br/s; |
$xmlstring=~s/^\s*//; |
$xmlstring=~s/^\s*//; |
$xmlstring=~s/\s*$//; |
$xmlstring=~s/\s*$//; |
|
$xmlstring=~s/^<br \/><table/<table/; |
&Apache::lonxml::end_alarm(); |
&Apache::lonxml::end_alarm(); |
|
|
# |
# |
Line 270 sub displaystyle {
|
Line 271 sub displaystyle {
|
|
|
sub MathJax_converted { |
sub MathJax_converted { |
my $texstring=shift; |
my $texstring=shift; |
my ($tag,$startspan,$endspan); |
my $tag='math/tex;'; |
$tag='math/tex;'; |
if (&displaystyle($texstring)) { $tag='math/tex; mode=display'; } |
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().$startspan. |
return &MathJax_header(). |
'<script type="'.$tag.'">'.$$texstring.'</script>'.$endspan; |
'<script type="'.$tag.'">'.$$texstring.'</script>'; |
} |
} |
|
|
{ |
{ |
Line 304 sub MathJax_converted {
|
Line 297 sub MathJax_converted {
|
return |
return |
'<script type="text/javascript" src="/adm/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>'."\n"; |
'<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 { |
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') { |
if (lc($env{'form.texengine'}) eq 'jsmath') { |
return 'MathJax'; |
return 'MathJax'; |
} |
} |
return $env{'form.texengine'}; |
return $env{'form.texengine'}; |
} |
} |
Line 328 sub tex_engine {
|
Line 331 sub tex_engine {
|
} |
} |
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'; |
} |
} |
|
|
Line 401 sub converted {
|
Line 399 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 &MathJax_converted($string); |
|
} elsif ($mode =~ /mathjax/i) { |
|
return &MathJax_converted($string); |
return &MathJax_converted($string); |
|
} elsif ($mode =~ /mathjax/i) { |
|
return &MathJax_converted($string); |
} elsif ($mode =~ /mimetex/i) { |
} elsif ($mode =~ /mimetex/i) { |
return &mimetex_converted($string); |
return &mimetex_converted($string); |
} elsif ($mode =~ /raw/i) { |
} elsif ($mode =~ /raw/i) { |
Line 550 sub postprocess_algebra {
|
Line 548 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; |