version 1.309, 2006/01/04 23:02:40
|
version 1.311, 2006/01/09 22:53:25
|
Line 1961 sub start_table {
|
Line 1961 sub start_table {
|
|
|
# width either comes forced from the TeXwidth or the width parameters. |
# width either comes forced from the TeXwidth or the width parameters. |
# in either case it can be a percentage or absolute width. |
# in either case it can be a percentage or absolute width. |
|
# in the width case we ignore absolute width |
my $TeXwidth = &Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,undef,0); |
my $TeXwidth = &Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,undef,0); |
if (!defined($TeXwidth)) { |
if (!defined($TeXwidth)) { |
$TeXwidth = &Apache::lonxml::get_param('width',$parstack,$safeeval,undef,1); |
my $htmlwidth = &Apache::lonxml::get_param('width',$parstack, |
if (!defined($TeXwidth)) { $TeXwidth = $textwidth; } |
$safeeval,undef,1); |
|
if ($htmlwidth =~ /%/) { |
|
$TeXwidth = $htmlwidth; |
|
} else { |
|
$TeXwidth = $textwidth; |
|
} |
} else { |
} else { |
$Apache::londefdef::table[-1]{'forcedtablewidth'} = 1; |
$Apache::londefdef::table[-1]{'forcedtablewidth'} = 1; |
} |
} |
Line 2760 sub start_img {
|
Line 2765 sub start_img {
|
$safeeval, |
$safeeval, |
undef,1)); |
undef,1)); |
if(!$align) { |
if(!$align) { |
if (&is_inside_of($tagstack, "table")) { |
# disabled for now see BUG#4535 |
|
if (0 && &is_inside_of($tagstack, "table")) { |
$align = "right"; # Force wraptext use. |
$align = "right"; # Force wraptext use. |
} else { |
} else { |
$align = "bottom"; # This is html's default so it's ours too. |
$align = "bottom"; # This is html's default so it's ours too. |