--- loncom/homework/structuretags.pm	2003/05/12 13:50:08	1.170
+++ loncom/homework/structuretags.pm	2003/05/14 18:02:56	1.174
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.170 2003/05/12 13:50:08 www Exp $
+# $Id: structuretags.pm,v 1.174 2003/05/14 18:02:56 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -480,7 +480,8 @@ sub end_problem {
 	    ($target eq 'answer') || ($target eq 'tex')
 	   ) {
 	    if ($status eq 'CAN_ANSWER') {
-		if ($target ne 'tex') {
+		if ($target ne 'tex' &&
+		    $ENV{'form.answer_output_mode'} ne 'tex') {
 		    $result.="</form></body>\n";
 		}
 	    } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER' ||
@@ -492,7 +493,7 @@ sub end_problem {
 	    if ($target eq 'web') {
 		$result.=&Apache::lonxml::xmlend();
 	    } elsif ($target eq 'tex') {
-		$result .= '\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}';
+		$result .= '\keephidden{ENDOFPROBLEM}\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}';
 		if (not $ENV{'request.symb'} =~ m/\.page_/) {
 		    $result .= '\end{minipage}\end{document} ';
 		} else {
@@ -504,8 +505,9 @@ sub end_problem {
 	    &Apache::lonhomework::showhash(%Apache::lonhomework::results);
 	    &finalize_storage();
 	}
-	if ($target eq 'answer' && ($ENV{'request.state'} eq 'construct') ) {
-	    $result.='</html>'; #normally we get it from xmlend, but in CSTR
+	if ($target eq 'answer' && ($ENV{'request.state'} eq 'construct')
+	    && $ENV{'form.answer_output_mode'} ne 'tex') {
+	    $result.='</html>'; # normally we get it from xmlend, but in CSTR
 	                        # we always show answer mode too.
 	}
     } elsif ($target eq 'meta') {