--- loncom/interface/lonprintout.pm	2023/04/17 10:17:07	1.693
+++ loncom/interface/lonprintout.pm	2024/11/01 00:08:03	1.698
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.693 2023/04/17 10:17:07 raeburn Exp $
+# $Id: lonprintout.pm,v 1.698 2024/11/01 00:08:03 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1865,7 +1865,7 @@ my %page_formats=
 	 },
 	 'album' => {
 	     '1' => [ '8.8 in', '6.8 in','-0.55 in',  '-0.55 in','0.394 in'],
-	     '2' => [ '4.8 in', '6.8 in','-0.5 in', '-1.0 in','3.5 in']
+	     '2' => [ '4.8 in', '6.8 in','-0.5 in', '-1.0 in','3.0 in']
 	 },
      },
      'legal' => {
@@ -1925,7 +1925,7 @@ my %page_formats=
 	 },
 	 'album' => {
 	     '1' => ['21.59 cm','19.558 cm','-1.397cm','-2.11 cm','0 cm'],
-	     '2' => ['9.91 cm','19.558 cm','-1.397 cm','-2.11 cm','0 cm']
+	     '2' => ['9.91 cm','19.558 cm','-1.397 cm','-2.11 cm','-1 cm']
 	 },
      },
      'a5' => {
@@ -2012,23 +2012,46 @@ sub page_format_transformation {
     } else {
 	$fancypagestatement="\\rhead{}\\chead{}\\lhead{$header_text}";
     }
+    my ($paperwidth,$paperheight);
     if ($layout eq 'album') {
 	    $text =~ s/\\begin\{document}/\\setlength{\\oddsidemargin}{$oddoffset}\\setlength{\\evensidemargin}{$evenoffset}$topmargintoinsert\n\\setlength{\\textwidth}{$textwidth}\\setlength{\\textheight}{$textheight}\\setlength{\\textfloatsep}{8pt plus 2\.0pt minus 4\.0pt}\n\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\usepackage{fancyhdr}\\addtolength{\\headheight}{\\baselineskip}\n\\pagestyle{fancy}$fancypagestatement\\usepackage{booktabs}\\begin{document}\\voffset=-0\.8 cm\\setcounter{page}{1}\n /;
+        if ($papersize eq 'a4') {
+            $paperwidth = '29.7cm';
+            $paperheight = '21cm';
+        } elsif ($numberofcolumns eq '1') {
+            if ($papersize eq 'letter') {
+                $paperwidth = '11in';
+                $paperheight = '8.5in';
+            } elsif ($papersize eq 'legal') {
+                $paperwidth = '14in';
+                $paperheight = '8.5in';
+            }
+        }
     } elsif ($layout eq 'book') {
 	if ($choice ne 'All class print') { 
 	    $text =~ s/\\begin\{document}/\\textheight $textheight\\oddsidemargin = $evenoffset\\evensidemargin = $evenoffset $topmargintoinsert\n\\textwidth= $textwidth\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\n\\renewcommand{\\ref}{\\keephidden\}\\usepackage{fancyhdr}\\addtolength{\\headheight}{\\baselineskip}\\pagestyle{fancy}$fancypagestatement\\usepackage{booktabs}\\begin{document}\n\\voffset=-0\.8 cm\\setcounter{page}{1}\n/;
 	} else {
 	    $text =~ s/\\pagestyle\{fancy}\\rhead\{}\\chead\{}\s*\\begin\{document}/\\textheight = $textheight\\oddsidemargin = $evenoffset\n\\evensidemargin = $evenoffset $topmargintoinsert\\textwidth= $textwidth\\newlength{\\minipagewidth}\n\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\renewcommand{\\ref}{\\keephidden\}\\pagestyle{fancy}\\rhead{}\\chead{}\\usepackage{booktabs}\\begin{document}\\voffset=-0\.8cm\n\\setcounter{page}{1}  \\vskip 5 mm\n /;
 	}
-	if ($papersize eq 'a4') {
-	    my $papersize_text;
-	    if ($perm{'pav'}) {
-		$papersize_text = '\\special{papersize=210mm,297mm}';
-	    } else {
-		$papersize_text = '\special{papersize=210mm,297mm}';
-	    }
-	    $text =~ s/(\\begin\{document})/$1$papersize_text/;
-	}
+        if ($papersize eq 'a4') {
+            $paperwidth = '21cm';
+            $paperheight = '29.7cm';
+        } elsif ($papersize eq 'letter') {
+            $paperwidth = '8.5in';
+            $paperheight = '11.5in';
+         } elsif ($papersize eq 'legal') {
+            $paperwidth = '8.5in';
+            $paperheight = '14.0in';
+        }
+    }
+    if ($paperwidth ne '' && $paperheight ne '') {
+        my $papersize_text;
+        if ($perm{'pav'}) {
+            $papersize_text = '\\special{papersize='.$paperwidth.','.$paperheight.'}';
+        } else {
+            $papersize_text = '\special{papersize='.$paperwidth.','.$paperheight.'}';
+        }
+        $text =~ s/(\\begin\{document})/$1$papersize_text/;
     }
     if ($tableofcontents eq 'yes') {$text=~s/(\\setcounter\{page\}\{1\})/$1 \\tableofcontents\\newpage /;}
     if ($indexlist eq 'yes') {
@@ -3406,6 +3429,7 @@ ENDPART
          }
 	 my %moreenv = ('textwidth' => &get_textwidth($helper,$LaTeXwidth));
 	 $moreenv{'problem_split'}    = $parmhash{'problem_stream_switch'};
+         $moreenv{'suppress_tries'} = $parmhash{'suppress_tries'};
          $moreenv{'instructor_comments'}='hide';
          $moreenv{'bubbles_per_row'} = $bubbles_per_row;
 	 my $seed=time+($$<<16)+($$);
@@ -4844,9 +4868,9 @@ CHOOSE_FROM_SUBDIR
     <nextstate>PRINT_FORMATTING</nextstate>
     <message>(mark desired resources then click "next" button) <br /></message>
     <resource variable="RESOURCES" multichoice="1" addstatus="1"
-              closeallpages="1" modallink="1">
+              closeallpages="1" modallink="1" suppressNavmap="1" $nocurrloc>
       <filterfunc>return $isNotMap;</filterfunc>
-      <mapurl>$map</mapurl>
+      <mapurl>$escapedSequenceName</mapurl>
       <valuefunc>return $symbFilter;</valuefunc>
       $start_new_option
       </resource>