--- loncom/xml/londefdef.pm	2004/07/12 16:11:30	1.225
+++ loncom/xml/londefdef.pm	2004/07/15 15:13:52	1.229
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Tags Default Definition Module 
 #
-# $Id: londefdef.pm,v 1.225 2004/07/12 16:11:30 sakharuk Exp $
+# $Id: londefdef.pm,v 1.229 2004/07/15 15:13:52 sakharuk Exp $
 # 
 #
 # Copyright Michigan State University Board of Trustees
@@ -1133,15 +1133,13 @@ sub end_p {
     if ($target eq 'web') {
 	$currentstring .= $token->[2];
     } elsif ($target eq 'tex') {
-	if ($$tagstack[-1] eq 'p') {
-	    my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1);
-	    if ($align eq 'center') {		
-		$currentstring .= '\end{center}';
-	    } elsif ($align eq 'right') {
-		$currentstring .= '}}';
-	    } elsif ($align eq 'left') {
-		$currentstring .= '}\hfill}';
-	    }
+	my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1);
+	if ($align eq 'center') {		
+	    $currentstring .= '\end{center}';
+	} elsif ($align eq 'right') {
+	    $currentstring .= '}}';
+	} elsif ($align eq 'left') {
+	    $currentstring .= '}\hfill}';
 	}
     }
     return $currentstring;
@@ -1154,8 +1152,16 @@ sub start_br {
     if ($target eq 'web') {
 	$currentstring .= $token->[4];
     } elsif ($target eq 'tex') {
-	if (($$tagstack[-2] eq 'b') || ($$tagstack[-2] eq 'strong') ||
-            ($$tagstack[-2] eq 'ol') || ($$tagstack[-2] eq 'ul')) {
+	my @tempo=@$tagstack;
+	my $signal=0;
+	for (my $i=$#tempo;$i>=0;$i--) {
+	    if (($tempo[$i] eq 'b') || ($tempo[$i] eq 'strong') ||
+                ($tempo[$i] eq 'ol') || ($tempo[$i] eq 'ul'))  {
+		$signal=1;
+		last;
+	    }
+	}
+	if ($signal) {
 	    $currentstring .= ' \vskip 0 mm ';
 	} elsif ($$tagstack[-2] ne 'sub' && $$tagstack[-2] ne 'sup') {
 	    $currentstring .= '\strut \\\\ \strut ';
@@ -1797,7 +1803,7 @@ sub start_table {
 		$textwidth=$Apache::londefdef::table[-2]{'TeXlen'}[$Apache::londefdef::table[-2]{'row_number'}][$Apache::londefdef::table[-2]{'counter_columns'}]; 
 	    } else {
               #try to use all space not used before (minus 5% for LaTeX table internal) - rather silly
-		my $textwidth=$Apache::londefdef::table[-2]{'width'};
+		$textwidth=$Apache::londefdef::table[-2]{'width'};
 		for (my $i=0;$i<$Apache::londefdef::table[-2]{'counter_columns'};$i++) {
 		    $textwidth=$textwidth-$Apache::londefdef::table[-2]{'TeXlen'}[0][$i];
 		}
@@ -1840,6 +1846,7 @@ sub start_table {
 	$Apache::londefdef::table[-1]{'output'}.=' \noindent \begin{tabular} ';
         $Apache::londefdef::table[-1]{'TeXlen'}=[];
         $Apache::londefdef::table[-1]{'objectlen'}=[];
+        $Apache::londefdef::table[-1]{'objectsignal'}=[];
         $Apache::londefdef::table[-1]{'maxlen'}=[];
         $Apache::londefdef::table[-1]{'minlen'}=[];
         $Apache::londefdef::table[-1]{'content'}=[];
@@ -1868,7 +1875,7 @@ sub end_table {
 	}
         #free space and number of empty columns
 	my ($available_space,$empty_columns)=($Apache::londefdef::table[-1]{'width'},0);
-##	&Apache::lonnet::logthis("Available space $Apache::londefdef::table[-1]{'width'}");
+	if ($#Apache::londefdef::table ne 0) {$available_space=0.9*$available_space;} 
 	for (my $jn=0;$jn<=$Apache::londefdef::table[-1]{'counter_columns'};$jn++) {
 	    if ($Apache::londefdef::table[-1]{'TeXlen'}[0][$jn]==0) {
 		$empty_columns++;
@@ -1899,8 +1906,14 @@ sub end_table {
 		    $localmin=$Apache::londefdef::table[-1]{'objectlen'}[$in][$jn];
 		}
 	    }
-	    if ($max_len[$jn]<$localmin) {$max_len[$jn]=$localmin;}#object size is bigger
-	    if ($min_len[$jn]<$localmin) {$min_len[$jn]=$localmin;}#object size is bigger
+	    if ($max_len[$jn]<$localmin) {
+		$max_len[$jn]=$localmin;
+	    	$Apache::londefdef::table[-1]{'objectsignal'}[$jn]=1;
+	    }#object size is bigger
+	    if ($min_len[$jn]<$localmin) {
+		$min_len[$jn]=$localmin;
+		$Apache::londefdef::table[-1]{'objectsignal'}[$jn]=1;
+	    }#object size is bigger
 	    if ($Apache::londefdef::table[-1]{'TeXlen'}[0][$jn]!=0) {
 		$min_len[$jn]=0;
 		$max_len[$jn]=0;
@@ -1933,6 +1946,36 @@ sub end_table {
 			$fwidth[$jn]=$min_len[$jn];
 		    }
 		}
+		#check if we have objects which can be scaled
+		my $how_many_to_scale=0;
+		my @to_scale=();
+		for (my $jn=0;$jn<=$#max_len;$jn++) {
+		    if ($Apache::londefdef::table[-1]{'objectsignal'}[$jn] eq '1') {
+			$how_many_to_scale++;
+			push @to_scale, $jn;
+		    }
+		}
+		if ($how_many_to_scale>0) {
+		    my $space_to_adjust=($space_neeeded-$available_space)/$how_many_to_scale;
+		    foreach my $jn (@to_scale) {
+			for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {
+			    $Apache::londefdef::table[-1]{'content'}[$in][$jn]=~m/width\s*=\s*(\d+\.?\d*\s*(mm|cm|in|pc|pt)*)/;
+			    if ($1 ne '') {
+				my $current_length=&recalc($1);
+				$current_length=~/(\d+\.?\d*)/;
+				$current_length=$current_length-$space_to_adjust;
+				$Apache::londefdef::table[-1]{'content'}[$in][$jn]=~s/width\s*=\s*(\d+\.?\d*\s*(mm|cm|in|pc|pt)*)/width=$current_length mm/;
+			    }
+			    $Apache::londefdef::table[-1]{'content'}[$in][$jn]=~m/\[(\d+\.?\d*)\s*mm\]/;
+			    if ($1 ne '') {
+				my $current_length=$1;
+				$current_length=$current_length-$space_to_adjust;
+				$Apache::londefdef::table[-1]{'content'}[$in][$jn]=~s/\[(\d+\.?\d*)\s*mm\]/\[$current_length mm\]/;
+			    }				
+			}
+			$fwidth[$jn]=$fwidth[$jn]-$space_to_adjust;
+		    }
+		}
 	    } else {
 	      #step 3. adjustment over minimal + corrections
 		my $enlarge_coef=$available_space/$space_neeeded;
@@ -2007,13 +2050,13 @@ sub end_table {
 	for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {
 	    for (my $jn=0;$jn<=$#fwidth;$jn++) {
 		if ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') {
-		    $output.='\begin{center}';
+		    $output.='\vspace*{-6 mm}\begin{center}';
 		} elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') {
 		    $output.=' \hfill \llap{'
 		}
 		$output.=$Apache::londefdef::table[-1]{'content'}[$in][$jn];
 		if ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') {
-		    $output.='\end{center}';
+		    $output.='\end{center}\vspace*{-6 mm}';
 		} elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') {
 		    $output.='} ';
 		}
@@ -2171,7 +2214,7 @@ sub end_td_tex {
 		$current_length=2.5*&LATEX_length($data);
                     my @words=split(/ /,$data);
 		    foreach my $word (@words) {
-			my $lengthword=2.5*&LATEX_length($word);
+			my $lengthword=2*&LATEX_length($word);
 			if ($min_length<$lengthword) {$min_length=$lengthword;}
 		    }
 	    }