--- loncom/xml/londefdef.pm	2004/05/26 15:13:56	1.217
+++ loncom/xml/londefdef.pm	2004/06/08 14:13:21	1.221
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Tags Default Definition Module 
 #
-# $Id: londefdef.pm,v 1.217 2004/05/26 15:13:56 sakharuk Exp $
+# $Id: londefdef.pm,v 1.221 2004/06/08 14:13:21 sakharuk Exp $
 # 
 #
 # Copyright Michigan State University Board of Trustees
@@ -1154,8 +1154,11 @@ sub start_br {
     if ($target eq 'web') {
 	$currentstring .= $token->[4];
     } elsif ($target eq 'tex') {
-	if ($$tagstack[-2] ne 'sub' && $$tagstack[-2] ne 'sup') {
-	    $currentstring .= '\vskip 0.2 mm ';
+	if (($$tagstack[-2] eq 'b') || ($$tagstack[-2] eq 'strong') ||
+            ($$tagstack[-2] eq 'ol') || ($$tagstack[-2] eq 'ul')) {
+	    $currentstring .= ' \vskip 0 mm ';
+	} elsif ($$tagstack[-2] ne 'sub' && $$tagstack[-2] ne 'sup') {
+	    $currentstring .= '\strut \\\\ \strut ';
 	}
     }
     return $currentstring;
@@ -1534,17 +1537,17 @@ sub start_ul {
 	    $currentstring .= ' \renewcommand{\labelitemi}{$\bullet$}
                                 \renewcommand{\labelitemii}{$\bullet$} 
                                 \renewcommand{\labelitemiii}{$\bullet$}
-                                \renewcommand{\labelitemiv}{$\bullet$}';
+                                \renewcommand{\labelitemiv}{$\bullet$}\strut ';
 	} elsif ($TeXtype eq 'circle') {
 	    $currentstring .= ' \renewcommand{\labelitemi}{$\circ$}
                                 \renewcommand{\labelitemii}{$\circ$} 
                                 \renewcommand{\labelitemiii}{$\circ$}
-                                \renewcommand{\labelitemiv}{$\circ$}';
+                                \renewcommand{\labelitemiv}{$\circ$}\strut ';
 	} elsif ($TeXtype eq 'square') {
 	    $currentstring .= ' \renewcommand{\labelitemi}{$\diamond$}
                                 \renewcommand{\labelitemii}{$\diamond$} 
                                 \renewcommand{\labelitemiii}{$\diamond$}
-                                \renewcommand{\labelitemiv}{$\diamond$}';
+                                \renewcommand{\labelitemiv}{$\diamond$}\strut ';
 	}
 	$currentstring .= '\begin{itemize}';  
     } 
@@ -1560,7 +1563,7 @@ sub end_ul {
 	$currentstring = '\end{itemize} \renewcommand{\labelitemi}{$\bullet$}
                                 \renewcommand{\labelitemii}{$\bullet$} 
                                 \renewcommand{\labelitemiii}{$\bullet$}
-                                \renewcommand{\labelitemiv}{$\bullet$}';  
+                                \renewcommand{\labelitemiv}{$\bullet$}\strut ';  
     } 
     return $currentstring;
 }
@@ -1623,27 +1626,27 @@ sub start_ol {
 	    $currentstring .= ' \renewcommand{\labelenumi}{\arabic{enumi}.}
                                 \renewcommand{\labelenumii}{\arabic{enumii}.} 
                                 \renewcommand{\labelenumiii}{\arabic{enumiii}.}
-                                \renewcommand{\labelenumiv}{\arabic{enumiv}.}';
+                                \renewcommand{\labelenumiv}{\arabic{enumiv}.}\strut ';
 	} elsif ($type eq 'A') {
 	    $currentstring .= ' \renewcommand{\labelenumi}{\Alph{enumi}.}
                                 \renewcommand{\labelenumii}{\Alph{enumii}.} 
                                 \renewcommand{\labelenumiii}{\Alph{enumiii}.}
-                                \renewcommand{\labelenumiv}{\Alph{enumiv}.}';
+                                \renewcommand{\labelenumiv}{\Alph{enumiv}.}\strut ';
 	} elsif ($type eq 'a') {
 	    $currentstring .= ' \renewcommand{\labelenumi}{\alph{enumi}.}
                                 \renewcommand{\labelenumii}{\alph{enumii}.}
                                 \renewcommand{\labelenumiii}{\alph{enumiii}.}
-                                \renewcommand{\labelenumiv}{\alph{enumiv}.} ';
+                                \renewcommand{\labelenumiv}{\alph{enumiv}.} \strut ';
 	} elsif ($type eq 'i') {
 	    $currentstring .= ' \renewcommand{\labelenumi}{\roman{enumi}.}
                                 \renewcommand{\labelenumii}{\roman{enumii}.}
                                 \renewcommand{\labelenumiii}{\roman{enumiii}.}
-                                \renewcommand{\labelenumiv}{\roman{enumiv}.} ';
+                                \renewcommand{\labelenumiv}{\roman{enumiv}.}\strut  ';
 	} elsif ($type eq 'I') {
 	    $currentstring .= ' \renewcommand{\labelenumi}{\Roman{enumi}.}
                                 \renewcommand{\labelenumii}{\Roman{enumii}.}
                                 \renewcommand{\labelenumiii}{\Roman{enumiii}.}
-                                \renewcommand{\labelenumiv}{\Roman{enumiv}.} ';
+                                \renewcommand{\labelenumiv}{\Roman{enumiv}.} \strut ';
 	}
 	$currentstring .= '\begin{enumerate}';  
     } 
@@ -1659,7 +1662,7 @@ sub end_ol {
 	$currentstring = '\end{enumerate} \renewcommand{\labelenumi}{\arabic{enumi}.}
                                           \renewcommand{\labelenumii}{\arabic{enumii}.}
                                           \renewcommand{\labelenumiii}{\arabic{enumiii}.}
-                                          \renewcommand{\labelenumiv}{\arabic{enumiv}.}';  
+                                          \renewcommand{\labelenumiv}{\arabic{enumiv}.}\strut ';  
     } 
     return $currentstring;
 }
@@ -1832,7 +1835,7 @@ sub start_table {
 	    $Apache::londefdef::table[-1]{'vvinc'} = '';
 	}
 	if ($#Apache::londefdef::table==0) {
-	    $Apache::londefdef::table[-1]{'output'}='\newline\setlength{\tabcolsep}{1 mm}';
+	    $Apache::londefdef::table[-1]{'output'}='\strut\newline\strut\setlength{\tabcolsep}{1 mm}';
 	}
 	$Apache::londefdef::table[-1]{'output'}.=' \noindent \begin{tabular} ';
         $Apache::londefdef::table[-1]{'TeXlen'}=[];
@@ -2014,7 +2017,7 @@ sub end_table {
 	    }
 	    $output.=' \\\\ '.$Apache::londefdef::table[-1]{'hinc'}.' ';
 	}
-	$Apache::londefdef::table[-1]{'output'} .= $header_of_table.$Apache::londefdef::table[-1]{'hinc'}.$output.'\end{tabular}\vskip 0 mm ';
+	$Apache::londefdef::table[-1]{'output'} .= $header_of_table.$Apache::londefdef::table[-1]{'hinc'}.$output.'\end{tabular}\strut\newline\strut ';
 	if ($#Apache::londefdef::table > 0) {	    
 	    my $inmemory = $Apache::londefdef::table[-1]{'output'};
 	    pop @Apache::londefdef::table;