version 1.403.4.2, 2010/08/20 21:20:24
|
version 1.403.4.4, 2010/11/18 18:07:02
|
Line 2702 sub tag_check {
|
Line 2702 sub tag_check {
|
# |
# |
|
|
sub cell_config_hash { |
sub cell_config_hash { |
my ($align, $rowspan, $colspan) = @_; |
my ($align, $rowspan, $colspan, $width) = @_; |
|
if ($rowspan ne '') { |
|
$rowspan =~ s/^\s+|\s+$//g; |
|
} |
|
if ($colspan ne '') { |
|
$colspan =~ s/^\s+|\s+$//g; |
|
} |
my %config; |
my %config; |
if ($align ne '') { |
if ($align ne '') { |
$config{'halign'} = $align; |
$config{'halign'} = $align; |
} |
} |
if ($colspan ne "") { |
if (($colspan =~ /^\d+$/) && ($colspan > 0)) { |
$config{'colspan'} = $colspan; |
$config{'colspan'} = $colspan; |
} |
} |
if ($rowspan ne '') { |
if (($rowspan =~ /^\d+$/) && ($rowspan > 0)) { |
$config{'rowspan'} = $rowspan; |
$config{'rowspan'} = $rowspan; |
} |
} |
|
if ($width ne '') { |
|
$config{'width'} = $width; |
|
} |
return \%config; |
return \%config; |
} |
} |
|
|
Line 2724 sub start_td_tex {
|
Line 2733 sub start_td_tex {
|
# attributes, but empty of text. end_td_tex will |
# attributes, but empty of text. end_td_tex will |
# fetch the contents from the recursive parse and |
# fetch the contents from the recursive parse and |
# fill the cell with them: |
# fill the cell with them: |
my $align = &Apache::lonxml::get_param('align', $parstack, $safeeval, undef, 1); |
my $align = &Apache::lonxml::get_param('align', $parstack, $safeeval); |
my $rowspan = &Apache::lonxml::get_param('rowspan', $parstack, $safeeval, undef, 1); |
my $rowspan = &Apache::lonxml::get_param('rowspan', $parstack, $safeeval); |
my $colspan = &Apache::lonxml::get_param('colspan', $parstack, $safeeval, undef, 1); |
my $colspan = &Apache::lonxml::get_param('colspan', $parstack, $safeeval); |
|
my $width = &Apache::lonxml::get_param('TeXwidth', $parstack, $safeeval); |
my $config = &cell_config_hash($align, $rowspan, $colspan); |
my $config = &cell_config_hash($align, $rowspan, $colspan, $width); |
|
|
my $table = $Apache::londefdef::table[-1]; |
my $table = $Apache::londefdef::table[-1]; |
$table->add_cell('', $config); |
$table->add_cell('', $config); |