--- loncom/xml/londefdef.pm	2006/01/13 21:10:03	1.314
+++ loncom/xml/londefdef.pm	2006/01/27 22:30:23	1.316
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Tags Default Definition Module 
 #
-# $Id: londefdef.pm,v 1.314 2006/01/13 21:10:03 albertel Exp $
+# $Id: londefdef.pm,v 1.316 2006/01/27 22:30:23 foxr Exp $
 # 
 #
 # Copyright Michigan State University Board of Trustees
@@ -1202,7 +1202,7 @@ sub start_p {
 	} else {
             $currentstring.='\par ';
 	    if (&is_inside_of($tagstack, 'table')) {
-		$closing_string = '\vskip 12pt'; # Safer in tables.
+		$closing_string = '\vskip 0pt'; # Seems to be consistent with <p> in tables.
 	    } else {
 		$closing_string = '\strut\\\\\strut ';
 	    }
@@ -1980,7 +1980,12 @@ sub start_table {
             $Apache::londefdef::table[-1]{'width'}=$1*$textwidth/100;
 	} else {
 	    $Apache::londefdef::table[-1]{'width'}=$TeXwidth;
-	}        
+	}
+        #  In the end, however the table width cannot be wider than $textwidth...
+	
+	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);