version 1.223, 2004/07/12 15:46:52
|
version 1.224, 2004/07/12 15:52:44
|
Line 1891 sub end_table {
|
Line 1891 sub end_table {
|
} |
} |
push @min_len, $localmin; |
push @min_len, $localmin; |
push @max_len, $localmax; |
push @max_len, $localmax; |
&Apache::lonnet::logthis("TABLEOUTPUT1: $localmin><$localmax<<<"); |
|
} |
} |
for (my $jn=0;$jn<=$Apache::londefdef::table[-1]{'counter_columns'};$jn++) { |
for (my $jn=0;$jn<=$Apache::londefdef::table[-1]{'counter_columns'};$jn++) { |
my $localmin=0,; |
my $localmin=0,; |
Line 1906 sub end_table {
|
Line 1905 sub end_table {
|
$min_len[$jn]=0; |
$min_len[$jn]=0; |
$max_len[$jn]=0; |
$max_len[$jn]=0; |
} |
} |
&Apache::lonnet::logthis("TABLEOUTPUT2: $min_len[$jn]><$max_len[$jn]<<<"); |
|
} |
} |
#final adjustment of column width |
#final adjustment of column width |
my @fwidth=@{$Apache::londefdef::table[-1]{'TeXlen'}[0]};#final width array |
my @fwidth=@{$Apache::londefdef::table[-1]{'TeXlen'}[0]};#final width array |
Line 1921 sub end_table {
|
Line 1919 sub end_table {
|
if ($fwidth[$jn]==0) { |
if ($fwidth[$jn]==0) { |
$fwidth[$jn]=$max_len[$jn]; |
$fwidth[$jn]=$max_len[$jn]; |
} |
} |
&Apache::lonnet::logthis("TABLEOUTPUT3: $fwidth[$jn]<<<"); |
|
} |
} |
} else { |
} else { |
#step 2. adjustment by minimum value (estimation) |
#step 2. adjustment by minimum value (estimation) |
Line 1935 sub end_table {
|
Line 1932 sub end_table {
|
if ($fwidth[$jn]==0) { |
if ($fwidth[$jn]==0) { |
$fwidth[$jn]=$min_len[$jn]; |
$fwidth[$jn]=$min_len[$jn]; |
} |
} |
&Apache::lonnet::logthis("TABLEOUTPUT4: $fwidth[$jn]<<<"); |
|
} |
} |
} else { |
} else { |
#step 3. adjustment over minimal + corrections |
#step 3. adjustment over minimal + corrections |
Line 1948 sub end_table {
|
Line 1944 sub end_table {
|
$acsessive=$acsessive+$adjust[$jn]-$max_len[$jn]; |
$acsessive=$acsessive+$adjust[$jn]-$max_len[$jn]; |
$adjust[$jn]=0; |
$adjust[$jn]=0; |
} |
} |
&Apache::lonnet::logthis("TABLEOUTPUT10: $adjust[$jn]<<<"); |
|
&Apache::lonnet::logthis("TABLEOUTPUT10a: $acsessive<<<"); |
|
} |
} |
if ($acsessive>0) { |
if ($acsessive>0) { |
#we have an excess of space and can redistribute it |
#we have an excess of space and can redistribute it |
Line 1965 sub end_table {
|
Line 1959 sub end_table {
|
$adjust[$jn]+=$per_column; |
$adjust[$jn]+=$per_column; |
$fwidth[$jn]=$adjust[$jn]; |
$fwidth[$jn]=$adjust[$jn]; |
} |
} |
&Apache::lonnet::logthis("TABLEOUTPUT5: $fwidth[$jn]<<<"); |
|
} |
} |
} else { |
} else { |
for (my $jn=0;$jn<=$#min_len;$jn++) { |
for (my $jn=0;$jn<=$#min_len;$jn++) { |
Line 2270 sub start_img {
|
Line 2263 sub start_img {
|
undef,1); |
undef,1); |
if (not $src and ($target eq 'web' or $target eq 'tex')) { |
if (not $src and ($target eq 'web' or $target eq 'tex')) { |
my $inside = &Apache::lonxml::get_all_text("/img",$parser); |
my $inside = &Apache::lonxml::get_all_text("/img",$parser); |
&Apache::lonnet::logthis("inside was $inside"); |
|
return ''; |
return ''; |
} |
} |
$Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=$src; |
$Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=$src; |