--- loncom/xml/londefdef.pm	2006/08/01 18:48:14	1.331
+++ loncom/xml/londefdef.pm	2006/09/02 18:49:37	1.335
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Tags Default Definition Module 
 #
-# $Id: londefdef.pm,v 1.331 2006/08/01 18:48:14 albertel Exp $
+# $Id: londefdef.pm,v 1.335 2006/09/02 18:49:37 albertel Exp $
 # 
 #
 # Copyright Michigan State University Board of Trustees
@@ -1154,7 +1154,7 @@ sub start_p {
 	$currentstring .= &end_p();	# close off prior para if in progress.
 	my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1);
 	if ($align eq 'center') {
-	    $currentstring .='\begin{center}\par';
+	    $currentstring .='\begin{center}\par ';
 	    $closing_string = '\end{center}';
 	    if (&is_inside_of($tagstack, "table")) {
 		$currentstring = &center_correction().$currentstring;
@@ -1210,14 +1210,24 @@ sub start_br {
 	#
 	for (my $i=$#tempo;$i>=0;$i--) {
 	    if (($tempo[$i] eq 'b') || ($tempo[$i] eq 'strong') ||
-                ($tempo[$i] eq 'ol') || ($tempo[$i] eq 'ul') ||
-                ($tempo[$i] eq 'td') || ($tempo[$i] eq 'th'))  {
+                ($tempo[$i] eq 'ol') || ($tempo[$i] eq 'ul'))  {
 		$signal=1;
-		last;
+	    }
+	    if (($tempo[$i] eq 'td') || ($tempo[$i] eq 'th')) {
+		my $colspan = 
+		    &Apache::lonxml::get_param('colspan', $parstack,
+					       $safeeval, $i, 0);
+		if ($colspan) {
+		    $signal = 2;
+		} else {
+		    $signal = 1;
+		}
 	    }
 	}
-	if ($signal) {
+	if ($signal eq 1) {
 	    $currentstring .= ' \vskip 0 mm ';
+	} elsif ($signal eq '2') {
+	    # multicol doesn't like blank lines
 	} elsif ($$tagstack[-2] ne 'sub' && $$tagstack[-2] ne 'sup') {
 	    $currentstring .= '\strut \\\\ \strut ';
 	}
@@ -2867,7 +2877,7 @@ sub start_img {
 						   ['','bottom','middle','top','left','right'],$token,5);
 	$currentstring .=&Apache::edit::select_arg('TeXwrap:', 'TeXwrap',
 						   ['', 'parbox', 'parpic'], $token, 2);
-	$currentstring .=&Apache::edit::select_arg('Encyrpt URL:','encrypturl',
+	$currentstring .=&Apache::edit::select_arg('Encrypt URL:','encrypturl',
 						   ['no','yes'], $token, 2);
 	$currentstring .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
 	my $src=    &Apache::lonxml::get_param('src',$parstack,$safeeval);