--- loncom/xml/londefdef.pm 2007/03/22 22:34:23 1.361 +++ loncom/xml/londefdef.pm 2007/04/06 10:33:37 1.363 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Tags Default Definition Module # -# $Id: londefdef.pm,v 1.361 2007/03/22 22:34:23 foxr Exp $ +# $Id: londefdef.pm,v 1.363 2007/04/06 10:33:37 foxr Exp $ # # # Copyright Michigan State University Board of Trustees @@ -1987,12 +1987,17 @@ sub start_table { } } else { $Apache::londefdef::table[-1]{'forcedtablewidth'} = 1; - } + } + # This stuff looks a bit hokey.. + # Percentage width is actually given as an absolute width.. + # so what's the difference? + # if ($TeXwidth=~/%/) { $Apache::londefdef::table[-1]{'percent'}=1; $TeXwidth=~/(\d+)/; $Apache::londefdef::table[-1]{'width'}=$1*$textwidth/100; } else { + $Apache::londefdef::table[-1]{'forcedtablewidth'} = 1; # may or may not need this? $Apache::londefdef::table[-1]{'width'}=$TeXwidth; } # In the end, however the table width cannot be wider than $textwidth... @@ -2000,7 +2005,6 @@ sub start_table { if ($Apache::londefdef::table[-1]{'width'} > $textwidth) { $Apache::londefdef::table[-1]{'width'} = $textwidth; } - #table's border my $border = &Apache::lonxml::get_param('border',$parstack,$safeeval); my $permission=&Apache::lonxml::get_param('TeXDropEmptyColumns',$parstack,$safeeval,undef,0); @@ -2141,6 +2145,7 @@ sub end_table { $space_neeeded=$space_neeeded+$max_len[$jn]; } if ($space_neeeded<=$available_space) { + for (my $jn=0;$jn<=$#max_len;$jn++) { if ($fwidth[$jn]==0) { $fwidth[$jn]=$max_len[$jn]; @@ -2225,7 +2230,7 @@ sub end_table { } } #use all available width if it is defined in % or as TeXwidth - if (($Apache::londefdef::table[-1]{'percent'}==1) || ($Apache::londefdef::table[-1]{'forcetablewidth'}==1)) { + if (($Apache::londefdef::table[-1]{'percent'}==1) || ($Apache::londefdef::table[-1]{'forcedtablewidth'}==1)) { my $current=0; for (my $i=0;$i<=$#fwidth;$i++) { $current+=$fwidth[$i];