--- loncom/xml/londefdef.pm	2007/01/18 20:48:02	1.352
+++ loncom/xml/londefdef.pm	2007/03/09 00:08:02	1.356
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Tags Default Definition Module 
 #
-# $Id: londefdef.pm,v 1.352 2007/01/18 20:48:02 albertel Exp $
+# $Id: londefdef.pm,v 1.356 2007/03/09 00:08:02 foxr Exp $
 # 
 #
 # Copyright Michigan State University Board of Trustees
@@ -1227,11 +1227,10 @@ sub start_br {
 	}
 	if ($signal eq 1) {
 	    $currentstring .= ' \vskip 0 mm ';
-	} elsif ($$tagstack[-2] ne 'sub' && $$tagstack[-2] ne 'sup') {
+	} else {
 	    $currentstring .= '\strut \\\\ \strut ';
-	} else {                   # Honor break in simple <sup></sup>
-	    $currentstring .= '}} \strut \\\\ \strut \ensuremath{^{'; 
 	}
+    
     }
     return $currentstring;
 }
@@ -1413,7 +1412,7 @@ sub start_sub {
     if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring .= $token->[4];
     } elsif ($target eq 'tex') {
-	$currentstring .= '\ensuremath{_{';
+	$currentstring .= '\raisebox{-\smallskipamount}{\scriptsize{';
     } 
     return $currentstring;
 }
@@ -1436,7 +1435,7 @@ sub start_sup {
     if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring .= $token->[4];
     } elsif ($target eq 'tex') {
-	$currentstring .= '\ensuremath{^{';
+	$currentstring .= '\raisebox{\smallskipamount}{\scriptsize{';
     } 
     return $currentstring;
 }
@@ -1994,12 +1993,6 @@ sub start_table {
         $Apache::londefdef::table[-1]{'minlen'}=[];
         $Apache::londefdef::table[-1]{'content'}=[];
         $Apache::londefdef::table[-1]{'align'}=[];
-	if (&is_inside_of($tagstack, 'sup')) {
-	    $currentstring .= '}} \\\\ \ensuremath{^{ ';
-	}
-	if (&is_inside_of($tagstack, 'sub')) {
-	    $currentstring .= '}} \\\\ \ensuremath{_{ ';
-	}
         $currentstring.=' \keephidden{NEW TABLE ENTRY}';
 
 
@@ -2208,17 +2201,18 @@ sub end_table {
 		#   single rowspan, columspan and combined row/colspans will
                 #   work correctly.  LaTeX is delicate here.
 		#    RF.
-
+		
 		# Start a rowspan if necessary:
-
+		
+		my $primary_col_width = $fwidth[$jn]; # Width of primary column.
 		my $rowspan = $Apache::londefdef::table[-1]{'rowspan'}[$in][$jn];
 		my $colspan = $Apache::londefdef::table[-1]{'colspan'}[$in][$jn];
 		#
 		#  Do the appropriate magic if this has a colspan
 		# 
-
+		
+		my $spanwidth = 0;
 		if ($colspan > 1) {
-		    my $spanwidth = 0;
 		    for (my $spancol = $jn; $spancol < $jn + $colspan; $spancol++) {
 			$spanwidth += $fwidth[$spancol];
 		    }
@@ -2233,7 +2227,9 @@ sub end_table {
 		    else {
 			$output .= "{|p{$spanwidth mm}|}{";
 		    }
-			
+		    
+		} else {
+		    $spanwidth = $primary_col_width; # If no span width will be just colwidth
 		}
 
 		# Rowspan... if colspan is 1, and there's an alignment we'll need
@@ -2253,13 +2249,17 @@ sub end_table {
 			}
 		    }
 		    $have_rowspan++;
-		    $output .= '\multirow{'.$rowspan.'}[0]{*}{';
+		    if ($multirow_aligned) {
+			$output .= '\multirow{'.$rowspan.'}[0]{*}{';
+		    } else {
+			$output .= '\multirow{'.$rowspan."}[0]{$spanwidth mm}{";
+		    }
 		    
 		    $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 {
@@ -2273,7 +2273,7 @@ sub end_table {
 		if (($rowspan eq '^') || ($rowspan eq '_')) {
 		    $have_rowspan++;
 		}
-		#--------------------------------------------------------------
+		    #--------------------------------------------------------------
 
 
 		# For right and center alignment of single cells.
@@ -2879,47 +2879,14 @@ sub start_img {
 	    $size=~s/,$/]/; 
 	    $currentstring .= '\graphicspath{{'.$path.'}}'
 		.'\includegraphics'.$size.'{'.$file.'} ';
-
-	    #    If there's an alignment specification we need to honor it here.
-	    #    For the horizontal alignments, we will also honor the
-	    #    value of the latex specfication.  The default is parbox,
-	    #    and that's used for illegal values too.  
-	    #    
-	    #    Even though we set a default alignment value, the user
-	    #    could have given us an illegal value.  In that case we
-	    #    just use the default alignment of bottom..
-	    if      ($align eq "top")    {
-		$currentstring = '\raisebox{-'.$height_param.'mm}{'.$currentstring.'}';
-	    } elsif (($align eq "center") || ($align eq "middle")) { # Being kind
-		my $offset = $height_param/2;
-		$currentstring = '\raisebox{-'.$offset.'mm}{'.$currentstring.'}';
-	    } elsif ($align eq "left")   { 
-		if ($latex_rendering eq "parpic") { 
-		    $currentstring = '\parpic[l]{'.$currentstring.'}';
-		} elsif ($latex_rendering eq "parbox") {
-		    $currentstring = '\begin{minipage}[l]{'.$width_param.'mm}'
-			.$currentstring.'\end{minipage}';
-		} elsif ($latex_rendering eq "wrapfigure"
-			 || $latex_rendering ne 'none') {  # wrapfig render
-		    $currentstring = 
-			'\begin{wrapfigure}{l}{'.$width_param.'mm}'
-			.'\scalebox{1.0}{'.$currentstring.'}\end{wrapfigure}';
-		}
-	    } elsif ($align eq "right")  {   
-		if ($latex_rendering eq "parpic") {
-		    $currentstring = '\parpic[r]{'.$currentstring.'}';
-		} elsif ($latex_rendering eq "parbox") {
-		    $currentstring =  '\begin{minipage}[r]{'.$width_param.'mm}'
-			.$currentstring.'\end{minipage}';
-		} elsif ($latex_rendering eq "wrapfigure"
-			 || $latex_rendering ne 'none') {  # wrapfig render
-		    $currentstring = 
-			'\begin{wrapfigure}{r}{'.$width_param.'mm}'
-			.'\scalebox{1.0}{'.$currentstring.'}\end{wrapfigure}';
-		}
-	    } else {		# Bottom is also default.
-		# $currentstring = '\raisebox{'.$height_param.'mm}{'.$currentstring.'}';
-	    }
+	    my $closure;
+	    ($currentstring, $closure) = &align_latex_image($align, 
+							    $latex_rendering, 
+							    $currentstring, 
+							    $width_param, 
+							    $height_param);
+	    $currentstring .= $closure;
+						
 	} else {
 	    &Apache::lonxml::debug("$src does not exist");
 	    #original image file doesn't exist so check the alt attribute
@@ -4389,6 +4356,78 @@ sub LATEX_length {
     return $value;
 }
 
+#   Wrap image 'stuff' inside of the LaTeX required to implement 
+#   alignment:
+#     align_tex_image(align, latex_rendering, image)
+#   Where:
+#     align   - The HTML alignment specification.
+#     latex_rendering - rendering hint for latex.
+#     image   - The LaTeX needed to insert the image itsef.
+#     width,height - dimensions of the image.
+# Returns:
+#    The 1/2 wrapped image and the stuff required to close the
+#    wrappage.  This allows e.g. randomlabel to insert more stuff
+#    into the closure.
+#
+sub align_latex_image {
+    my ($align, $latex_rendering, $image, $width, $height) = @_;
+    my $currentstring;        # The 1/2 wrapped image.
+    my $closure;              # The closure of the wrappage.
+    #    If there's an alignment specification we need to honor it here.
+    #    For the horizontal alignments, we will also honor the
+    #    value of the latex specfication.  The default is parbox,
+    #    and that's used for illegal values too.  
+    #    
+    #    Even though we set a default alignment value, the user
+    #    could have given us an illegal value.  In that case we
+    #    just use the default alignment of bottom..
+    $currentstring = "\n% figurewrapping \n";
+    if      ($align eq "top")    {
+	$currentstring .= '\raisebox{-'.$height.'mm}{'.$image;
+	$closure = '}';
+    } elsif (($align eq "center") || ($align eq "middle")) { # Being kind
+	my $offset = $height/2;
+	$currentstring .= '\raisebox{-'.$offset.'mm}{'.$image;
+	$closure       = '}';
+    } elsif ($align eq "left")   { 
+	if ($latex_rendering eq "parpic") { 
+	    $currentstring .= '\parpic[l]{'.$image;
+	    $closure       = '}';
+	} elsif ($latex_rendering eq "parbox") {
+	    $currentstring .= '\begin{minipage}[l]{'.$width.'mm}'
+		.$image;
+	    $closure = '\end{minipage}';
+	} elsif ($latex_rendering eq "wrapfigure"
+		 || $latex_rendering ne 'none') {  # wrapfig render
+	    $currentstring .= 
+		'\begin{wrapfigure}{l}{'.$width.'mm}'
+		.'\scalebox{1.0}{'.$image;
+	    $closure = '}\end{wrapfigure}';
+	}
+    } elsif ($align eq "right")  {   
+	if ($latex_rendering eq "parpic") {
+	    $currentstring .= '\parpic[r]{'.$image;
+	    $closure = '}';
+	} elsif ($latex_rendering eq "parbox") {
+	    $currentstring .=  '\begin{minipage}[r]{'.$width.'mm}'
+		.$image;
+	    $closure = '\end{minipage}';
+	} elsif ($latex_rendering eq "wrapfigure"
+		 || $latex_rendering ne 'none') {  # wrapfig render
+	    $currentstring .= 
+		'\begin{wrapfigure}{r}{'.$width.'mm}'
+		.'\scalebox{1.0}{'.$image;
+	    $closure = '}\end{wrapfigure}';
+	}
+    } else {		# Bottom is also default.
+	# $currentstring = '\raisebox{'.$height.'mm}{'.$image.'}';
+	$currentstring .= "{$image";
+	$closure       = '}';
+    }
+    $currentstring .= "\n% end wrappage\n";
+    $closure        = "\n% Begin closure\n".$closure."\n% End closure\n";
+    return ($currentstring, $closure);
+}
 
 # is_inside_of $tagstack $tag
 #    This sub returns true if the current state of Xml processing