loncom/xml/londefdef.pm - diff

Return to londefdef.pm CVS log

Up to [LON-CAPA] / loncom / xml

version 1.335, 2006/09/02 18:49:37	version 1.336, 2006/09/05 21:57:57
Line 1214 sub start_br {	Line 1214 sub start_br {
$signal=1;	$signal=1;
}	}
if (($tempo[$i] eq 'td') \|\| ($tempo[$i] eq 'th')) {	if (($tempo[$i] eq 'td') \|\| ($tempo[$i] eq 'th')) {
my $colspan =	$signal = 1;
&Apache::lonxml::get_param('colspan', $parstack,
$safeeval, $i, 0);
if ($colspan) {
$signal = 2;
} else {
$signal = 1;
}
}	}
}	}
if ($signal eq 1) {	if ($signal eq 1) {
$currentstring .= ' \vskip 0 mm ';	$currentstring .= ' \vskip 0 mm ';
} elsif ($signal eq '2') {
# multicol doesn't like blank lines
} elsif ($$tagstack[-2] ne 'sub' && $$tagstack[-2] ne 'sup') {	} elsif ($$tagstack[-2] ne 'sub' && $$tagstack[-2] ne 'sup') {
$currentstring .= '\strut \\\\ \strut ';	$currentstring .= '\strut \\\\ \strut ';
}	}
Line 2209 sub end_table {	Line 2200 sub end_table {
#	#

if ($colspan > 1) {	if ($colspan > 1) {
	my $spanwidth = 0;
	for (my $spancol = $jn; $spancol < $jn + $colspan; $spancol++) {
	$spanwidth += $fwidth[$spancol];
	}
$output .= '\multicolumn{'.	$output .= '\multicolumn{'.
$colspan	$colspan
.'}{\|l\|}{';	."}{\|p{$spanwidth mm}\|}{";
}	}

if ($rowspan > 1) {	if ($rowspan > 1) {