--- loncom/homework/structuretags.pm	2003/05/23 16:26:28	1.177
+++ loncom/homework/structuretags.pm	2003/06/07 04:08:43	1.181
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.177 2003/05/23 16:26:28 albertel Exp $
+# $Id: structuretags.pm,v 1.181 2003/06/07 04:08:43 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -154,6 +154,8 @@ sub setup_rndseed {
 		$rndseed=int(rand(1000000000));
 	    }
 	    $ENV{'form.rndseed'}=$rndseed;
+	    delete($ENV{'form.resetdata'});
+	    delete($ENV{'form.newrandomization'});
 	}
 	&Apache::lonxml::debug("Setting rndseed to $rndseed");
 	&Apache::run::run('$external::randomseed='.$rndseed.';',$safeeval);
@@ -403,6 +405,10 @@ sub start_problem {
 		    "<title>$name</title></head>\n$body_tag_start\n";
 	    }
 	} elsif ($target eq 'tex') {
+	    my $startminipage = '';
+	    if ($ENV{'form.problem_split'} ne 'yes') {
+		$startminipage = '\begin{minipage}{\textwidth}';
+	    }
 	    my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval);
 	    if ($name eq '') {
 		$name=&Apache::lonnet::EXT('resource.title');
@@ -437,9 +443,9 @@ sub start_problem {
 		print $temp_file "$duedate\n";
 		if (not $ENV{'request.symb'} =~ m/\.page_/) {
 		    if(not $duedate=~m/1969/ and $Apache::lonhomework::type ne 'exam') {
-			$result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource <h2>"'.$name_of_resourse.'"</h2> located in <br /><small><b>'.$ENV{'request.uri'}.'</b></small><br /> STAMPOFPASSEDRESOURCEEND} \noindent\textit{Due date: '.$duedate.'} \vskip 1 mm\noindent \begin{minipage}{\textwidth}';	
+			$result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource <h2>"'.$name_of_resourse.'"</h2> located in <br /><small><b>'.$ENV{'request.uri'}.'</b></small><br /> STAMPOFPASSEDRESOURCEEND} \noindent\textit{Due date: '.$duedate.'} \vskip 1 mm\noindent '.$startminipage;	
 		    } else {
-			$result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource <h2>"'.$name_of_resourse.'"</h2> located in <br /><small><b>'.$ENV{'request.uri'}.'</b></small><br /> STAMPOFPASSEDRESOURCEEND} \noindent \vskip 1 mm \noindent\begin{minipage}{\textwidth}';
+			$result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource <h2>"'.$name_of_resourse.'"</h2> located in <br /><small><b>'.$ENV{'request.uri'}.'</b></small><br /> STAMPOFPASSEDRESOURCEEND} \noindent \vskip 1 mm \noindent'.$startminipage;
 			if ($Apache::lonhomework::type eq 'exam' and $allow_print_points==1) { $result .= '\fbox{\textit{'.$weight.' pt}}';}
 		    }
 		} else {
@@ -447,7 +453,7 @@ sub start_problem {
 		}
 	    } else {
 		if (not $ENV{'request.symb'} =~ m/\.page_/) {
-		    $result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource <h2>"'.$name_of_resourse.'"</h2> located in <br /><small><b>'.$ENV{'request.uri'}.'</b></small><br /> STAMPOFPASSEDRESOURCEEND} \noindent \vskip 1 mm\noindent\begin{minipage}{\textwidth}';	
+		    $result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource <h2>"'.$name_of_resourse.'"</h2> located in <br /><small><b>'.$ENV{'request.uri'}.'</b></small><br /> STAMPOFPASSEDRESOURCEEND} \noindent \vskip 1 mm\noindent'.$startminipage;	
 		    if (($Apache::lonhomework::type eq 'exam') and ($allow_print_points==1)) { $result .= '\fbox{\textit{'.$weight.' pt}}';}
 		} else {
 		    $result .= '\vskip 1mm \\\\\\\\';
@@ -505,9 +511,13 @@ sub end_problem {
 	    if ($target eq 'web') {
 		$result.=&Apache::lonxml::xmlend();
 	    } elsif ($target eq 'tex') {
+		my $endminipage = '';
+		if ($ENV{'form.problem_split'} ne 'yes') {
+		    $endminipage = '\end{minipage}';
+		}
 		$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} ';
+		    $result .= $endminipage.'\end{document} ';
 		} else {
 		    $result .= '';
 		}
@@ -524,6 +534,7 @@ sub end_problem {
 	}
     } elsif ($target eq 'meta') {
 	if ($Apache::inputtags::part eq '0') {
+	    @Apache::inputtags::response=();
 	    $result=&Apache::response::mandatory_part_meta;
 	}
     } elsif ($target eq 'edit') {
@@ -925,6 +936,8 @@ sub end_part {
 							$target);
 	if ($Apache::lonhomework::type eq 'exam') {$gradestatus='';}
 	$result=$gradestatus;
+    } elsif ($target eq 'edit') {
+	$result=&Apache::edit::end_table();
     }
     pop @Apache::inputtags::status;
     $Apache::inputtags::part='';