[LON-CAPA-cvs] cvs: loncom /xml londefdef.pm

[sakharuk]

sakharuk		Mon Jul 12 11:46:53 2004 EDT

  Modified files:              
    /loncom/xml	londefdef.pm 
  Log:
  Part of problems leading to situations described in bug 3103 (things that print on s10 don't print on data) are fixed.
  
  
Index: loncom/xml/londefdef.pm
diff -u loncom/xml/londefdef.pm:1.222 loncom/xml/londefdef.pm:1.223
--- loncom/xml/londefdef.pm:1.222	Thu Jun 17 13:03:00 2004
+++ loncom/xml/londefdef.pm	Mon Jul 12 11:46:52 2004
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Tags Default Definition Module 
 #
-# $Id: londefdef.pm,v 1.222 2004/06/17 17:03:00 sakharuk Exp $
+# $Id: londefdef.pm,v 1.223 2004/07/12 15:46:52 sakharuk Exp $
 # 
 #
 # Copyright Michigan State University Board of Trustees
@@ -1891,6 +1891,7 @@
 		}
 		push @min_len, $localmin;
 		push @max_len, $localmax;
+		&Apache::lonnet::logthis("TABLEOUTPUT1: $localmin><$localmax<<<");
 	}
 	for (my $jn=0;$jn<=$Apache::londefdef::table[-1]{'counter_columns'};$jn++) {
 	    my $localmin=0,;
@@ -1905,6 +1906,7 @@
 		$min_len[$jn]=0;
 		$max_len[$jn]=0;
 	    }
+	    &Apache::lonnet::logthis("TABLEOUTPUT2: $min_len[$jn]><$max_len[$jn]<<<");
 	}
        #final adjustment of column width
 	my @fwidth=@{$Apache::londefdef::table[-1]{'TeXlen'}[0]};#final width array
@@ -1919,6 +1921,7 @@
 		if ($fwidth[$jn]==0) {
 		    $fwidth[$jn]=$max_len[$jn];
 		}
+		&Apache::lonnet::logthis("TABLEOUTPUT3: $fwidth[$jn]<<<");
 	    }
 	} else {
         #step 2. adjustment by minimum value (estimation)
@@ -1932,6 +1935,7 @@
 		    if ($fwidth[$jn]==0) {
 			$fwidth[$jn]=$min_len[$jn];
 		    }
+		    &Apache::lonnet::logthis("TABLEOUTPUT4: $fwidth[$jn]<<<");
 		}
 	    } else {
 	      #step 3. adjustment over minimal + corrections
@@ -1944,6 +1948,8 @@
 			$acsessive=$acsessive+$adjust[$jn]-$max_len[$jn];
 			$adjust[$jn]=0;
 		    }
+		    &Apache::lonnet::logthis("TABLEOUTPUT10: $adjust[$jn]<<<");
+		    &Apache::lonnet::logthis("TABLEOUTPUT10a: $acsessive<<<");
 		}
 		if ($acsessive>0) {
 		#we have an excess of space and can redistribute it
@@ -1959,6 +1965,11 @@
 			    $adjust[$jn]+=$per_column;
 			    $fwidth[$jn]=$adjust[$jn];
 			}
+			&Apache::lonnet::logthis("TABLEOUTPUT5: $fwidth[$jn]<<<");
+		    }
+		} else {
+		    for (my $jn=0;$jn<=$#min_len;$jn++) {
+			$fwidth[$jn]=$adjust[$jn];
 		    }
 		}
 	    }