--- loncom/interface/lonprintout.pm	2003/04/30 16:35:09	1.133
+++ loncom/interface/lonprintout.pm	2003/06/24 14:56:16	1.195
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.133 2003/04/30 16:35:09 bowersj2 Exp $
+# $Id: lonprintout.pm,v 1.195 2003/06/24 14:56:16 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -56,737 +56,6 @@ use GDBM_File;
 my %hash;
 my $LaTeXwidth = 0;
 
-sub headerform {
-    my $r = shift;
-    $r->print(<<ENDHEADER);
-<html>
-<head>
-<title>LON-CAPA output for printing</title>
-</head>
-<body bgcolor="FFFFFF">
-<form method="post" enctype="multipart/form-data" action="/adm/printout" name="printform">
-ENDHEADER
-
-    if ($ENV{'form.postdata'}=~m|^/res/|) {
-	$r->print(<<ENDHEADER1);
-<b>Path to current document: </b><tt>$ENV{'form.postdata'}</tt><p>
-ENDHEADER1
-    }
-}
-
-
-sub menu_for_output {
-    my $r = shift;
-    my ($title_for_single_resource,$title_for_sequence,$title_for_main_map) = &details_for_menu;
-    my $assignment = $title_for_sequence;
-    if ($title_for_single_resource ne '') {$title_for_single_resource = '"'.$title_for_single_resource.'"';}
-    if ($title_for_sequence ne '') {$title_for_sequence = '"'.$title_for_sequence.'"';}
-    if ($title_for_main_map ne '') {$title_for_main_map = '"'.$title_for_main_map.'"';}
-    $ENV{'form.postdata'} =~ s|http://[^/]+||;
-    my $subdir_to_print = $ENV{'form.postdata'};
-    $subdir_to_print =~ m/\/([^\/]+)$/;
-    $subdir_to_print =~ s/\Q$1\E//;
-    $r->print(<<ENDMENUOUT1);
-<h1>What do you want to print? Make a choice.</h1><br />
-<input type="hidden" name="phase" value="two">
-<input type="hidden" name="url" value="$ENV{'form.postdata'}">
-<input type="hidden" name="assignment" value="$assignment">
-<input type="radio" name="choice" value="Standard LaTeX output for current document" checked>  Current document <b>$title_for_single_resource</b>
-(prints what you just saw on the screen)<br />
-ENDMENUOUT1
-    if ($ENV{'form.postdata'}=~/\/res\//) {
-	$r->print(<<ENDMENUOUT2);
-<input type="radio" name="choice" value="Standard LaTeX output for the primary sequence">  Problem(s) from <b>$title_for_sequence</b><br />
-<input type="radio" name="choice" value="Standard LaTeX output for whole primary sequence">  Problem(s) plus page(s) or html/xml file(s) from <b>$title_for_sequence</b><br />
-ENDMENUOUT2
-    }
-    if (($ENV{'request.role'}=~m/^cc\./ or $ENV{'request.role'}=~m/^in\./ or $ENV{'request.role'}=~m/^ta\./) and ($ENV{'form.postdata'}=~/\/res\//)) { 
-	$r->print(<<ENDMENUOUT6);
-<input type="radio" name="choice" value="Standard LaTeX output for the top level sequence">  All problems in this course (<b>warning:</b> this may be time consuming) <br />
-<br />
-<input type="radio" name="choice" value="All class print">  All problems from <b>$title_for_sequence</b> for selected students<br /><br />
-ENDMENUOUT6
-    }
-      my $subdirtoprint = &Apache::lonnet::filelocation("",$ENV{'form.url'});
-      $subdirtoprint =~ s/\/[^\/]+$//;
-      if ((&Apache::lonnet::allowed('bre',$subdirtoprint) eq 'F') and ($ENV{'form.postdata'}=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)/)) {
-	  $r->print(<<ENDMENUOUT4);
-  <input type="radio" name="choice" value="Subdirectory print">  Problems from current subdirectory <b>$subdir_to_print</b><br />
-ENDMENUOUT4
-      }
-    $r->print(<<ENDMENUOUT5);
-<br /><hr /><br />
-<h1>And what page format do you prefer?</h1>
-<table>
- <tr>
-   <td>
-     <input type="radio" name="layout" value="CBI"> Landscape <br />
-     <input type="radio" name="layout" value="CAPA" checked>  Portrait <br />
-   </td>
-   <td>&nbsp;</td>
-   <td rawspan="2">
-     Number of columns: <select name="numberofcolumns">
-                         <option> 1 </option>
-                         <option selected> 2 </option>
-                        </select> 
-   </td>
-   <td rawspan="2">
-     Paper size (format [width x height]): <select name="papersize">
-                                            <option selected> Letter [8 1/2x11 in] </option>
-                                            <option> Legal [8 1/2x14 in] </option>
-                                            <option> Ledger/Tabloid [11x17 in] </option>
-                                            <option> Executive [7 1/2x10 in] </option>
-                                            <option> A2 [420x594 mm] </option>
-                                            <option> A3 [297x420 mm] </option>
-                                            <option> A4 [210x297 mm] </option>
-                                            <option> A5 [148x210 mm] </option>
-                                            <option> A6 [105x148 mm] </option>
-                                           </select> 
-   </td>
- </tr>
-
-</table>
-</br> 
-<input type="submit" value="Submit your choice">
-ENDMENUOUT5
-}
-
-
-sub sequence_content_menu {
-    my ($key_to,$r) = @_;
-    my $primary_sequence;
-    my $symbolic = &Apache::lonnet::symbread($ENV{'form.url'});
-    my @sequence = split('___',$symbolic);
-    $primary_sequence=&Apache::lonnet::clutter($sequence[0]);
-    my @master_seq = &coming_from_hash($primary_sequence);
-    my @titles_master_seq = (); 
-    for (my $i=0;$i<=$#master_seq;$i++) {
-	my ($path,$title,$symb) = split /&&/,$master_seq[$i];
-	$master_seq[$i] = $path.'&&'.$symb;
-        push @titles_master_seq,  $title;
-    }
-    my @master_seq_view = @master_seq;
-    if ($ENV{'user.adv'}) {
-      for (my $i=0;$i<=$#master_seq_view;$i++) {
-	 $master_seq_view[$i]=~/___\d+___(.+)$/;
-	 $master_seq_view[$i]='/'.$1;
-      }
-    } else {
-      for (my $i=0;$i<=$#master_seq_view;$i++) {
-         $master_seq_view[$i]=' ';
-      }
-    }
-    $r->print(<<ENDMENUOUT1);
-<input type="hidden" name="url" value="$ENV{'form.url'}">
-<input type="hidden" name="choice" value="$ENV{'form.choice'}">
-<input type="hidden" name="layout" value="$ENV{'form.layout'}">
-<input type="hidden" name="papersize" value="$ENV{'form.papersize'}">
-<input type="hidden" name="assignment" value="$ENV{'form.assignment'}">
-<input type="hidden" name="numberofcolumns" value="$ENV{'form.numberofcolumns'}">
-<h1>Mark item(s) which you want to print</h1>
-<script>
-    function checkall() {
-	for (i=0; i<document.forms.printform.elements.length; i++) {
-            if (document.forms.printform.elements[i].name.indexOf('whatfile')==0) {
-	      document.forms.printform.elements[i].checked=true;
-            }
-        }
-    }
-    function uncheckall() {
-	for (i=0; i<document.forms.printform.elements.length; i++) {
-            if 
-          (document.forms.printform.elements[i].name.indexOf('whatfile')==0) {
-	      document.forms.printform.elements[i].checked=false;
-            }
-        }
-    }
-</script>
-<b>
-<input type=button onClick="checkall()" value="Check All">&nbsp;
-<input type=button onClick="uncheckall()" value="Uncheck">&nbsp;
-<input type="submit" value="Submit">
-<p>
-ENDMENUOUT1
-    my $inc=0; 
-    for (my $i=0;$i<=$#master_seq_view;$i++) {
-      if ($key_to==1 && $master_seq[$i]=~/\.(problem|exam|quiz|assess|survey|form|library)$/) {
-	$r->print('<br /><input type=checkbox name="whatfile'.$inc.'" value="'.$master_seq[$i].'"> '."\n".'<b>'.
-                  $titles_master_seq[$i].'</b>&nbsp;&nbsp;&nbsp;<small>'.$master_seq_view[$i].'</small>');
-        $inc++;
-    } elsif ($key_to==0 && $master_seq[$i]=~/\.(problem|exam|quiz|assess|survey|form|library|xml|htm|html|page)$/) {
-	$r->print('<br /><input type=checkbox name="whatfile'.$inc.'" value="'.$master_seq[$i].'"> '."\n".'<b>'.
-                  $titles_master_seq[$i].'</b>&nbsp;&nbsp;&nbsp;<small>'.$master_seq_view[$i].'</small>');
-        $inc++;
-      }
-    }
-    $r->print(<<ENDMENUOUT2);
-<br /><br />
-<input type="hidden" name="numberoffiles" value="$inc">
-<input type="hidden" name="phase" value="three">
-<input type=button onClick="checkall()" value="Check All">&nbsp;
-<input type=button onClick="uncheckall()" value="Uncheck">&nbsp;
-<input type="submit" value="Submit">
-ENDMENUOUT2
-
-}
-
-
-sub problem_choice_menu {
-    my $r = shift;
-    my $subdirtoprint = &Apache::lonnet::filelocation("",$ENV{'form.url'});
-    $subdirtoprint =~ s/\/[^\/]+$//;
-    my @list_of_files = ();
-    my @content_directory = ();
-    $r->print("Subdir: " . $subdirtoprint . "<br />");
-    if ($subdirtoprint =~ m|/home/([^/]+)/public_html|) {
-	#localmachine CSTR space
-	my $user=$1;
-	my $domain=$Apache::lonnet::perlvar{'lonDefDomain'};
-	@content_directory = &Apache::lonnet::dirlist($subdirtoprint,
-						      $domain, $user,'');
-    } else {
-        #local library server res space (allows to print only from the own library server)
-	@content_directory = &Apache::lonnet::dirlist($subdirtoprint,$ENV{'user.domain'}, $ENV{'user.name'},'');
-    }
-    for (my $iy=0;$iy<=$#content_directory;$iy++) {
-	my @tempo_array = split(/&/,$content_directory[$iy]);
-	if ($tempo_array[0] =~ m/^[^\.]+\.(problem|exam|quiz|assess|survey|form|library)$/) {
-	    push(@list_of_files,$tempo_array[0]);
-	}
-    }
-    $subdirtoprint =~ s/\/$//;
-    for (my $i=0;$i<=$#list_of_files;$i++) {
-	$list_of_files[$i] = $subdirtoprint.'/'.$list_of_files[$i];
-    }
-    $r->print(<<ENDMENUOUT1);
-<input type="hidden" name="url" value="$ENV{'form.url'}">
-<input type="hidden" name="choice" value="$ENV{'form.choice'}">
-<input type="hidden" name="layout" value="$ENV{'form.layout'}">
-<input type="hidden" name="numberofcolumns" value="$ENV{'form.numberofcolumns'}">
-<h1>Mark problems which you want to print</h1>
-<script>
-    function checkall() {
-	for (i=0; i<document.forms.printform.elements.length; i++) {
-            if 
-          (document.forms.printform.elements[i].name.indexOf('whattoprint')==0) {
-	      document.forms.printform.elements[i].checked=true;
-            }
-        }
-    }
-
-
-    function uncheckall() {
-	for (i=0; i<document.forms.printform.elements.length; i++) {
-            if 
-          (document.forms.printform.elements[i].name.indexOf('whattoprint')==0) {
-	      document.forms.printform.elements[i].checked=false;
-            }
-        }
-    }
-</script>
-<input type=button onClick="checkall()" value="Check All">&nbsp;
-<input type=button onClick="uncheckall()" value="Uncheck">&nbsp;
-<input type="submit" value="Submit">
-<p>
-ENDMENUOUT1
-    my $i=0;
-    foreach my $file (sort @list_of_files) {
-	$r->print('<br /><input type=checkbox name="whattoprint'.$i.'" value="'.$file.'"> '.
-                  $file);
-	$i++;
-    }
-    $r->print(<<ENDMENUOUT2);
-<br /><br />
-<input type="hidden" name="papersize" value="$ENV{'form.papersize'}">
-<input type="hidden" name="numberofproblems" value="$i">
-<input type="hidden" name="phase" value="three">
-<input type=button onClick="checkall()" value="Check All">&nbsp;
-<input type=button onClick="uncheckall()" value="Uncheck">&nbsp;
-<input type="submit" value="Submit">
-ENDMENUOUT2
-}
-
-
-sub additional_class_menu {
-    my $r = shift;
-    $r->print(<<ENDMENUOUT1);
-<input type="hidden" name="url" value="$ENV{'form.url'}">
-<input type="hidden" name="choice" value="$ENV{'form.choice'}">
-<input type="hidden" name="layout" value="$ENV{'form.layout'}">
-<input type="hidden" name="numberofcolumns" value="$ENV{'form.numberofcolumns'}">
-<input type="hidden" name="assignment" value="$ENV{'form.assignment'}">
-<h1>Select student(s) whose assignment you want to print</h1>
-ENDMENUOUT1
-    my %courselist=&Apache::lonnet::dump(
-                   'classlist',
-		   $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
-		   $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
-    my $now=time;
-    $r->print(<<ENDDISHEADER);
-<script>
-    function checkall() {
-	for (i=0; i<document.forms.printform.elements.length; i++) {
-            if 
-          (document.forms.printform.elements[i].name.indexOf('whomtoprint')==0) {
-	      document.forms.printform.elements[i].checked=true;
-            }
-        }
-    }
-
-    function checksec() {
-	for (i=0; i<document.forms.printform.elements.length; i++) {
-            if 
-          (document.forms.printform.elements[i].value.indexOf
-           (document.forms.printform.chksec.value)==0) {
-	      document.forms.printform.elements[i].checked=true;
-            }
-        }
-    }
-
-    function uncheckall() {
-	for (i=0; i<document.forms.printform.elements.length; i++) {
-            if 
-          (document.forms.printform.elements[i].name.indexOf('whomtoprint')==0) {
-	      document.forms.printform.elements[i].checked=false;
-            }
-        }
-    }
-</script>
-<input type=button onClick="checkall()" value="Check All">&nbsp;
-<input type=button onClick="checksec()" value="Type Section/Group then click">
-<input type=text size=5 name=chksec>&nbsp;
-<input type=button onClick="uncheckall()" value="Uncheck">
-<p>
-ENDDISHEADER
-    my $i = 0;
-    foreach (sort keys %courselist) {
-        my ($end,$start)=split(/\:/,$courselist{$_});
-        my $active=1;
-        if (($end) && ($now>$end)) { $active=0; }
-        if ($active) {
-           my ($sname,$sdom)=split(/\:/,$_);
-           my %reply=&Apache::lonnet::get('environment',
-              ['firstname','middlename','lastname','generation'],
-              $sdom,$sname);
-           my $section=&Apache::lonnet::usection
-	       ($sdom,$sname,$ENV{'request.course.id'});
-	   if ($section == -1) { $section = ''; }
-           $r->print(
-        '<br /><input type=checkbox name="whomtoprint'.$i.'" value="'.$section.':'.$_.'"> '.
-		      $reply{'firstname'}.' '. 
-                      $reply{'middlename'}.' '.
-                      $reply{'lastname'}.' '.
-                      $reply{'generation'}.
-                      ' ('.$_.') '.$section);
-	   $i++;
-        } 
-    }
-    $r->print(<<ENDMENUOUT2);
-<br /><br /><br />
-<table><tr><td width=300>Number of blank pages added to each student assignments to print these assignments on physically different sheets (<b>requires manual addjustment</b>): <select name="addedpages"><option selected>0</option>
-                                                                            <option>1</option>
-                                                                            <option>2</option>
-                                                                            <option>3</option>
-                                                  </select></td></tr></table>
-<br /> 
-<input type="hidden" name="papersize" value="$ENV{'form.papersize'}">
-<input type="hidden" name="numberofstudents" value="$i">
-<input type="hidden" name="phase" value="three">
-<input type="submit" value="Submit">
-ENDMENUOUT2
-}
-
-
-sub additional_print_menu { 
-    my $r = shift;
-    my $what_to_print = '';
-    for (my $i=0; $i<$ENV{'form.numberofstudents'};$i++) {
-	$what_to_print .= '<input type="hidden" name="whomtoprint'.$i.'" value="'.$ENV{'form.whomtoprint'.$i}.'">';
-    }
-    for (my $i=0; $i<$ENV{'form.numberofproblems'};$i++) {
-	$what_to_print .= '<input type="hidden" name="whattoprint'.$i.'" value="'.$ENV{'form.whattoprint'.$i}.'">';
-    }
-    for (my $i=0; $i<$ENV{'form.numberoffiles'};$i++) {
-	$what_to_print .= '<input type="hidden" name="whatfile'.$i.'" value="'.$ENV{'form.whatfile'.$i}.'">';
-    }
-    $r->print(<<ENDMENUOUT);
-    $what_to_print
-<input type="hidden" name="url" value="$ENV{'form.url'}">
-<input type="hidden" name="choice" value="$ENV{'form.choice'}">
-<input type="hidden" name="layout" value="$ENV{'form.layout'}">
-<input type="hidden" name="papersize" value="$ENV{'form.papersize'}">
-<input type="hidden" name="numberofstudents" value="$ENV{'form.numberofstudents'}">
-<input type="hidden" name="numberofproblems" value="$ENV{'form.numberofproblems'}">
-<input type="hidden" name="numberoffiles" value="$ENV{'form.numberoffiles'}">
-<input type="hidden" name="numberofcolumns" value="$ENV{'form.numberofcolumns'}">
-<input type="hidden" name="assignment" value="$ENV{'form.assignment'}">
-<input type="hidden" name="addedpages" value="$ENV{'form.addedpages'}">
-Define one column layout parameters: <br />
-<b>Width</b>: <input type="text" name="width" width="8" value="9cm"> <br />
-<b>Height</b>: <input type="text" name="height" width="8" value="25.9cm"> <br />
-<b>Left margin</b>: <input type="text" name="leftmargin" width="8" value="-0.57in"> <br />
-<input type="hidden" name="phase" value="four">
-<input type="submit" value="Submit">
-</form>
-</body>
-</html>
-ENDMENUOUT
-}
-
-
-sub output_data {
-    my $r = shift;
-    $r->print(<<ENDPART);
-<html>
-<head>
-<title>LON-CAPA output for printing</title>
-</head>
-<body bgcolor="FFFFFF">
-<hr>
-ENDPART
-
-    my $choice = $ENV{'form.choice'};
-    my $layout = $ENV{'form.layout'};
-    my $numberofcolumns = $ENV{'form.numberofcolumns'};  
-    my $papersize = $ENV{'form.papersize'};          
-    my $laystyle = 'book';
-    my $assignment =  $ENV{'form.assignment'};
-    if ($choice eq 'Subdirectory print') {
-	if ($ENV{'form.layout'} eq '') {$layout = 'CAPA';}
-	if ($ENV{'form.papersize'} eq '') {$papersize = 'Letter [8 1/2x11 in]';}
-	if ($ENV{'form.numberofcolumns'} eq '') {$numberofcolumns = 2;}
-    }
-    if (($choice eq 'Standard LaTeX output for current document') &&
-	($ENV{'form.url'}=~m|^/~|)) {
-	if ($ENV{'form.layout'} eq '') {$layout = 'CAPA';}
-	if ($ENV{'form.papersize'} eq '') {$papersize = 'Letter [8 1/2x11 in]';}
-	if ($ENV{'form.numberofcolumns'} eq '') {$numberofcolumns = 2;}
-    }
-    my $result = '';
-    my $number_of_columns = 1; #used only for pages to determine the width of the cell
-    my $selectionmade = '';
-    my ($textwidth,$textheight,$oddoffset,$evenoffset) = &page_format($papersize,$layout,$numberofcolumns);
-    if ($numberofcolumns == 1) {
-	$textwidth=$ENV{'form.width'};
-	$textheight=$ENV{'form.height'};
-    }
-    my $LaTeXwidth; 
-    if ($textwidth=~/(\d+\s*cm)/) {
-	$LaTeXwidth = $1*10;
-    } elsif ($textwidth=~/(\d+\s*mm)/) {
-	$LaTeXwidth = $1;
-    }
-    if ($choice eq 'Standard LaTeX output for current document') {
-      #-- single document - problem, page, html, xml, ...  
-      $selectionmade = 1;
-      if ($ENV{'form.url'}=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {
-        my %moreenv;
-        $moreenv{'form.grade_target'}='tex';
-        if (&Apache::lonnet::allowed('bre',$ENV{'form.url'})) {
-	  $ENV{'form.url'}=~s/http:\/\/[^\/]+//;
-        }
-        $moreenv{'request.filename'}=$ENV{'form.url'};
-        $moreenv{'form.textwidth'}=$LaTeXwidth;
-        &Apache::lonnet::appenv(%moreenv);
-        my $texversion=&Apache::lonnet::ssi($ENV{'form.url'});
-        &Apache::lonnet::delenv('form.grade_target','form.textwidth','form.counter');
-        $result .= $texversion;
-        if ($ENV{'form.url'}=~m/\.page\s*$/) {
-	  ($result,$number_of_columns) = &page_cleanup($result);
-        }
-      } else {
-	  $result='\documentclass[letterpaper]{article}\usepackage{calc}\begin{document}Printout of this type of document is currently not supported: ';
-	  if ($ENV{'form.url'}=~/\/(aboutme|syllabus|bulletinboard|smppg)$/) {
-	      $result.=$1;
-	  } else {
-	      $result.=$ENV{'form.url'};
-	  }
-	  $result.=' \end{document}'
-      }
-    } elsif ($choice eq 'Standard LaTeX output for the primary sequence' or 
-             $choice eq 'Standard LaTeX output for whole primary sequence') {
-      #-- minimal sequence to which the current document belongs
-        #-- where is the primary sequence containing file?
-        my @master_seq = ();
-	for (my $i=0; $i<$ENV{'form.numberoffiles'};$i++) {
-	    if ($ENV{'form.whatfile'.$i}=~/\S/) {
-		push @master_seq,$ENV{'form.whatfile'.$i};
-	    }
-	}
-        #-- produce an output string
-	my $flag_latex_header_remove = 'NO';
-	my $flag_page_in_sequence = 'NO';
-	for (my $i=0;$i<=$#master_seq;$i++) {
-           my ($urlp,$symb) = split /&&/, $master_seq[$i];
-	    if ($choice eq 'Standard LaTeX output for the primary sequence') {
-              $selectionmade = 2;
-	    } elsif ($choice eq 'Standard LaTeX output for whole primary sequence') {
-              $selectionmade = 3;
-	    }
-	   my %moreenv;
-	   $moreenv{'form.grade_target'}='tex';
-	   $moreenv{'form.textwidth'}=$LaTeXwidth;
-	   &Apache::lonnet::appenv(%moreenv);
-	   #&Apache::lonnet::logthis("Trying to get $urlp with symb $symb");
-	   my $texversion=&Apache::lonnet::ssi($urlp,('symb'=>$symb));
-	   &Apache::lonnet::delenv('form.grade_target','form.textwidth');
-	   if ($urlp =~ m/\.page/) {
-	     ($texversion,my $number_of_columns_page) = &page_cleanup($texversion);
-	     if ($number_of_columns_page > $number_of_columns) {$number_of_columns=$number_of_columns_page;} 
-	     $texversion =~ s/\\end{document}\d*/\\end{document}/;
-	     $flag_page_in_sequence = 'YES';
-	   } 
-	   if ($flag_latex_header_remove ne 'NO') {
-	     $texversion = &latex_header_footer_remove($texversion);
-	   } else {
-	     $texversion =~ s/\\end{document}//;
-	   }
-	   $result .= $texversion;         
-	   $flag_latex_header_remove = 'YES';   
-	}
-	&Apache::lonnet::delenv('form.counter');
-	if ($flag_page_in_sequence eq 'YES') {$result =~ s/\\usepackage{calc}/\\usepackage{calc}\\usepackage{longtable}/;}	
-	$result .= '\end{document}';
-    }  elsif ($choice eq 'Standard LaTeX output for the top level sequence') {
-        # where is the main sequence of the course?
-	$selectionmade = 4;
-	my $main_seq=&Apache::lonnet::clutter($ENV{'request.course.uri'});
-	my @file_seq = &coming_from_hash($main_seq);
-	for (my $i=0;$i<=$#file_seq;$i++) {
-	    my ($path,$title,$symb) = split /&&/,$file_seq[$i];
-	    $file_seq[$i] = $path.'&&'.$symb;
-	}
-	my $flag_latex_header_remove = 'NO';
-        #-- produce an output string
-	for (my $i=0;$i<=$#file_seq;$i++) {
-	   if (not $file_seq[$i]=~/^&&/) {
-	     my ($urlp,$symb) = split /&&/, $file_seq[$i];
-	     $urlp=~s/\/home\/httpd\/html//;	    
-	     if ($urlp=~m/\.(problem|exam|quiz|assess|survey|form|library)/) {
-		my %moreenv;
-		$moreenv{'form.grade_target'}='tex';
-		$moreenv{'form.textwidth'}=$LaTeXwidth;
-		&Apache::lonnet::appenv(%moreenv);
-		my $texversion=&Apache::lonnet::ssi($urlp,('symb'=>$symb));
-		&Apache::lonnet::delenv('form.grade_target','form.textwidth');		    
-		if ($flag_latex_header_remove ne 'NO') {
-		    $texversion = &latex_header_footer_remove($texversion);
-		} else {
-		    $texversion =~ s/\\end{document}//;
-		}
-		$result .= $texversion;  
-		$flag_latex_header_remove = 'YES';
-	     }		
-	   }
-	}	    
-	$result .= '\end{document}';
-    } elsif ($choice eq 'All class print') { 
-    #-- prints assignments for whole class or for selected students  
-	$selectionmade = 5;
-        my @students = ();
-	for (my $i=0; $i<$ENV{'form.numberofstudents'};$i++) {
-	    if ($ENV{'form.whomtoprint'.$i}=~/:/) {
-		push @students,$ENV{'form.whomtoprint'.$i};
-	    }
-	}
-	#where is the primary sequence containing current resource (the same for all students)?
-	my $symbolic = &Apache::lonnet::symbread($ENV{'form.url'});
-	my @sequence = split('___',$symbolic);
-	my $primary_sequence;
-
-	$primary_sequence=&Apache::lonnet::clutter($sequence[0]);
-	my @master_seq = &coming_from_hash($primary_sequence); 
-	for (my $i=0;$i<=$#master_seq;$i++) {
-	    my ($path,$title,$symb) = split /&&/,$master_seq[$i];
-	    $master_seq[$i] = $path.'&&'.$symb;
-	}
-        #loop over students
-	my $flag_latex_header_remove = 'NO'; 
-	my %moreenv;
-	$moreenv{'form.textwidth'}=$LaTeXwidth;
-	&Apache::lonnet::appenv(%moreenv);
-	my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Print Status','Class Print Status',$#students+1);
-	foreach my $person (@students) {
-	    my $current_output = ''; 
-	    my ($usersection,$username,$userdomain) = split /:/,$person;
-	    my $fullname = &get_name($username,$userdomain);
-            #goes through all resources, checks if they are available for current student, and produces output   
-	    foreach my $curresline (@master_seq)  {
-		my ($curres,$symb) = split /&&/, $curresline;
-                if ($curres=~ m/\.(problem|exam|quiz|assess|survey|form|library)/) {
-		    my ($map,$id,$res_url) = split(/___/,$symb);
-		    if (&Apache::lonnet::allowed('bre',$res_url)) {
-			my $rendered = &Apache::loncommon::get_student_view($symb,$username,$userdomain,
-                                                                        $ENV{'request.course.id'},'tex');
-			if ($flag_latex_header_remove eq 'YES') {
-			    $rendered = &latex_header_footer_remove($rendered);
-			} else {
-			    $rendered =~ s/\\end{document}//;
-			}
-			$current_output .= $rendered;
-		    }
-		    $flag_latex_header_remove = 'YES';
-		}
-	    }
-	    my $courseidinfo = $ENV{'course.'.$ENV{'request.course.id'}.'.description'};
-	    if ($current_output=~/\\documentclass/) {
-		$current_output =~ s/\\begin{document}/\\setlength{\\topmargin}{1cm}\\usepackage{fancyhdr}\\pagestyle{fancy}\\rhead{}\\chead{} \\begin{document}\\noindent\\lhead{\\textit{\\textbf{$fullname}} - $courseidinfo \\hfill \\thepage \\\\ \\textit{$assignment}}\\vskip 3 mm /;
-	    } else {
-		my $blanspages = '';
-		for (my $j=0;$j<$ENV{'form.addedpages'};$j++) {$blanspages.='\clearpage\strut\clearpage';}
-		$current_output = '\strut\\newline\\noindent\\makebox[\\textwidth/$number_of_columns][b]{\\hrulefill}\\newline\\noindent{\\tiny Printed from LON-CAPA\\copyright MSU{\\hfill} Licensed under GNU General Public License }\\newpage \\vskip 3mm'.$blanspages.'\setcounter{page}{1}\noindent\parbox{\minipagewidth}{\noindent\\lhead{\\textit{\\textbf{'.$fullname.'}} - '.$courseidinfo.' \\hfill \\thepage \\\\ \\textit{'.$assignment.'}}\hskip 1.4in } \vskip 5 mm '.$current_output;
-	    }
-	    $result .= $current_output;
-	    &Apache::lonnet::delenv('form.counter');	    
-	    &Apache::lonxml::init_counter(); 
-	    &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
-						    'last student '.$fullname);
-	}
-	&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
-	$result .= '\end{document}';
-	&Apache::lonnet::delenv('form.textwidth');
-    } elsif ($choice eq 'Subdirectory print') {      
-    #prints selected problems from the subdirectory 
-	$selectionmade = 6;
-        my @list_of_files = ();
-	for (my $i=0; $i<$ENV{'form.numberofproblems'};$i++) {
-	    if ($ENV{'form.whattoprint'.$i}=~/^\//) {
-		push @list_of_files,$ENV{'form.whattoprint'.$i};
-	    }
-	}	
-	my $flag_latex_header_remove = 'NO';  
-	for (my $i=0;$i<=$#list_of_files;$i++) {
-	    my $urlp = $list_of_files[$i];
-	    if ($urlp=~/\//) {
-		my %moreenv;
-		$moreenv{'form.grade_target'}='tex';
-		$moreenv{'form.textwidth'}=$LaTeXwidth;
-		&Apache::lonnet::appenv(%moreenv);
-		if ($urlp =~ m|/home/([^/]+)/public_html|) {
-		    $urlp =~ s|/home/([^/]*)/public_html|/~$1|;
-		} else {
-		    $urlp =~ s|^/home/httpd/html||;
-		}
-		my $texversion=&Apache::lonnet::ssi($urlp);
-		&Apache::lonnet::delenv('form.grade_target','form.textwidth');
-                #this chunck is responsible for printing the path to problem
-		my $newurlp = '';
-		my $HowMany = length($urlp)*2;
-		if ($HowMany > $LaTeXwidth) {
-		    my @temporrary = split '/',$urlp;
-		    my $HowManyNew = 0;
-		    for (my $ii=0;$ii<=$#temporrary;$ii++) {
-			if ($temporrary[$ii] ne '') {
-			    $HowManyNew += length($temporrary[$ii])*2;
-			    if ($HowManyNew < $LaTeXwidth ) {
-				$newurlp .=  '/'.$temporrary[$ii];
-			    } else {
-				$HowManyNew = 0;
-				$newurlp .=  '|\vskip -1 mm \noindent \verb|';
-				$ii--;
-			    }
-			}
-		    }
-		}
-		$texversion =~ s/(\\begin{minipage}{\\textwidth})/$1 {\\small\\noindent\\verb|$newurlp\|\\vskip 0 mm}/;
-		if ($flag_latex_header_remove ne 'NO') {
-		    $texversion = &latex_header_footer_remove($texversion);
-		} else {
-		    $texversion =~ s/\\end{document}//;
-		}
-		$result .= $texversion;
-	    }
-	    $flag_latex_header_remove = 'YES';  
-	}
-	$result .= '\end{document}';      	
-    }
-#-------------------------------------------------------- corrections for the different page formats
-    $result = &page_format_transformation($papersize,$layout,$numberofcolumns,$choice,$result,$assignment);
-    if ($layout eq 'CBI') {
-        $laystyle = 'album';
-    }
-    $result = &latex_corrections($number_of_columns,$result);
-    #changes page's parameters for the one column output 
-    if ($ENV{'form.numberofcolumns'} == 1) {
-	$result =~ s/\\textwidth= 9cm/\\textwidth= $ENV{'form.width'}/;
-	$result =~ s/\\textheight 25\.9cm/\\textheight $ENV{'form.height'}/;
-	$result =~ s/\\evensidemargin = -0\.57in/\\evensidemargin= $ENV{'form.leftmargin'}/;
-	$result =~ s/\\oddsidemargin = -0\.57in/\\oddsidemargin= $ENV{'form.leftmargin'}/;
-    }
-#-- writing .tex file in prtspool 
-    my $temp_file;
-    my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout_".time."_".rand(10000000).".tex";
-    unless ($temp_file = Apache::File->new('>'.$filename)) {
-	$r->log_error("Couldn't open $filename for output $!");
-	return SERVER_ERROR; 
-    } 
-    print $temp_file $result;
-$r->print(<<FINALEND);
-<meta http-equiv="Refresh" content="0; url=/cgi-bin/printout.pl?$filename&$laystyle&$numberofcolumns&$selectionmade">
-</body>
-</html>
-FINALEND
-}
-
-
-sub coming_from_hash {
-
-    my $mainsequence = shift;
-    my @resourcelist = ();
-    my $mapid = $hash{'map_pc_'.$mainsequence};
-    my $mapstart = $hash{'map_start_'.$mainsequence};
-    my $mapfinish = $hash{'map_finish_'.$mainsequence};
-    my $current_resource = $mapstart;
-    while ($current_resource ne $mapfinish) {
-	if ($hash{'src_'.$current_resource}=~/\.sequence$/) {
-	    push @resourcelist,&coming_from_hash($hash{'src_'.$current_resource});
-	} else {
-	    my $presymb=&Apache::lonnet::declutter($mainsequence);
-	    my $rid = $current_resource;
-	    if ($rid=~/,/) {
-		my @rid = split /,/, $rid;
-		foreach my $rid_element (@rid) {
-		    if ($rid_element =~ m/^$mapid\.(\d*)/) {
-			$rid = $1; 
-			last;
-		    }
-		}
-	    } else {
-	        $rid =~ m/^$mapid\.(\d*)/;
-                $rid = $1;  
-	    }
-	    my $symb = $presymb.'___'.$rid.'___'.
-		&Apache::lonnet::declutter($hash{'src_'.$current_resource});
-	    push @resourcelist,$hash{'src_'.$current_resource}.'&&'.$hash{'title_'.$current_resource}.'&&'.$symb;
-	}
-	$current_resource = $hash{'goesto_'.$hash{'to_'.$current_resource}};
-    } 
-    #needs if final resource in the map (type="finish") contains something
-	if ($hash{'src_'.$current_resource}=~/\.sequence$/) {
-	    push @resourcelist,&coming_from_hash($hash{'src_'.$current_resource});
-	} else {
-	    my $presymb=&Apache::lonnet::declutter($mainsequence);
-	    my $rid = $current_resource;
-	    if ($rid=~/,/) {
-		my @rid = split /,/, $rid;
-		foreach my $rid_element (@rid) {
-		    if ($rid_element =~ m/^$mapid\.(\d*)/) {
-			$rid = $1; 
-			last;
-		    }
-		}
-	    } else {
-	        $rid =~ m/^$mapid\.(\d*)/;
-                $rid = $1;  
-	    }
-	    my $symb = $presymb.'___'.$rid.'___'.
-		&Apache::lonnet::declutter($hash{'src_'.$current_resource});
-	    push @resourcelist,$hash{'src_'.$current_resource}.'&&'.$hash{'title_'.$current_resource}.'&&'.$symb;
-	}
-	$current_resource = $hash{'goesto_'.$hash{'to_'.$current_resource}};
-    return @resourcelist;
-}
-
 
 sub latex_header_footer_remove {
     my $text = shift;
@@ -1037,76 +306,87 @@ sub character_chart {
     $result =~ s/&(Phi|\#934);/\$\\Phi \$/g;
     $result =~ s/&(Psi|\#936);/\$\\Psi \$/g;
     $result =~ s/&(Omega|\#937);/\$\\Omega \$/g;
-
     return $result;
 }
 
 
-    sub page_format {
-	my ($papersize,$layout,$numberofcolumns) = @_; 
-	my ($textwidth,$textheight,$oddoffset,$evenoffset) = (0,0,0,0);
-	if ($papersize=~/Letter/) {
-	    if ($layout eq 'CAPA') {
-		if ($numberofcolumns == 1) {
-		    $textwidth = '18 cm';
-		    $textheight = '25.9 cm';
-		    $oddoffset = '-0.57 in';
-		    $evenoffset = '-0.57 in';
-		} elsif ($numberofcolumns == 2) {
-		    $textwidth = '93 mm';
-		    $textheight = '25.9 cm';
-		    $oddoffset = '-0.57 in';
-		    $evenoffset = '-0.57 in';
-		}
-	    } elsif ($layout eq 'CBI') {
-		if ($numberofcolumns eq '1') {
-		    $textwidth = '8.8 in';
-		    $textheight = '6.8 in';
-		    $oddoffset = '-40 pt';
-		    $evenoffset = '-60 pt';
-		} elsif ($numberofcolumns == 2) {
-		    $textwidth = '4.2 in';
-		    $textheight = '6.8 in';
-		    $oddoffset = '-40 pt';
-		    $evenoffset = '-60 pt';
-		}
+sub page_format {
+#
+#Correspondence between $papersize variable and real paper format:
+# 0 - "Letter [8 1/2x11 in]"
+# 1 - "Legal [8 1/2x14 in]"
+# 2 - "Ledger/Tabloid [11x17 in]"
+# 3 - "Executive [7 1/2x10 in]"
+# 4 - "A2 [420x594 mm]"
+# 5 - "A3 [297x420 mm]"
+# 6 - "A4 [210x297 mm]"
+# 7 - "A5 [148x210 mm]"
+# 8 - "A6 [105x148 mm]"
+# 
+    my ($papersize,$layout,$numberofcolumns) = @_; 
+    my ($textwidth,$textheight,$oddoffset,$evenoffset) = (0,0,0,0);
+    if ($papersize eq '0') {
+	if ($layout eq 'book') {
+	    if ($numberofcolumns == 1) {
+		$textwidth = '7.1 in';      #'18 cm';
+		$textheight = '10.2 in';    #'25.9 cm';
+		$oddoffset = '-0.57 in';
+		$evenoffset = '-0.57 in';
+	    } elsif ($numberofcolumns == 2) {
+		$textwidth = '3.66 in';     #'93 mm';
+		$textheight = '10.2 in';    #'25.9 cm';
+		$oddoffset = '-0.57 in';
+		$evenoffset = '-0.57 in';
 	    }
-#    } elsif($papersize=~/Legal/) {
-#    } elsif($papersize=~/Ledger/) {
-#    } elsif($papersize=~/Executive/) {
-    } elsif($papersize=~/A4/) {
-	    if ($layout eq 'CAPA') {
-		if ($numberofcolumns == 1) {
-		    $textwidth = '18 cm';
-		    $textheight = '28 cm';
-		    $oddoffset = '-0.57 in';
-		    $evenoffset = '-0.57 in';
-		} elsif ($numberofcolumns == 2) {
-		    $textwidth = '96 mm';
-		    $textheight = '2 cm';
-		    $oddoffset = '-0.57 in';
-		    $evenoffset = '-0.57 in';
-		}
-	    } elsif ($layout eq 'CBI') {
-		if ($numberofcolumns eq '1') {
-		    $textwidth = '8.5 in';
-		    $textheight = '7.7 in';
-		    $oddoffset = '-40 pt';
-		    $evenoffset = '-60 pt';
-		} elsif ($numberofcolumns == 2) {
-		    $textwidth = '3.9 in';
-		    $textheight = '7.7 in';
-		    $oddoffset = '-40 pt';
-		    $evenoffset = '-60 pt';
-		}
+	} elsif ($layout eq 'album') {
+	    if ($numberofcolumns eq '1') {
+		$textwidth = '8.8 in';
+		$textheight = '6.8 in';
+		$oddoffset = '-40 pt';
+		$evenoffset = '-60 pt';
+	    } elsif ($numberofcolumns == 2) {
+		$textwidth = '4.2 in';
+		$textheight = '6.8 in';
+		$oddoffset = '-40 pt';
+		$evenoffset = '-60 pt';
+	    }
+	}
+#    } elsif($papersize eq '1') {
+#    } elsif($papersize eq '2') {
+#    } elsif($papersize eq '3'/) {
+    } elsif($papersize eq '6') {
+	if ($layout eq 'book') {
+	    if ($numberofcolumns == 1) {
+		$textwidth = '18 cm';
+		$textheight = '28 cm';
+		$oddoffset = '-0.57 in';
+		$evenoffset = '-0.57 in';
+	    } elsif ($numberofcolumns == 2) {
+		$textwidth = '96 mm';
+		$textheight = '2 cm';
+		$oddoffset = '-0.57 in';
+		$evenoffset = '-0.57 in';
+	    }
+	} elsif ($layout eq 'album') {
+	    if ($numberofcolumns eq '1') {
+		$textwidth = '8.5 in';
+		$textheight = '7.7 in';
+		$oddoffset = '-40 pt';
+		$evenoffset = '-60 pt';
+	    } elsif ($numberofcolumns == 2) {
+		$textwidth = '3.9 in';
+		$textheight = '7.7 in';
+		$oddoffset = '-40 pt';
+		$evenoffset = '-60 pt';
 	    }
-#    } elsif($papersize=~/A3/) {
-#    } elsif($papersize=~/A2/) {
-#    } elsif($papersize=~/A5/) {
-#    } elsif($papersize=~/A6/) {
 	}
-	return $textwidth,$textheight,$oddoffset,$evenoffset;
+#    } elsif($papersize eq '5') {
+#    } elsif($papersize eq '4') {
+#    } elsif($papersize eq '7') {
+#    } elsif($papersize eq '8') {
     }
+    return $textwidth,$textheight,$oddoffset,$evenoffset;
+}
 
 
 sub get_name {
@@ -1119,6 +399,7 @@ sub get_name {
 						  'header');
 }
 
+
 sub page_format_transformation {
     my ($papersize,$layout,$numberofcolumns,$choice,$text,$assignment) = @_; 
     my ($textwidth,$textheight,$oddoffset,$evenoffset);
@@ -1134,14 +415,13 @@ sub page_format_transformation {
 						     undef,'header');
     }
     my $courseidinfo = &Apache::lonxml::latex_special_symbols(&Apache::lonnet::unescape($ENV{'course.'.$ENV{'request.course.id'}.'.description'}),'','','header');
-    if ($layout eq 'CBI') {
+    if ($layout eq 'album') {
 	    $text =~ s/\\begin{document}/\\setlength{\\oddsidemargin}{$oddoffset}\\setlength{\\evensidemargin}{$evenoffset}\\setlength{\\topmargin}{200pt}\\setlength{\\textwidth}{$textwidth}\\setlength{\\textheight}{$textheight}\\setlength{\\parindent}{20pt}\\setlength{\\marginparwidth}{90pt}\\setlength{\\textfloatsep}{8pt plus 2\.0pt minus 4\.0pt}\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm} \\begin{document}\\setcounter{page}{1}\\noindent\\parbox{\\minipagewidth}{\\noindent\\fbox{\\textbf{$name}} \\hfill  $courseidinfo} \\vskip 5 mm /;
-    } elsif ($layout eq 'CAPA') {
+    } elsif ($layout eq 'book') {
 	if ($choice ne 'All class print') { 
-		$text =~ s/\\begin{document}/\\textheight $textheight\\oddsidemargin = $evenoffset\\evensidemargin = $evenoffset\\textwidth= $textwidth\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\renewcommand{\\ref}{\\keephidden\}\\usepackage{fancyhdr}\\pagestyle{fancy}\\rhead{}\\chead{}\\lhead{\\textbf{$name} - $courseidinfo \\hfill \\thepage \\\\ \\textit{$assignment}}\\begin{document}\\voffset=-0\.8 cm\\setcounter{page}{1}/;
+	    $text =~ s/\\begin{document}/\\textheight $textheight\\oddsidemargin = $evenoffset\\evensidemargin = $evenoffset\\textwidth= $textwidth\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\renewcommand{\\ref}{\\keephidden\}\\usepackage{fancyhdr}\\pagestyle{fancy}\\rhead{}\\chead{}\\lhead{\\textbf{$name} - $courseidinfo \\hfill \\thepage \\\\ \\textit{$assignment}}\\begin{document}\\voffset=-0\.8 cm\\setcounter{page}{1}/;
 	} else {
-	    $text =~ s/\\pagestyle{fancy}\\rhead{}\\chead{}\s*\\begin{document}/\\textheight $textheight\\oddsidemargin = $evenoffset\\evensidemargin = $evenoffset\\textwidth= $textwidth\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\renewcommand{\\ref}{\\keephidden\}\\pagestyle{fancy}\\rhead{}\\chead{}\\begin{document}\\voffset=-0\.8cm\\setcounter{page}{1}  \\vskip 5 mm /;
-
+	    $text =~ s/\\pagestyle{fancy}\\rhead{}\\chead{}\s*\\begin{document}/\\textheight = $textheight\\oddsidemargin = $evenoffset\\evensidemargin = $evenoffset\\textwidth= $textwidth\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\renewcommand{\\ref}{\\keephidden\}\\pagestyle{fancy}\\rhead{}\\chead{}\\begin{document}\\voffset=-0\.8cm\\setcounter{page}{1}  \\vskip 5 mm /;
 	}
     }
     return $text;
@@ -1188,7 +468,7 @@ sub latex_corrections {
 
     my ($number_of_columns,$result) = @_;
 
-    $result =~ s/\\includegraphics{/\\includegraphics\[width=\\minipagewidth\]{/g;
+#    $result =~ s/\\includegraphics{/\\includegraphics\[width=\\minipagewidth\]{/g;
     $result =~ s/\$number_of_columns/$number_of_columns/g;
     $result =~ s/(\\end{document})/\\strut\\newline\\noindent\\makebox\[\\textwidth\/$number_of_columns\]\[b\]{\\hrulefill}\\newline\\noindent\\tiny Printed from LON-CAPA\\copyright MSU{\\hfill} Licensed under GNU General Public License  $1/;
     $result =~ s/(\\end{longtable}\s*)(\\strut\\newline\\noindent\\makebox\[\\textwidth\/$number_of_columns\]\[b\]{\\hrulefill})/$2$1/g;
@@ -1218,71 +498,323 @@ sub latex_corrections {
 }
 
 
+sub output_data {
+    my ($r,$helper,$rparmhash) = @_;
+    my %parmhash = %$rparmhash;
+    my $bodytag=&Apache::loncommon::bodytag('Preparing Printout');
+    $r->print(<<ENDPART);
+<html>
+<head>
+<title>LON-CAPA output for printing</title>
+</head>
+$bodytag
+Please stand by while processing your print request, this may take some time ...
+ENDPART
+
+    my $format_from_helper = $helper->{'VARS'}->{'FORMAT'};
+    my ($result,$selectionmade) = ('','');
+    my $number_of_columns = 1; #used only for pages to determine the width of the cell
+    my @temporary_array=split /\|/,$format_from_helper;
+    my ($laystyle,$numberofcolumns,$papersize)=@temporary_array;
+    if ($laystyle eq 'L') {
+	$laystyle='album';
+    } else {
+	$laystyle='book';
+    }
+    my ($textwidth,$textheight,$oddoffset,$evenoffset) = &page_format($papersize,$laystyle,$numberofcolumns);
+    my $assignment =  $ENV{'form.assignment'};
+    my $LaTeXwidth; 
+    if ($textwidth=~/(\d+\.?\d*)\s*cm/) {
+	$LaTeXwidth = $1*10;
+    } elsif ($textwidth=~/(\d+\.?\d*)\s*mm/) {
+	$LaTeXwidth = $1;
+    } elsif ($textwidth=~/(\d+\.?\d*)\s*in/) {
+	$LaTeXwidth = $1*25.4;
+    }
+    $LaTeXwidth.=' mm';
+    
+    if ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'current_document') {
+      #-- single document - problem, page, html, xml, ...
+	my $currentURL;
+	if ($helper->{'VARS'}->{'construction'} ne '1') {
+            #prints published resource
+	    $currentURL=$helper->{'VARS'}->{'postdata'};
+	} else {
+            #prints resource from the construction space
+	    $currentURL=$helper->{'VARS'}->{'filename'};
+	    $currentURL=~s/\/home\//\/~/;
+	    $currentURL=~s/public_html\///;
+	}
+	$selectionmade = 1;
+	if ($currentURL=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {
+	    my %moreenv;
+	    $moreenv{'request.filename'}=$currentURL;
+	    my %form;
+	    $form{'grade_target'}='tex';
+	    $form{'textwidth'}=$LaTeXwidth;
+	    my $rndseed=time;
+	    $form{'rndseed'}=$rndseed;
+	    &Apache::lonnet::appenv(%moreenv);
+	    my $texversion=&Apache::lonnet::ssi($currentURL,%form);
+	    &Apache::lonnet::delenv('form.counter');
+	    &Apache::lonnet::delenv('request.filename');
+	    if($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
+		my %form;
+		$form{'grade_target'}='answer';
+		$form{'answer_output_mode'}='tex';
+		$form{'rndseed'}=$rndseed;
+		my $answer=&Apache::lonnet::ssi($currentURL,%form);
+		$texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
+	    }
+	    $result .= $texversion;
+	    if ($currentURL=~m/\.page\s*$/) {
+		($result,$number_of_columns) = &page_cleanup($result);
+	    }
+	} else {
+#	  $result='\documentclass[letterpaper]{article}\usepackage{calc}\begin{document}Printout of this type of document is currently not supported: ';
+#	  if ($ENV{'form.url'}=~/\/(aboutme|syllabus|bulletinboard|smppg)$/) {
+#	      $result.=$1;
+#	  } else {
+#	      $result.=$ENV{'form.url'};
+#	  }
+#	  $result.=' \end{document}'
+	}
+    } elsif (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems') or
+             ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems_pages') or
+             ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems')) { 
+        #-- produce an output string
+	my %form=();	   
+	$form{'grade_target'}='tex';
+	$form{'textwidth'}=$LaTeXwidth;
+	$form{'problem_split'}=$parmhash{'problem_stream_switch'};
+	my $flag_latex_header_remove = 'NO';
+	my $flag_page_in_sequence = 'NO';
+	my @master_seq=split /\|\|\|/, $helper->{'VARS'}->{'RESOURCES'};
+	my $prevassignment='';
+	for (my $i=0;$i<=$#master_seq;$i++) {
+	    $master_seq[$i]=~/___\d+___(.*)$/;
+	    my $urlp='/res/'.$1;
+	    if ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems') {
+		$selectionmade = 2;
+	    } elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems_pages') {
+		$selectionmade = 3;
+	    } elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems') {
+		$selectionmade = 4;
+	    }
+	    $form{'symb'}=$master_seq[$i];
+	    $master_seq[$i]=~/\/([^\/]+)\.sequence_/;
+	    my $assignment=' '.$1.' ';
+	    #&Apache::lonnet::logthis("Trying to get $urlp with symb $master_seq[$i]");
+	    my $texversion=&Apache::lonnet::ssi($urlp,%form);
+	    if ($urlp=~/\.page$/) {
+		($texversion,my $number_of_columns_page) = &page_cleanup($texversion);
+		if ($number_of_columns_page > $number_of_columns) {$number_of_columns=$number_of_columns_page;} 
+		$texversion =~ s/\\end{document}\d*/\\end{document}/;
+		$flag_page_in_sequence = 'YES';
+	    } 
+	    if ($flag_latex_header_remove ne 'NO') {
+		$texversion = &latex_header_footer_remove($texversion);
+	    } else {
+		$texversion =~ s/\\end{document}//;
+	    }
+	    if($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
+		my %form;
+		$form{'grade_target'}='answer';
+		$form{'answer_output_mode'}='tex';
+		my $answer=&Apache::lonnet::ssi($urlp,%form);
+		$texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
+	    }
+#	    $result .= $texversion;
+	    if (($selectionmade == 4) and ($assignment ne $prevassignment) and ($i>1)) {
+		my $name = &get_name();
+		if ($name =~ /^\s*$/) {
+		    $name=&Apache::lonxml::latex_special_symbols($ENV{'user.name'},undef,
+								 undef,'header');
+		}
+		my $courseidinfo = &Apache::lonxml::latex_special_symbols(&Apache::lonnet::unescape($ENV{'course.'.$ENV{'request.course.id'}.'.description'}),'','','header');
+		$prevassignment=$assignment;
+		$result .='\newpage \noindent\parbox{\minipagewidth}{\noindent\\lhead{\\textit{\\textbf{'.$name.'}} - '.$courseidinfo.' \\hfill \\thepage \\\\ \\textit{'.$assignment.'}}} \vskip -5 mm ';
+	    }
+	    $result .= $texversion;
+	    $flag_latex_header_remove = 'YES';   
+	}
+	&Apache::lonnet::delenv('form.counter');
+	if ($flag_page_in_sequence eq 'YES') {$result =~ s/\\usepackage{calc}/\\usepackage{calc}\\usepackage{longtable}/;}	
+	$result .= '\end{document}';
+     } elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_students') { 
+     #-- prints assignments for whole class or for selected students  
+	 $selectionmade=5;
+	 my @students=split /\|\|\|/, $helper->{'VARS'}->{'STUDENTS'};
+	 my @master_seq=split /\|\|\|/, $helper->{'VARS'}->{'RESOURCES'};
+	 #loop over students
+	 my $flag_latex_header_remove = 'NO'; 
+	 my %moreenv;
+	 $moreenv{'form.textwidth'}=$LaTeXwidth;
+	 &Apache::lonnet::appenv(%moreenv);
+	 my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Print Status','Class Print Status',$#students+1);
+	 foreach my $person (@students) {
+	    my $current_output = ''; 
+#	    my ($usersection,$username,$userdomain) = split /:/,$person;
+	    my ($username,$userdomain) = split /:/,$person;
+	    my $fullname = &get_name($username,$userdomain);
+            #goes through all resources, checks if they are available for current student, and produces output   
+	    foreach my $curresline (@master_seq)  {
+		if ($curresline=~ m/\.(problem|exam|quiz|assess|survey|form|library)$/) {
+		    my ($map,$id,$res_url) = split(/___/,$curresline);
+		    if (&Apache::lonnet::allowed('bre',$res_url)) {
+			my $rendered = &Apache::loncommon::get_student_view($curresline,$username,$userdomain,
+                                                                        $ENV{'request.course.id'},'tex');
+			if ($flag_latex_header_remove eq 'YES') {
+			    $rendered = &latex_header_footer_remove($rendered);
+			} else {
+			    $rendered =~ s/\\end{document}//;
+			}
+			if($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
+			    my %form;
+			    $form{'answer_output_mode'}='tex';
+			    my $ansrendered = &Apache::loncommon::get_student_answers($curresline,$username,$userdomain,$ENV{'request.course.id'},%form);
+			    $rendered=~s/(\\keephidden{ENDOFPROBLEM})/$ansrendered$1/;
+			}
+			$current_output .= $rendered;
+		    }
+		    $flag_latex_header_remove = 'YES';
+		}
+	    }
+	    my $courseidinfo = $ENV{'course.'.$ENV{'request.course.id'}.'.description'};
+	    if ($current_output=~/\\documentclass/) {
+		$current_output =~ s/\\begin{document}/\\setlength{\\topmargin}{1cm} \\begin{document}\\noindent\\lhead{\\textit{\\textbf{$fullname}} - $courseidinfo \\hfill \\thepage \\\\ \\textit{$helper->{VARS}->{'assignment'}}}\\vskip 3 mm /;
+	    } else {
+		my $blanspages = '';
+		for (my $j=0;$j<$helper->{'VARS'}->{'EMPTY_PAGES'};$j++) {$blanspages.='\clearpage\strut\clearpage';}
+		$current_output = '\strut\\newline\\noindent\\makebox[\\textwidth/$number_of_columns][b]{\\hrulefill}\\newline\\noindent{\\tiny Printed from LON-CAPA\\copyright MSU{\\hfill} Licensed under GNU General Public License }\\newpage '.$blanspages.'\setcounter{page}{1}\noindent\parbox{\minipagewidth}{\noindent\\lhead{\\textit{\\textbf{'.$fullname.'}} - '.$courseidinfo.' \\hfill \\thepage \\\\ \\textit{'.$helper->{VARS}->{'assignment'}.'}}} \vskip -5 mm '.$current_output;
+	    }
+	    $result .= $current_output;
+	    &Apache::lonnet::delenv('form.counter');	    
+	    &Apache::lonxml::init_counter(); 
+	    &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
+						    'last student '.$fullname);
+	}
+	&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
+	$result .= '\end{document}';
+	&Apache::lonnet::delenv('form.textwidth');
+    } elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_from_directory') {      
+    #prints selected problems from the subdirectory 
+	$selectionmade = 6;
+        my @list_of_files=split /\|\|\|/, $helper->{'VARS'}->{'FILES'};
+	@list_of_files=sort @list_of_files;
+	my $flag_latex_header_remove = 'NO'; 
+	my $rndseed=time;
+	for (my $i=0;$i<=$#list_of_files;$i++) {
+	    my $urlp = $list_of_files[$i];
+	    if ($urlp=~/\//) {
+		my %form;
+		$form{'grade_target'}='tex';
+		$form{'textwidth'}=$LaTeXwidth;
+		$form{'rndseed'}=$rndseed;
+		if ($urlp =~ m|/home/([^/]+)/public_html|) {
+		    $urlp =~ s|/home/([^/]*)/public_html|/~$1|;
+		} else {
+		    $urlp =~ s|^/home/httpd/html||;
+		}
+		my $texversion=&Apache::lonnet::ssi($urlp,%form);
+		if($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
+		    my %form;
+		    $form{'grade_target'}='answer';
+		    $form{'answer_output_mode'}='tex';
+		    $form{'rndseed'}=$rndseed;
+		    my $answer=&Apache::lonnet::ssi($urlp,%form);
+		    $texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
+		}
+                #this chunck is responsible for printing the path to problem
+		my $newurlp = '';
+		my $HowMany = length($urlp)*2;
+		if ($HowMany > $LaTeXwidth) {
+		    my @temporrary = split '/',$urlp;
+		    my $HowManyNew = 0;
+		    for (my $ii=0;$ii<=$#temporrary;$ii++) {
+			if ($temporrary[$ii] ne '') {
+			    $HowManyNew += length($temporrary[$ii])*2;
+			    if ($HowManyNew < $LaTeXwidth ) {
+				$newurlp .=  '/'.$temporrary[$ii];
+			    } else {
+				$HowManyNew = 0;
+				$newurlp .=  '|\vskip -1 mm \noindent \verb|';
+				$ii--;
+			    }
+			}
+		    }
+		}
+		$texversion =~ s/(\\begin{minipage}{\\textwidth})/$1 {\\small\\noindent\\verb|$newurlp\|\\vskip 0 mm}/;
+		if ($flag_latex_header_remove ne 'NO') {
+		    $texversion = &latex_header_footer_remove($texversion);
+		} else {
+		    $texversion =~ s/\\end{document}//;
+		}
+		$result .= $texversion;
+	    }
+	    $flag_latex_header_remove = 'YES';  
+	}
+	if ($helper->{VARS}->{'construction'} eq '1') {$result=~s/(\\typeout)/ RANDOM SEED IS $rndseed $1/;}
+	$result .= '\end{document}';      	
+    }
+#-------------------------------------------------------- corrections for the different page formats
+    $result = &page_format_transformation($papersize,$laystyle,$numberofcolumns,$helper->{'VARS'}->{'PRINT_TYPE'},$result,$helper->{VARS}->{'assignment'});
+    $result = &latex_corrections($number_of_columns,$result);
+    #changes page's parameters for the one column output 
+    if ($numberofcolumns == 1) {
+	$result =~ s/\\textwidth= 9cm/\\textwidth= $helper->{'VARS'}->{'pagesize.width'} $helper->{'VARS'}->{'pagesize.widthunit'} /;
+	$result =~ s/\\textheight 25\.9cm/\\textheight $helper->{'VARS'}->{'pagesize.height'} $helper->{'VARS'}->{'pagesize.heightunit'} /;
+	$result =~ s/\\evensidemargin = -0\.57in/\\evensidemargin= $helper->{'VARS'}->{'pagesize.lmargin'} $helper->{'VARS'}->{'pagesize.lmarginunit'} /;
+	$result =~ s/\\oddsidemargin = -0\.57in/\\oddsidemargin= $helper->{'VARS'}->{'pagesize.lmargin'} $helper->{'VARS'}->{'pagesize.lmarginunit'} /;
+    }
+#-- writing .tex file in prtspool 
+    my $temp_file;
+    my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout_".time."_".rand(10000000).".tex";
+    unless ($temp_file = Apache::File->new('>'.$filename)) {
+	$r->log_error("Couldn't open $filename for output $!");
+	return SERVER_ERROR; 
+    } 
+    print $temp_file $result;
+
+#<meta http-equiv="Refresh" content="0; url=/cgi-bin/printout.pl?$filename&$laystyle&$numberofcolumns&$selectionmade">
+$r->print(<<FINALEND);
+<meta http-equiv="Refresh" content="0; url=/cgi-bin/printout.pl?$filename&$laystyle&$numberofcolumns&$selectionmade">
+</body>
+</html>
+FINALEND
+}
+
+
+
 sub handler {
 
     my $r = shift;
     my $helper;
 
-    # A hook for me to work without disturbing Alex.
-    if (!$ENV{'form.jeremy'}) {
-        my $result = printHelper($r);
-        if (!ref($result)) {
-            return $result;
-        }
-        $helper = $result;
+#    my $loaderror=&Apache::lonnet::overloaderror($r);
+#    if ($loaderror) { return $loaderror; }
+#    $loaderror=
+#       &Apache::lonnet::overloaderror($r,
+#         $ENV{'course.'.$ENV{'request.course.id'}.'.home'});
+#    if ($loaderror) { return $loaderror; }
+
+    my $result = printHelper($r);
+    if (!ref($result)) {
+	return $result;
     }
+    $helper = $result;
+   
+#	my $key; 
+#	foreach $key (keys %{$helper->{'VARS'}}) {
+#	    $r->print(' '.$key.'->'.$helper->{'VARS'}->{$key}.'<-<br />');
+#	}
+#	return OK;
 
-    my $loaderror=&Apache::lonnet::overloaderror($r);
-    if ($loaderror) { return $loaderror; }
-    $loaderror=
-       &Apache::lonnet::overloaderror($r,
-         $ENV{'course.'.$ENV{'request.course.id'}.'.home'});
-    if ($loaderror) { return $loaderror; }
-
-    $r->content_type('text/html');
-    $r->send_http_header;
-    $r->print(&Apache::loncommon::bodytag("Printing"));
-
-    if ($ENV{'request.course.id'}) {
-	my $fn=$ENV{'request.course.fn'};
-	tie(%hash,'GDBM_File',"$fn.db",&GDBM_READER(),0640);
-    }
+    my %parmhash=&Apache::lonnet::coursedescription($ENV{'request.course.id'});
+    
 
-#-- start form
-    &headerform($r);
-#-- menu for output
-    unless  ($ENV{'form.phase'}) {
-	&menu_for_output($r);
-    }
-#-- additional menu for class printing
-     if ($ENV{'form.phase'} eq 'two') {
-	 if($ENV{'form.choice'} eq 'Standard LaTeX output for whole primary sequence') {
-	     &sequence_content_menu(0,$r);
-	 } elsif($ENV{'form.choice'} eq 'Standard LaTeX output for the primary sequence') {
-	     &sequence_content_menu(1,$r);
-	 } elsif($ENV{'form.choice'} eq 'All class print') {
-	     &additional_class_menu($r);
-	 } elsif($ENV{'form.choice'} eq 'Subdirectory print') {
-	     &problem_choice_menu($r);
-	 } else {
-	     $ENV{'form.phase'} = 'three';
-	 }
-     }
-#-- additional menu for page layout (one column case)
-    if ($ENV{'form.phase'} eq 'three') {
-	if($ENV{'form.numberofcolumns'} == 1) {
-	    &additional_print_menu($r);
-	} else {
-	    $ENV{'form.phase'} = 'four';
-	}
-    }
-#-- core part 
-    if ($ENV{'form.phase'} eq 'four') {
-	&output_data($r);
-    }	
-    untie %hash;
+    &output_data($r,$helper,\%parmhash);
     return OK;
-   
 } 
 
 use Apache::lonhelper;
@@ -1320,36 +852,77 @@ sub printHelper {
 
     Apache::loncommon::get_unprocessed_cgi($ENV{QUERY_STRING});
     
-    my $helper = Apache::lonhelper::helper->new("Printing Wizard");
+    my $helper = Apache::lonhelper::helper->new("Printing Helper");
+    $helper->declareVar('symb');
+    $helper->declareVar('postdata');    
+    $helper->declareVar('filename');
+    $helper->declareVar('construction');
+    $helper->declareVar('assignment');
     
     # This will persistently load in the data we want from the
     # very first screen.
-    if (defined($ENV{'form.symb'})) {
-        $helper->{VARS}->{'symb'} = $ENV{'form.symb'};
-    }
-    if (defined($ENV{'form.postdata'})) {
-        $helper->{VARS}->{'postdata'} = $ENV{'form.postdata'};
-    }
-    if (defined($ENV{'form.url'})) {
-        $helper->{VARS}->{'url'} = $ENV{'form.url'};
+    # Detect whether we're coming from construction space
+    if ($ENV{'form.postdata'} =~ /http:\/\// ) {
+        $ENV{'form.postdata'} =~ /http:\/\/[^\/]+\/~([^\/]+)\/(.*)/;
+        $helper->{VARS}->{'filename'} = "/home/$1/public_html/$2";
+        $helper->{VARS}->{'construction'} = 1;
+    } else {
+        if ($ENV{'form.postdata'}) {
+            $helper->{VARS}->{'symb'} = &Apache::lonnet::symbread($ENV{'form.postdata'});
+        }
+        if ($ENV{'form.symb'}) {
+            $helper->{VARS}->{'symb'} = $ENV{'form.symb'};
+        }
+        if ($ENV{'form.url'}) {
+            $helper->{VARS}->{'symb'} = &Apache::lonnet::symbread($helper->{VARS}->{'postdata'});
+        }
     }
 
-    my ($resourceTitle,$sequenceTitle,$mapTitle) = &details_for_menu;
-    if (!$resourceTitle) { # if the resource doesn't have a title, use the filename
-        my $url = $helper->{VARS}->{'postdata'};
-        $resourceTitle = substr($url, rindex($url, '/') + 1);
+    if ($ENV{'form.symb'}) {
+        $helper->{VARS}->{'symb'} = $ENV{'form.symb'};
     }
+    if ($ENV{'form.url'}) {
+        $helper->{VARS}->{'symb'} = &Apache::lonnet::symbread($helper->{VARS}->{'postdata'});
 
-    Apache::lonhelper::registerHelperTags();
+    }
+    
+    my ($resourceTitle,$sequenceTitle,$mapTitle) = &details_for_menu;
+    if ($sequenceTitle ne '') {$helper->{VARS}->{'assignment'}=$sequenceTitle;}
 
+    
     # Extract map
     my $symb = $helper->{VARS}->{'symb'};
-    my ($map, $id, $url) = split(/__/, $symb);
+    my ($map, $id, $url);
+    my $subdir;
+
+    # Get the resource name from construction space
+    if ($helper->{VARS}->{'construction'}) {
+        $resourceTitle = substr($helper->{VARS}->{'filename'}, 
+                                rindex($helper->{VARS}->{'filename'}, '/')+1);
+        $subdir = substr($helper->{VARS}->{'filename'},
+                         0, rindex($helper->{VARS}->{'filename'}, '/') + 1);
+    } else {
+        ($map, $id, $url) = split(/___/, $symb);
+        $helper->{VARS}->{'postdata'} = Apache::lonnet::clutter($url);
+
+        if (!$resourceTitle) { # if the resource doesn't have a title, use the filename
+            my $url = $helper->{VARS}->{'postdata'};
+            $resourceTitle = substr($url, rindex($url, '/') + 1);
+        }
+        $subdir = &Apache::lonnet::filelocation("", $url);
+    }
 
-    my $subdir = &Apache::lonnet::filelocation("", $helper->{VARS}->{'postdata'});
+    my $userCanSeeHidden = Apache::lonnavmaps::advancedUser();
+
+    Apache::lonhelper::registerHelperTags();
 
     # "Delete everything after the last slash."
     $subdir =~ s|/[^/]+$||;
+    if (not $helper->{VARS}->{'construction'}) {
+	$subdir='/home/httpd/html/res/'.$subdir;
+    }
+    # "Remove all duplicate slashes."
+    $subdir =~ s|/+|/|g;
 
     # What can be printed is a very dynamic decision based on
     # lots of factors. So we need to dynamically build this list.
@@ -1364,40 +937,44 @@ sub printHelper {
     # the helper by hand.
     my $printChoices = [];
     my $paramHash;
-    # We can always print the current screen.
 
-    push @{$printChoices}, ["<b>$resourceTitle</b> (exactly what was on the screen)", 'current_document', 'FINAL'];
+    if ($resourceTitle) {
+        push @{$printChoices}, ["<b>$resourceTitle</b> (prints what you just saw on the screen)", 'current_document', 'PAGESIZE'];
+    }
+
+#    $r->print($helper->{VARS}->{'postdata'});
 
     # If we're in a sequence...
-    if ($helper->{VARS}->{'postdata'} =~ /\/res\//) {
+    if ($helper->{'VARS'}->{'construction'} ne '1') {
         # Allow problems from sequence
-        push @{$printChoices}, ["Problems from <b>$sequenceTitle</b>", 'map_problems', 'CHOOSE_PROBLEMS'];
+        push @{$printChoices}, ["Problem(s) from <b>$sequenceTitle</b>", 'map_problems', 'CHOOSE_PROBLEMS'];
         # Allow all resources from sequence
-        push @{$printChoices}, ["Problems and pages from <b>$sequenceTitle</b>", 'map_problems_pages', 'CHOOSE_PROBLEMS_HTML'];
+        push @{$printChoices}, ["Everything (problem(s), page(s), html/xml file(s)) from <b>$sequenceTitle</b>", 'map_problems_pages', 'CHOOSE_PROBLEMS_HTML'];
 
-        my $isProblem = '$res->is_problem();';
+        my $isProblem = '$res->is_problem()';
+	$isProblem .= ' && !$res->randomout()' if !$userCanSeeHidden;
         my $isProblemOrMap = '$res->is_problem() || $res->is_map()';
-        my $isNotMap = '!$res->is_map();';
-        my $symb = '$res->symb();';
+        my $isNotMap = '!$res->is_map()';
+	$isNotMap .= ' && !$res->randomout()' if !$userCanSeeHidden;
+        my $symb = '$res->symb()';
         my $helperFragment = <<HELPERFRAGMENT;
-  <state name="CHOOSE_PROBLEMS" title="Select Problems">
-    <message>Select problems to print:</message>
-    <resource variable="RESOURCES" multichoice="1">
-      <nextstate>FINAL</nextstate>
-      <filterfunc>return $isProblemOrMap</filterfunc>
-      <choicefunc>return $isProblem</choicefunc>
+  <state name="CHOOSE_PROBLEMS" title="Select Problem(s) to print">
+    <message>(mark them then click "next" button) <br /></message>
+    <resource variable="RESOURCES" multichoice="1" toponly='1'>
+      <nextstate>PAGESIZE</nextstate>
+      <filterfunc>return $isProblem;</filterfunc>
       <mapurl>$map</mapurl>
-      <valuefunc>return $symb</valuefunc>
+      <valuefunc>return $symb;</valuefunc>
       </resource>
     </state>
 
-  <state name="CHOOSE_PROBLEMS_HTML" title="Select Resources">
-    <message>Select resources to print:</message>
-    <resource variable="RESOURCES" multichoice="1">
-      <nextstate>FINAL</nextstate>
-      <choicefunc>return $isNotMap;</choicefunc>
+  <state name="CHOOSE_PROBLEMS_HTML" title="Select Resource(s) to print">
+    <message>(mark them then click "next" button) <br /></message>
+    <resource variable="RESOURCES" multichoice="1" toponly='1'>
+      <nextstate>PAGESIZE</nextstate>
+      <filterfunc>return $isNotMap;</filterfunc>
       <mapurl>$map</mapurl>
-      <valuefunc>return $symb</valuefunc>
+      <valuefunc>return $symb;</valuefunc>
       </resource>
     </state>
 HELPERFRAGMENT
@@ -1408,59 +985,99 @@ HELPERFRAGMENT
     # If the user is priviledged, allow them to print all 
     # problems in the course, optionally for selected students
     if (($ENV{'request.role'}=~m/^cc\./ or $ENV{'request.role'}=~m/^in\./ or $ENV{'request.role'}=~m/^ta\./) and ($helper->{VARS}->{'postdata'}=~/\/res\//)) { 
-        push @{$printChoices}, ['<b>All problems</b> in course (may take a lot of time)', 'all_problems', 'ALL_PROBLEMS'];
+        push @{$printChoices}, ['<b>Problems</b> in this course', 'all_problems', 'ALL_PROBLEMS'];
         push @{$printChoices}, ["Problems from <b>$sequenceTitle</b> for selected students", 'problems_for_students', 'CHOOSE_STUDENTS'];
 
-        my $isProblem = '$res->is_problem();';
-        my $isProblemOrMap = '$res->is_problem() || $res->is_map()';
-        my $symb = '$res->symb();';
+        my $isProblem = '$res->is_problem()';
+	$isProblem .= ' && !$res->randomout()' if !$userCanSeeHidden;
+        my $isProblemOrMap = '($res->is_problem() || $res->is_map())';
+	$isProblemOrMap .= ' && !$res->randomout()' if !$userCanSeeHidden;
+        my $symb = '$res->symb()';
         &Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_STUDENTS);
-  <state name="ALL_PROBLEMS" title="Select Problems">
-    <message>Select problems to print:</message>
-    <resource variable="RESOURCES" multichoice="1">
-      <nextstate>FINAL</nextstate>
-      <filterfunc>return $isProblemOrMap</filterfunc>
-      <choicefunc>return $isProblem</choicefunc>
-      <valuefunc>return $symb</valuefunc>
+  <state name="ALL_PROBLEMS" title="Select Problem(s) to print">
+    <message>(mark them then click "next" button) <br /></message>
+    <resource variable="RESOURCES" multichoice="1" suppressEmptySequences='1'>
+      <nextstate>PAGESIZE</nextstate>
+      <filterfunc>return $isProblemOrMap;</filterfunc>
+      <choicefunc>return $isProblem;</choicefunc>
+      <valuefunc>return $symb;</valuefunc>
       </resource>
     </state>
 
-  <state name="CHOOSE_STUDENTS" title="Choose Students">
-    <message>Select the students you wish to print the problems for:</message>
-    <student multichoice='1' variable="STUDENTS" nextstate="FINAL" />
+  <state name="CHOOSE_STUDENTS" title="Choose Students whose assignments you want to print">
+    <student multichoice='1' variable="STUDENTS" nextstate="PAGESIZE" />
+    <message><br /><big><i><b>Select resources for the assignment</b></i></big><br /></message>
+    <resource variable="RESOURCES" multichoice="1">
+      <filterfunc>return $isProblem</filterfunc>
+      <mapurl>$map</mapurl>
+      <valuefunc>return $symb</valuefunc>
+      </resource>
+    <message><br /><big><i><b>How should the results be printed?</b></i></big><br /></message>
+    <choices variable="EMPTY_PAGES">
+      <choice computer='0'>Start each student\'s assignment on a new page (add a pagefeed after each assignment)</choice>
+      <choice computer='1'>Add one empty page after each student\'s assignment</choice>
+      <choice computer='2'>Add two empty pages after each student\'s assignment</choice>
+      </choices>
     </state>
 CHOOSE_STUDENTS
     }
 
     # FIXME: That RE should come from a library somewhere.
-    if ((&Apache::lonnet::allowed('bre',$subdir) eq 'F') and ($helper->{VARS}->{'postdata'}=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)/)) {    
-        push @{$printChoices}, ["Problems from <b>$subdir</b>", 'problems_from_directory', 'CHOOSE_FROM_SUBDIR'];
+    if ((((&Apache::lonnet::allowed('bre',$subdir) eq 'F') and ($helper->{VARS}->{'postdata'}=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)/)) or defined $helper->{'VARS'}->{'construction'}) and $ENV{'request.role.adv'}) {    
+        push @{$printChoices}, ["Problems from current subdirectory <b>$subdir</b>", 'problems_from_directory', 'CHOOSE_FROM_SUBDIR'];
         
         my $f = '$filename';
-        &Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_FROM_SUBDIR);
-  <state name="CHOOSE_FROM_SUBDIR" title="Select Files">
-    <message>Select problems you wish to print from <b>$subdir</b></message>
-    <files variable="FILES">
-      <nextstate>FINAL</nextstate>
-      <filechoice>$subdir</filechoice>
-      <filefilter>return $f =~ 
+        my $xmlfrag = <<CHOOSE_FROM_SUBDIR;
+  <state name="CHOOSE_FROM_SUBDIR" title="Select File(s) from <b><small>$subdir</small></b> to print">
+    <message>(mark them then click "next" button) <br /></message>
+    <files variable="FILES" multichoice='1'>
+      <nextstate>PAGESIZE</nextstate>
+      <filechoice>return '$subdir';</filechoice>
+CHOOSE_FROM_SUBDIR
+        
+        $xmlfrag .= <<'CHOOSE_FROM_SUBDIR';
+      <filefilter>return $filename =~ 
            m/^[^\.]+\.(problem|exam|quiz|assess|survey|form|library)$/;
       </filefilter>
+      </files>
     </state>
 CHOOSE_FROM_SUBDIR
+        &Apache::lonxml::xmlparse($r, 'helper', $xmlfrag);
     }
 
     # Generate the first state, to select which resources get printed.
-    Apache::lonhelper::state->new("START", "Selecting Resources to Print");
+    Apache::lonhelper::state->new("START", "What do you want to print? Make a choice.");
     $paramHash = Apache::lonhelper::getParamHash();
-    $paramHash->{MESSAGE_TEXT} = "What do you want to print?";
+    $paramHash->{MESSAGE_TEXT} = "";
     Apache::lonhelper::message->new();
     $paramHash = Apache::lonhelper::getParamHash();
     $paramHash->{'variable'} = 'PRINT_TYPE';
+    $helper->declareVar('PRINT_TYPE');
     $paramHash->{CHOICES} = $printChoices;
     Apache::lonhelper::choices->new();
+
+    if (($ENV{'request.role.adv'} and &Apache::lonnet::allowed('vgr',$ENV{'request.course.id'})) or 
+	($helper->{VARS}->{'construction'} eq '1')) {
+        $paramHash = Apache::lonhelper::getParamHash();
+        $paramHash->{MESSAGE_TEXT} = "<br /><big><b><i>Next option is available only for advanced users:</i></b></big><br />";
+        Apache::lonhelper::message->new();
+        $paramHash = Apache::lonhelper::getParamHash();
+	$paramHash->{'variable'} = 'ANSWER_TYPE';   
+	$helper->declareVar('ANSWER_TYPE');         
+        $paramHash->{CHOICES} = [
+                                   ['Print without answer', 'yes'],
+                                   ['Print with answers', 'no'] ];
+        Apache::lonhelper::choices->new();
+    }
+
     Apache::lonprintout::page_format_state->new("FORMAT");
 
+    # Generate the PAGESIZE state which will offer the user the margin
+    # choices if they select one column
+    Apache::lonhelper::state->new("PAGESIZE", "Set Margins");
+    Apache::lonprintout::page_size_state->new('pagesize', 'FORMAT', 'FINAL');
+
+
     $helper->process();
 
     # MANUAL BAILOUT CONDITION:
@@ -1524,7 +1141,11 @@ my @paperSize = ("Letter [8 1/2x11 in]",
 sub new { 
     my $self = Apache::lonhelper::element->new();
 
+    shift;
+
     $self->{'variable'} = shift;
+    my $helper = Apache::lonhelper::getHelper();
+    $helper->declareVar($self->{'variable'});
     bless($self);
     return $self;
 }
@@ -1534,31 +1155,28 @@ sub render {
     my $helper = Apache::lonhelper::getHelper();
     my $result = '';
     my $var = $self->{'variable'};
-    my $curVal = $helper->{VARS}->{$var};
-
-    my ($layout, $cols, $paper) = split(/\|/, $curVal);
 
     $result .= <<STATEHTML;
 
-<p>How should the printing be formatted?</p>
+<p><big><i><b>What page format do you prefer?</b></i></big></p>
 <table cellpadding="3">
   <tr>
-    <td align="center"><b>Layout</b></td>
-    <td align="center"><b>Columns</b></td>
+    <td align="center"><b>Page layout</b></td>
+    <td align="center"><b>Number of columns</b></td>
     <td align="center"><b>Paper type</b></td>
   </tr>
   <tr>
     <td>
-      <input type="radio" name="${var}.layout" value="L" checked='1' /> Landscape<br />
-      <input type="radio" name="${var}.layout" value="P" /> Portrait
+      <input type="radio" name="${var}.layout" value="L" /> Landscape<br />
+      <input type="radio" name="${var}.layout" value="P" checked='1'  /> Portrait
     </td>
-    <td>
+    <td align="center">
       <select name="${var}.cols">
 STATEHTML
 
     my $i;
     for ($i = 1; $i <= $maxColumns; $i++) {
-        if ($i == $cols) {
+        if ($i == 2) {
             $result .= "<option value='$i' selected>$i</option>\n";
         } else {
             $result .= "<option value='$i'>$i</option>\n";
@@ -1570,7 +1188,7 @@ STATEHTML
 
     $i = 0;
     foreach (@paperSize) {
-        if ($paper == $i) {
+        if ($i == 0) {
             $result .= "<option selected value='$i'>" . $paperSize[$i] . "</option>\n";
         } else {
             $result .= "<option value='$i'>" . $paperSize[$i] . "</option>\n";
@@ -1582,7 +1200,173 @@ STATEHTML
     return $result;
 }
 
+sub postprocess {
+    my $self = shift;
+
+    my $var = $self->{'variable'};
+    my $helper = Apache::lonhelper->getHelper();
+    $helper->{VARS}->{$var} = 
+        $ENV{"form.$var.layout"} . '|' . $ENV{"form.$var.cols"} . '|' .
+        $ENV{"form.$var.paper"};
+    return 1;
+}
+
 1;
 
+package Apache::lonprintout::page_size_state;
+
+=pod
+
+=head1 Helper element: page_size_state
+
+See lonhelper.pm documentation for discussion of the helper framework.
+
+Apache::lonprintout::page_size_state is an element that gives the 
+user the opportunity to further refine the page settings if they
+select a single-column page.
+
+page_size_state is always directly invoked in lonprintout.pm, so there
+is no tag interface. You actually pass parameters to the constructor.
+
+=over 4
+
+=item * B<new>(varName): varName is where the print information will be stored in the format FIXME.
+
+=back
+
+=cut
+
+use Apache::lonhelper;
+
+no strict;
+@ISA = ("Apache::lonhelper::element");
+use strict;
+
+
+
+sub new { 
+    my $self = Apache::lonhelper::element->new();
+
+    shift; # disturbs me (probably prevents subclassing) but works (drops
+           # package descriptor)... - Jeremy
+
+    $self->{'variable'} = shift;
+    my $helper = Apache::lonhelper::getHelper();
+    $helper->declareVar($self->{'variable'});
+
+    # The variable name of the format element, so we can look into 
+    # $helper->{VARS} to figure out whether the columns are one or two
+    $self->{'formatvar'} = shift;
+
+    # The state to transition to after selection, or after discovering
+    # the cols are not set to 1
+    $self->{NEXTSTATE} = shift;
+    bless($self);
+    return $self;
+}
+
+sub render {
+    my $self = shift;
+    my $helper = Apache::lonhelper::getHelper();
+    my $result = '';
+    my $var = $self->{'variable'};
+
+    if (defined $self->{ERROR_MSG}) {
+        $result .= '<br /><font color="#FF0000">' . $self->{ERROR_MSG} . '</font><br />';
+    }
+
+    $result .= <<ELEMENTHTML;
+
+<p>How should the column be formatted?</p>
+
+<table cellpadding='3'>
+  <tr>
+    <td align='right'><b>Width</b>:</td>
+    <td align='left'><input type='text' name='$var.width' value='18' size='4'></td>
+    <td align='left'>
+      <select name='$var.widthunit'>
+        <option>cm</option><option>in</option>
+      </select>
+    </td>
+  </tr>
+  <tr>
+    <td align='right'><b>Height</b>:</td>
+    <td align='left'><input type='text' name="$var.height" value="25.9" size='4'></td>
+    <td align='left'>
+      <select name='$var.heightunit'>
+        <option>cm</option><option>in</option>
+      </select>
+    </td>
+  </tr>
+  <tr>
+    <td align='right'><b>Left margin</b>:</td>
+    <td align='left'><input type='text' name='$var.lmargin' value='-1.5' size='4'></td>
+    <td align='left'>
+      <select name='$var.lmarginunit'>
+        <option>cm</option><option>in</option>
+      </select>
+    </td>
+  </tr>
+</table>
+
+<p>Hint: Some instructors like to leave scratch space for the student by
+making the width much smaller then the width of the page.</p>
+
+ELEMENTHTML
+
+    return $result;
+}
+
+# If the user didn't select 1 column, skip this state.
+sub preprocess {
+    my $self = shift;
+    my $helper = Apache::lonhelper::getHelper();
+
+    my $format = $helper->{VARS}->{$self->{'formatvar'}};
+    if (substr($format, 2, 1) ne '1') {
+        $helper->changeState($self->{NEXTSTATE});
+    }
+   
+    return 1;
+}
+
+sub postprocess {
+    my $self = shift;
+
+    my $var = $self->{'variable'};
+    my $helper = Apache::lonhelper->getHelper();
+    my $width = $helper->{VARS}->{$var .'.width'} = $ENV{"form.${var}.width"}; 
+    my $height = $helper->{VARS}->{$var .'.height'} = $ENV{"form.${var}.height"}; 
+    my $lmargin = $helper->{VARS}->{$var .'.lmargin'} = $ENV{"form.${var}.lmargin"}; 
+    $helper->{VARS}->{$var .'.widthunit'} = $ENV{"form.${var}.widthunit"}; 
+    $helper->{VARS}->{$var .'.heightunit'} = $ENV{"form.${var}.heightunit"}; 
+    $helper->{VARS}->{$var .'.lmarginunit'} = $ENV{"form.${var}.lmarginunit"}; 
+
+    my $error = '';
+
+    # /^-?[0-9]+(\.[0-9]*)?$/ -> optional minus, at least on digit, followed 
+    # by an optional period, followed by digits, ending the string
+
+    if ($width !~  /^-?[0-9]+(\.[0-9]*)?$/) {
+        $error .= "Invalid width; please type only a number.<br />\n";
+    }
+    if ($height !~  /^-?[0-9]+(\.[0-9]*)?$/) {
+        $error .= "Invalid height; please type only a number.<br />\n";
+    }
+    if ($lmargin !~  /^-?[0-9]+(\.[0-9]*)?$/) {
+        $error .= "Invalid left margin; please type only a number.<br />\n";
+    }
+
+    if (!$error) {
+        Apache::lonhelper::getHelper()->changeState($self->{NEXTSTATE});
+        return 1;
+    } else {
+        $self->{ERROR_MSG} = $error;
+        return 0;
+    }
+}
+
+
+
 __END__