--- loncom/xml/londefdef.pm	2006/01/03 23:41:52	1.307
+++ loncom/xml/londefdef.pm	2006/01/12 23:48:00	1.313
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Tags Default Definition Module 
 #
-# $Id: londefdef.pm,v 1.307 2006/01/03 23:41:52 foxr Exp $
+# $Id: londefdef.pm,v 1.313 2006/01/12 23:48:00 foxr Exp $
 # 
 #
 # Copyright Michigan State University Board of Trustees
@@ -594,25 +594,34 @@ sub end_body {
     return $currentstring;
 }
 
+# \begin{center} causes a new paragprah spacing that looks odd inside 
+# of a table cell
+sub center_correction { return '\vspace*{-6 mm}'; }
 #-- <center> tag (end tag required)
 sub start_center {
-    my ($target,$token) = @_;
+    my ($target,$token,$tagstack) = @_;
     my $currentstring = &end_p();	# Close off any prior para.
     if ($target eq 'web') {
 	$currentstring .= $token->[4];     
     } elsif ($target eq 'tex') {
+	if (&is_inside_of($tagstack, "table")) {
+	    $currentstring .= &center_correction();
+	}
 	$currentstring .= '\begin{center}';  
     }
     return $currentstring;
 }
 
 sub end_center {
-    my ($target,$token) = @_;
+    my ($target,$token,$tagstack) = @_;
     my $currentstring = '';
     if ($target eq 'web') {
 	$currentstring = $token->[2];     
     } elsif ($target eq 'tex') {
 	$currentstring = '\end{center}';  
+	if (&is_inside_of($tagstack, "table")) {
+	    $currentstring .= &center_correction();
+	}
     }
     return $currentstring;
 }
@@ -1178,11 +1187,16 @@ sub start_p {
 	    $closing_string = '</p>'; # Deal correctly with <p /> e.g.
 	}
     } elsif ($target eq 'tex' && !$para_disabled) {
+
 	$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';
 	    $closing_string = '\end{center}';
+	    if (&is_inside_of($tagstack, "table")) {
+		$currentstring = &center_correction().$currentstring;
+		$closing_string .= &center_correction();
+	    }
 	} elsif ($align eq 'right') {
 	    $currentstring.='\makebox['.$env{'form.textwidth'}.']{\hfill\llap{';
 	    $closing_string= '}}';
@@ -1191,7 +1205,11 @@ sub start_p {
 	    $closing_string = '}\hfill}';
 	} else {
             $currentstring.='\par ';
-	    $closing_string = '\strut\\\\\strut ';
+	    if (&is_inside_of($tagstack, 'table')) {
+		$closing_string = '\vskip 12pt'; # Safer in tables.
+	    } else {
+		$closing_string = '\strut\\\\\strut ';
+	    }
         }
 
     }
@@ -1524,6 +1542,10 @@ sub start_div {
 	if ($align eq 'center') {
 	    $currentstring .= '\begin{center}';
 	    $endstring      = '\end{center}';
+	    if (&is_inside_of($tagstack, "table")) {
+		$currentstring = &center_correction().$currentstring;
+		$endstring .= &center_correction();
+	    }
 	}
 	elsif ($align eq 'right') {
 	    $currentstring .= '\begin{flushright}';
@@ -1944,11 +1966,16 @@ sub start_table {
 
 	# width either comes forced from the TeXwidth or the width parameters.
 	# in either case it can be a percentage or absolute width.
-
+	# in the width case we ignore absolute width 
 	my $TeXwidth = &Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,undef,0);
-	if (not defined $TeXwidth) {
-	    $TeXwidth = &Apache::lonxml::get_param('width',$parstack,$safeeval,undef,1);
-
+	if (!defined($TeXwidth)) {
+	    my $htmlwidth = &Apache::lonxml::get_param('width',$parstack,
+						       $safeeval,undef,1);
+	    if ($htmlwidth =~ /%/) {
+		$TeXwidth = $htmlwidth;
+	    } else { 
+		$TeXwidth = $textwidth;
+	    }
 	} else {
 	    $Apache::londefdef::table[-1]{'forcedtablewidth'} = 1;
 	}
@@ -2211,15 +2238,13 @@ sub end_table {
 		}
 
 		if ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') {
-		    # $output.='\vspace*{-6 mm}\begin{center}';
-		    $output.='\begin{center}';
+		    $output.=&center_correction().'\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}\vspace*{-6 mm}';
-		    $output.='\end{center}';
+		    $output.='\end{center}'.&center_correction();
 		} elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') {
 		    $output.='} ';
 		}
@@ -2745,11 +2770,7 @@ sub start_img {
 						  $safeeval,
 						  undef,1));
 	if(!$align) {
-	    if (&is_inside_of($tagstack, "table")) {
-		$align = "right";      # Force wraptext use. 
-	    } else {
 		$align = "bottom";	# This is html's default so it's ours too.
-	    }
 	}
 	#
 	&Apache::lonxml::debug("Alignemnt = $align");
@@ -2764,11 +2785,17 @@ sub start_img {
 							    $parstack,
 							    $safeeval,
 							    undef,0);
-	&Apache::lonxml::debug("LaTeX rendering = $latex_rendering");
+	# &Apache::lonxml::debug("LaTeX rendering = $latex_rendering");
 	if(!$latex_rendering) {
-	    $latex_rendering = "texwrap";
+		$latex_rendering = "texwrap";
+	}
+	# using texwrap inside a table does not work. So, if after all of this,
+	# texwrap is on, we turn it off if we detect we're in a table:
+	#
+	if (($latex_rendering eq 'texwrap') && &is_inside_of($tagstack, "table")) {
+	    $latex_rendering = 'parpic';
 	}
-	&Apache::lonxml::debug("LaTeX rendering = $latex_rendering image file: $src");
+	# &Apache::lonxml::debug("LaTeX rendering = $latex_rendering image file: $src");
 
 	#if original gif/jpg/png file exist do following:
 	my $origsrc=$src;