--- loncom/xml/londefdef.pm	2007/02/01 10:49:27	1.354
+++ 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.354 2007/02/01 10:49:27 foxr 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.