--- loncom/xml/londefdef.pm 2006/01/04 23:02:40 1.309 +++ loncom/xml/londefdef.pm 2006/01/09 22:53:25 1.311 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Tags Default Definition Module # -# $Id: londefdef.pm,v 1.309 2006/01/04 23:02:40 albertel Exp $ +# $Id: londefdef.pm,v 1.311 2006/01/09 22:53:25 albertel Exp $ # # # Copyright Michigan State University Board of Trustees @@ -1961,11 +1961,16 @@ sub start_table { # width either comes forced from the TeXwidth or the width parameters. # 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); if (!defined($TeXwidth)) { - $TeXwidth = &Apache::lonxml::get_param('width',$parstack,$safeeval,undef,1); - if (!defined($TeXwidth)) { $TeXwidth = $textwidth; } + my $htmlwidth = &Apache::lonxml::get_param('width',$parstack, + $safeeval,undef,1); + if ($htmlwidth =~ /%/) { + $TeXwidth = $htmlwidth; + } else { + $TeXwidth = $textwidth; + } } else { $Apache::londefdef::table[-1]{'forcedtablewidth'} = 1; } @@ -2760,7 +2765,8 @@ sub start_img { $safeeval, undef,1)); 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. } else { $align = "bottom"; # This is html's default so it's ours too.