rat/lonpage.pm - diff

Return to lonpage.pm CVS log

Up to [LON-CAPA] / rat

Diff for /rat/lonpage.pm between versions 1.106 and 1.107

version 1.106, 2014/09/16 13:28:34	version 1.107, 2014/12/30 20:03:19
Line 307 ENDEXT	Line 307 ENDEXT
#some additional cleanup necessary for LateX (due to limitations of table environment	#some additional cleanup necessary for LateX (due to limitations of table environment
$output =~ s/(\\vskip\s\d+mm)\s(\\\\)+/$1/g;	$output =~ s/(\\vskip\s\d+mm)\s(\\\\)+/$1/g;
}	}
	my $matheditor;
	if ($output =~ /\Qjavascript:LC_mathedit_HWVAL_\E/) {
	$matheditor = 'dragmath';
	} elsif ($output =~ /LCmathField/) {
	$matheditor = 'lcmath';
	}
my $parser=HTML::TokeParser->new(\$output);	my $parser=HTML::TokeParser->new(\$output);
my $token;	my $token;
my $thisdir=$src;	my $thisdir=$src;
Line 373 ENDEXT	Line 379 ENDEXT
s/\<((?:input\|select\|button\|textarea)[^\>]+)name\s\=\s[\'\"]([^\'\"]+)[\'\"]([^\>]*)\>/\<$1 name="$prefix$2" $3\>/gsi;	s/\<((?:input\|select\|button\|textarea)[^\>]+)name\s\=\s[\'\"]([^\'\"]+)[\'\"]([^\>]*)\>/\<$1 name="$prefix$2" $3\>/gsi;
$output=~	$output=~
s/\<((?:input\|select\|button\|textarea)[^\>]+)id\s\=\s[\'\"]([^\'\"]+)[\'\"]([^\>]*)\>/\<$1 id="$idprefix$2" $3\>/gsi;	s/\<((?:input\|select\|button\|textarea)[^\>]+)id\s\=\s[\'\"]([^\'\"]+)[\'\"]([^\>]*)\>/\<$1 id="$idprefix$2" $3\>/gsi;
	if ($matheditor eq 'dragmath') {
	$output=~
	s/(\Qjavascript:LC_mathedit_\E)(HWVAL_)([^'"]+?)($['"]*)(\QHWVAL_\E\3['"]$\;void$0$\;)/$1$idprefix$2$3$4$idprefix$5/g;
	$output=~
	s/(function\s+LC_mathedit_)(HWVAL_)([^'"]+?)(\s+$LCtextline$)/$1$idprefix$2$3$4/g;
	} elsif ($matheditor eq 'lcmath') {
	$output=~
	s/(var\s+LCmathField\s+=\s+document\.getElementById$['"])([^'"]+?)(['"]$\;)/$1$idprefix$2$3/g;
	}
$output=~	$output=~
s/(\Q<div id="msg_\E)(\Qsubmit_\E)([^"]*)(\Q" style="display:none">\E)/<input type="hidden" name="$prefix$2$3_pressed" id="$idprefix$2$3_pressed" value="" \/>$1$idprefix$2$3$4/g;	s/(\Q<div id="msg_\E)(\Qsubmit_\E)([^"]*)(\Q" style="display:none">\E)/<input type="hidden" name="$prefix$2$3_pressed" id="$idprefix$2$3_pressed" value="" \/>$1$idprefix$2$3$4/g;
$output=~	$output=~

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.106
changed lines
	Added in v.1.107