version 1.79, 2006/10/23 18:49:47
|
version 1.90, 2008/11/18 10:02:56
|
Line 108 sub convert_real {
|
Line 108 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*$//; |
|
# |
|
# \rightleftharpoons is not converted by tth but maps |
|
# reasonably well to ⇔. If we get many more of these, |
|
# we're going to need to have a translation sub. |
|
# |
|
my $lrharpoon = pack("U", 0x21cc); |
|
$xmlstring=~s/\\rightleftharpoons/$lrharpoon/g; |
|
|
&Apache::lonxml::end_alarm(); |
&Apache::lonxml::end_alarm(); |
return ($xmlstring,$errorstring); |
return ($xmlstring,$errorstring); |
} |
} |
Line 151 ENDCONV
|
Line 159 ENDCONV
|
|
|
sub clean_out_math_mode { |
sub clean_out_math_mode { |
my ($texstring)=@_; |
my ($texstring)=@_; |
$$texstring=~s/(?!\\)\$//g; |
$$texstring=~s/(?<!\\)\$//g; |
$$texstring=~s/\\[\)\(\]\[]//g; |
$$texstring=~s/\\[\)\(\]\[]//g; |
$$texstring=~s/\\ensuremath//g; |
$$texstring=~s/\\ensuremath//g; |
return ''; |
return ''; |
Line 184 sub jsMath_converted {
|
Line 192 sub jsMath_converted {
|
push(@jsMath_sent_header,0); |
push(@jsMath_sent_header,0); |
} |
} |
sub jsMath_header { |
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]; |
return '' if $jsMath_sent_header[-1]; |
$jsMath_sent_header[-1]=1; |
$jsMath_sent_header[-1]=1; |
return |
return |
Line 196 sub jsMath_converted {
|
Line 208 sub jsMath_converted {
|
sub jsMath_process { |
sub jsMath_process { |
my $state = pop(@jsMath_sent_header); |
my $state = pop(@jsMath_sent_header); |
return '' if !$state; |
return '' if !$state; |
return '<script type="text/javascript">jsMath.Process()</script>'; |
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 '') { |
|
return $env{'form.texengine'}; |
|
} |
|
} |
|
if ($env{'request.course.id'} |
|
&& exists($env{'course.'.$env{'request.course.id'}.'.texengine'})) { |
|
return $env{'course.'.$env{'request.course.id'}.'.texengine'}; |
|
} |
|
if (exists($env{'environment.texengine'})) { |
|
return $env{'environment.texengine'}; |
} |
} |
|
return 'tth'; |
} |
} |
|
|
sub init_math_support { |
sub init_math_support { |
|
my ($inherit_jsmath) = @_; |
&init_tth(); |
&init_tth(); |
&Apache::lontexconvert::jsMath_push(); |
&Apache::lontexconvert::jsMath_push(); |
if ($env{'environment.texengine'} eq 'jsMath' || |
if (lc(&tex_engine()) eq 'jsmath' || |
$env{'form.texengine'} eq 'jsMath' ) { |
($inherit_jsmath && &jsMath_state(-2))) { |
return &Apache::lontexconvert::jsMath_header(); |
return &Apache::lontexconvert::jsMath_header(); |
} |
} |
return; |
return; |
Line 219 sub mimetex_converted {
|
Line 253 sub mimetex_converted {
|
if ($displaystyle) { |
if ($displaystyle) { |
$$texstring='\\displaystyle \\Large '.$$texstring; |
$$texstring='\\displaystyle \\Large '.$$texstring; |
} |
} |
my $result='<img src="/cgi-bin/mimetex.cgi?'.&escape($$texstring).'" />'; |
my $result='<img src="/cgi-bin/mimetex.cgi?'.&escape($$texstring).'" alt="$'.$$texstring.'$" />'; |
if ($displaystyle) { |
if ($displaystyle) { |
$result='<center>'.$result.'</center>'; |
$result='<center>'.$result.'</center>'; |
} |
} |
Line 228 sub mimetex_converted {
|
Line 262 sub mimetex_converted {
|
|
|
sub converted { |
sub converted { |
my ($string,$mode)=@_; |
my ($string,$mode)=@_; |
if ($mode eq '') { $mode=$env{'environment.texengine'}; } |
if ($mode eq '') { $mode = &tex_engine(); } |
if ($mode =~ /tth/i) { |
if ($mode =~ /tth/i) { |
return &tth_converted($string); |
return &tth_converted($string); |
} elsif ($mode =~ /jsmath/i) { |
} elsif ($mode =~ /jsmath/i) { |
Line 319 sub msgtexconverted {
|
Line 353 sub msgtexconverted {
|
sub algebra { |
sub algebra { |
use AlgParser; |
use AlgParser; |
|
|
my ($string,$target,$style)=@_; |
my ($string,$target,$style,$parstack,$safeeval)=@_; |
my $parser = new AlgParserWithImplicitExpand; |
my $parser = new AlgParserWithImplicitExpand; |
$string=&prepare_algebra($string); |
$string=&prepare_algebra($string); |
my $ret = $parser->parse($string); |
my $ret = $parser->parse($string); |
Line 336 sub algebra {
|
Line 370 sub algebra {
|
$latex='\\ensuremath{'.$latex.'}'; |
$latex='\\ensuremath{'.$latex.'}'; |
} |
} |
if ($target eq 'web' || $target eq 'analyze') { |
if ($target eq 'web' || $target eq 'analyze') { |
$result = &converted(\$latex); |
my $display=&Apache::lonxml::get_param('display',$parstack,$safeeval); |
|
$result = &converted(\$latex,$display); |
|
# $result = &converted(\$latex); |
} else { |
} else { |
$result = $latex; |
$result = $latex; |
} |
} |