--- loncom/xml/londefdef.pm	2006/12/19 22:30:52	1.348
+++ loncom/xml/londefdef.pm	2007/01/08 19:09:23	1.350
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Tags Default Definition Module 
 #
-# $Id: londefdef.pm,v 1.348 2006/12/19 22:30:52 albertel Exp $
+# $Id: londefdef.pm,v 1.350 2007/01/08 19:09:23 albertel Exp $
 # 
 #
 # Copyright Michigan State University Board of Trustees
@@ -2251,6 +2251,12 @@ sub end_table {
 		    }
 		    $have_rowspan++;
 		    $output .= '\multirow{'.$rowspan.'}[0]{*}{';
+		    
+		    $Apache::londefdef::table[-1]{'content'}[$in][$jn] =~
+			s{^\s*\\par\s*}{};
+		    $Apache::londefdef::table[-1]{'content'}[$in][$jn] =~
+			s{\s*\\vskip\s*0pt\s*$}{};
+
 		    #
 		    # If we did not throw in a multicolumn to align, then add 
 		    # an extra {
@@ -2891,7 +2897,7 @@ sub start_img {
 		    $currentstring = '\begin{minipage}[l]{'.$width_param.'mm}'
 			.$currentstring.'\end{minipage}';
 		} elsif ($latex_rendering eq "wrapfigure"
-			 || $latexrendering ne 'none') {  # wrapfig render
+			 || $latex_rendering ne 'none') {  # wrapfig render
 		    $currentstring = 
 			'\begin{wrapfigure}{l}{'.$width_param.'mm}'
 			.'\scalebox{1.0}{'.$currentstring.'}\end{wrapfigure}';
@@ -2903,7 +2909,7 @@ sub start_img {
 		    $currentstring =  '\begin{minipage}[r]{'.$width_param.'mm}'
 			.$currentstring.'\end{minipage}';
 		} elsif ($latex_rendering eq "wrapfigure"
-			 || $latexrendering ne 'none') {  # wrapfig render
+			 || $latex_rendering ne 'none') {  # wrapfig render
 		    $currentstring = 
 			'\begin{wrapfigure}{r}{'.$width_param.'mm}'
 			.'\scalebox{1.0}{'.$currentstring.'}\end{wrapfigure}';