--- loncom/homework/structuretags.pm	2004/07/27 23:35:33	1.261
+++ loncom/homework/structuretags.pm	2004/08/13 15:54:06	1.264
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.261 2004/07/27 23:35:33 www Exp $
+# $Id: structuretags.pm,v 1.264 2004/08/13 15:54:06 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -646,14 +646,15 @@ sub end_problem {
 		    $endminipage = '\end{minipage}';
 		}
                 if ($ENV{'form.print_discussions'} eq 'yes') {
-		    $result.=&Apache::lonxml::xmlend();
+		    $result.=&Apache::lonxml::xmlend($target,$parser);
 		    $result=~s/<\/html>//;
-		}
-		$result .= '\keephidden{ENDOFPROBLEM}\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}';
-		if (not $ENV{'request.symb'} =~ m/\.page_/) {
-		    $result .= $endminipage.'\end{document} ';
 		} else {
-		    $result .= '';
+		    $result .= '\keephidden{ENDOFPROBLEM}\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}';
+		    if (not $ENV{'request.symb'} =~ m/\.page_/) {
+			$result .= $endminipage.'\end{document} ';
+		    } else {
+			$result .= '';
+		    }
 		}
 	    }
 	}
@@ -1084,7 +1085,11 @@ sub start_part {
 	    } else {
 		if ($target eq 'tex') {
 		    if (not $ENV{'form.problem_split'}=~/yes/) {
-			$result.='\noindent \end{minipage}\vskip 0 mm \noindent \begin{minipage}{\textwidth}\noindent';
+			if ($$tagstack[-2] eq 'td') {
+			    $result.='\vskip 0 mm \noindent \begin{minipage}{\textwidth}\noindent';
+			} else {
+			    $result.='\noindent \end{minipage}\vskip 0 mm \noindent \begin{minipage}{\textwidth}\noindent';
+			}
 		    }
 		    my $weight = &Apache::lonnet::EXT("resource.$id.weight");
 		    my $allkeys=&Apache::lonnet::metadata($ENV{'request.uri'},'packages');
@@ -1144,6 +1149,7 @@ sub end_part {
 	    $gradestatus='';
 	}
 	$result=$gradestatus;
+	if ($$tagstack[-2] eq 'td') {$result.='\end{minipage}';} 
     } elsif ($target eq 'edit') {
 	$result=&Apache::edit::end_table();
     }