--- loncom/xml/lontexconvert.pm 2006/05/30 12:47:53 1.75
+++ loncom/xml/lontexconvert.pm 2006/09/07 21:51:16 1.78
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# TeX Conversion Module
#
-# $Id: lontexconvert.pm,v 1.75 2006/05/30 12:47:53 www Exp $
+# $Id: lontexconvert.pm,v 1.78 2006/09/07 21:51:16 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -176,28 +176,33 @@ sub jsMath_converted {
}
{
- my $jsMath_sent_header;
+ my @jsMath_sent_header;
sub jsMath_reset {
- $jsMath_sent_header=0;
+ undef(@jsMath_sent_header);
+ }
+ sub jsMath_push {
+ push(@jsMath_sent_header,0);
}
sub jsMath_header {
- return '' if $jsMath_sent_header;
- $jsMath_sent_header=1;
+ return '' if $jsMath_sent_header[-1];
+ $jsMath_sent_header[-1]=1;
return
''."\n".
''."\n";
}
sub jsMath_process {
- return '' if !$jsMath_sent_header;
+ my $state = pop(@jsMath_sent_header);
+ return '' if !$state;
return '';
}
}
sub init_math_support {
&init_tth();
- &Apache::lontexconvert::jsMath_reset();
+ &Apache::lontexconvert::jsMath_push();
if ($env{'environment.texengine'} eq 'jsMath' ||
$env{'form.texengine'} eq 'jsMath' ) {
return &Apache::lontexconvert::jsMath_header();
@@ -348,9 +353,6 @@ sub postprocess_algebra {
# moodle had these and I don't know why, ignoring them for now
# $string =~s/\\fun/ /g;
- # remove the extra () in the denominator of a \frac
- $string =~s/\\frac{(.+?)}{\\left\((.+?)\\right\)}/\\frac{$1}{$2}/gs;
-
# sqrt(3,4) means the 4 root of 3
$string =~s/\\sqrt{([^,]+),([^\}]+)}/\\sqrt[$2]{$1}/gs;