--- loncom/interface/lonprintout.pm	2021/11/30 15:55:37	1.674
+++ loncom/interface/lonprintout.pm	2022/06/11 14:38:27	1.678
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.674 2021/11/30 15:55:37 raeburn Exp $
+# $Id: lonprintout.pm,v 1.678 2022/06/11 14:38:27 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1236,6 +1236,7 @@ sub is_code_valid {
     my ($code_type, $code_length) = ('letter', 6);	# defaults.
     my @lines = &Apache::lonnet::get_scantronformat_file();
     foreach my $line (@lines) {
+        next if (($line =~ /^\#/) || ($line eq ''));
 	my ($name, $type, $length) = (split(/:/, $line))[0,2,4];
 	if($name eq $code_option) {
 	    $code_length = $length;
@@ -1339,8 +1340,8 @@ sub latex_header_footer_remove {
 #  necessity is determined by the problem_split param.
 #
 sub encapsulate_minipage {
-    my ($text) = @_;
-    if (!($env{'form.problem.split'} =~ /yes/i)) {
+    my ($text,$problem_split) = @_;
+    if (!($problem_split =~ /yes/i)) {
 	$text = '\begin{minipage}{\textwidth}'.$text.'\end{minipage}';
     }
     return $text;
@@ -2549,7 +2550,7 @@ sub print_construction_sequence {
 		    my $body ='\vskip 0 mm \noindent\textbf{'.$title.'}\vskip 0 mm ';
 		    $body.=&path_to_problem($urlp,$LaTeXwidth);
 		    $body.='\vskip 1 mm '.$answer.'\end{document}';
-		    $body = &encapsulate_minipage($body);
+		    $body = &encapsulate_minipage($body,$answerform{'problem_split'});
 		    $texversion.=$body;
 		}
 	    }
@@ -3014,7 +3015,7 @@ ENDPART
 			    my $body ='\vskip 0 mm \noindent\textbf{'.$title.'}\vskip 0 mm ';
 			    $body   .= &path_to_problem ($urlp,$LaTeXwidth);
 			    $body   .='\vskip 1 mm '.$answer;
-			    $body    = &encapsulate_minipage($body);
+			    $body    = &encapsulate_minipage($body,$answerform{'problem_split'});
 			    $texversion .= $body;
 			} else {
 			    $texversion='';
@@ -3240,7 +3241,7 @@ ENDPART
          my @lines = &Apache::lonnet::get_scantronformat_file();
 	 my ($code_type,$code_length,$bubbles_per_row)=('letter',6,10);
 	 foreach my $line (@lines) {
-             chomp($line);
+             next if (($line =~ /^\#/) || ($line eq ''));
 	     my ($name,$type,$length,$bubbles_per_item) = 
                  (split(/:/,$line))[0,2,4,17];
 	     if ($name eq $code_option) {
@@ -3252,18 +3253,10 @@ ENDPART
                  }
 	     }
 	 }
-         my ($randomorder,$randompick,$map);
+         my $map;
          if ($helper->{VARS}{'symb'}) {
              ($map, my $id, my $resource) =
                  &Apache::lonnet::decode_symb($helper->{VARS}{'symb'});
-             my $navmap = Apache::lonnavmaps::navmap->new();
-             if (defined($navmap)) {
-                 if ($map) {
-                     my $mapres = $navmap->getResourceByUrl($map);
-                     $randomorder = $mapres->randomorder();
-                     $randompick = $mapres->randompick();
-                 }
-             }
          }
 	 my %moreenv = ('textwidth' => &get_textwidth($helper,$LaTeXwidth));
 	 $moreenv{'problem_split'}    = $parmhash{'problem_stream_switch'};
@@ -3332,14 +3325,11 @@ ENDPART
 	     } else {
 		 $moreenv{'CODE'}=&num_to_letters($code);
 	     }
-             my $actual_seq = \@master_seq;
-             if ($randomorder || $randompick) {
-                 $env{'form.CODE'} = $moreenv{'CODE'};
-                 $actual_seq = master_seq_to_person_seq($map, \@master_seq,
-                                                        undef,
-                                                        $moreenv{'CODE'}, $nohidemap);
-                 delete($env{'form.CODE'});
-             }
+             $env{'form.CODE'} = $moreenv{'CODE'};
+             my $actual_seq = master_seq_to_person_seq($map, \@master_seq,
+                                                       undef,
+                                                       $moreenv{'CODE'}, $nohidemap);
+             delete($env{'form.CODE'});
 	     my ($output,$fullname, $printed)=
 		 &print_resources($r,$helper,'anonymous',$type,\%moreenv,
 				  $actual_seq,$flag_latex_header_remove,
@@ -3738,7 +3728,7 @@ sub print_resources {
 			    my $body   ='\vskip 0 mm \noindent\textbf{'.$title.'}\vskip 0 mm ';
 			    $body     .=&path_to_problem($res_url,$LaTeXwidth);
 			    $body     .='\vskip 1 mm '.$ansrendered;
-			    $body     = &encapsulate_minipage($body);
+			    $body     = &encapsulate_minipage($body,$answerenv{'problem_split'});
 			    $rendered = $header.$body;
 			}
 		    }
@@ -3828,7 +3818,7 @@ sub print_resources {
             $message = &mt('No incomplete resources');
         }
         if ($message) { 
-	    $current_output  = &encapsulate_minipage("\\vskip -10mm \n$message\n \\vskip 100 mm { }\n");
+	    $current_output  = &encapsulate_minipage("\\vskip -10mm \n$message\n \\vskip 100 mm { }\n",$moreenv->{'problem_split'});
         }
 	if ($remove_latex_header eq "NO") {
 	    $current_output = &print_latex_header() . $current_output;