--- loncom/homework/structuretags.pm	2007/05/28 22:51:29	1.378
+++ loncom/homework/structuretags.pm	2007/06/22 20:42:20	1.382
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.378 2007/05/28 22:51:29 albertel Exp $
+# $Id: structuretags.pm,v 1.382 2007/06/22 20:42:20 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -103,12 +103,8 @@ function setSubmittedPart (part) {
 	
 	$extra_head .= &Apache::lonhtmlcommon::spellheader();
 
-	my $css_href = &Apache::lonnet::EXT('resource.0.cssfile');
-	if ($css_href =~ /\S/) {
-	    &Apache::lonxml::extlink($css_href);
-	    $extra_head .= 
-		'<link rel="stylesheet" type="text/css" href="'.$css_href.'" />';
-	}
+	$extra_head .= &Apache::londefdef::generate_css_links();
+
 	if ($target eq 'edit') {
 	    $extra_head.=&Apache::edit::js_change_detection().
 		"<script type=\"text/javascript\">\n".
@@ -884,14 +880,14 @@ sub end_problem {
 		    if ($Apache::lonhomework::type eq 'exam' and $allow_print_points==1) { $frontmatter .= '\fbox{\textit{'.$weight.' pt}}';}
 		}
 	    } else {
-		$frontmatter .= '\vskip 1mm\textit{Due date: '.$duedate.'} \\\\\\\\';
+		$frontmatter .= '\vskip 1mm\textit{Due date: '.$duedate.'} \\\\\\\\'.$startminipage;
 	    }
 	} else {
 	    if (not $env{'request.symb'} =~ m/\.page_/) {
 		$frontmatter .= $begin_doc.$toc_line;
 		if (($Apache::lonhomework::type eq 'exam') and ($allow_print_points==1)) { $frontmatter .= '\fbox{\textit{'.$weight.' pt}}';}
 	    } else {
-		$frontmatter .= '\vskip 1mm \\\\\\\\';
+		$frontmatter .= '\vskip 1mm \\\\\\\\'.$startminipage;
 	    }
 	}
 	$result =~ s/INSERTTEXFRONTMATTERHERE/$frontmatter/;
@@ -941,7 +937,7 @@ sub end_problem {
 		    if (not $env{'request.symb'} =~ m/\.page_/) {
 			$result .= $endminipage.'\end{document} ';
 		    } else {
-			$result .= '';
+			$result .= $endminipage;
 		    }
 		}
 	    }
@@ -1229,6 +1225,13 @@ sub end_while {
 		$return = 0; $error=1; next;
 	    }
 	    $result.=&Apache::scripttag::xmlparse($bodytext);
+	    if ($target eq 'grade' || $target eq 'answer' ||
+		$target eq 'analyze') {
+		# grade/answer/analyze should produce no output but if we
+		# are redirecting, the redirecter should know what to do
+		# with the output
+		if (!$Apache::lonxml::redirection) { undef($result); }
+	    }
 	    $return = &Apache::run::run($code,$safeeval);
 	}
 	if ($error) {