--- loncom/interface/lonprintout.pm	2005/02/17 23:19:44	1.362
+++ loncom/interface/lonprintout.pm	2005/07/26 10:50:32	1.380
@@ -1,7 +1,7 @@
 #  The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.362 2005/02/17 23:19:44 albertel Exp $
+# $Id: lonprintout.pm,v 1.380 2005/07/26 10:50:32 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -42,6 +42,8 @@ use Apache::lonratedt;
 use POSIX qw(strftime);
 use Apache::lonlocal;
 
+my $resources_printed = '';
+
 #   Compare two students by name.  The students are in the form
 #   returned by the helper:
 #      user:domain:section:last,   first:status
@@ -443,8 +445,8 @@ my %page_formats=
 	     '2' => ['3.16 in','13 in','-0.57 in','-0.57 in','-0.5 in']
 	 },
 	 'album' => {
-	     '1' => [],
-	     '2' => []
+	     '1' => ['12 in','7.1 in',,'-0.57 in','-0.57 in','-0.5 in'],
+             '2' => ['6.0 in','7.1 in','-1 in','-1 in','5 in']
           },
      },
      'tabloid' => {
@@ -453,8 +455,8 @@ my %page_formats=
 	     '2' => ['4.9 in','16 in','-0.57 in','-0.57 in','-0.5 in']
 	 },
 	 'album' => {
-	     '1' => [],
-	     '2' => []
+	     '1' => ['16 in','9.8 in','-0.57 in','-0.57 in','-0.5 in'],
+	     '2' => ['16 in','4.9 in','-0.57 in','-0.57 in','-0.5 in']
           },
      },
      'executive' => {
@@ -534,8 +536,8 @@ sub page_format {
 
 sub get_name {
     my ($uname,$udom)=@_;
-    if (!defined($uname)) { $uname=$ENV{'user.name'}; }
-    if (!defined($udom)) { $udom=$ENV{'user.domain'}; }
+    if (!defined($uname)) { $uname=$env{'user.name'}; }
+    if (!defined($udom)) { $udom=$env{'user.domain'}; }
     my $plainname=&Apache::loncommon::plainname($uname,$udom);
     if ($plainname=~/^\s*$/) { $plainname=$uname.'@'.$udom; }
     $plainname=&Apache::lonxml::latex_special_symbols($plainname,'header');
@@ -544,8 +546,8 @@ sub get_name {
 
 sub get_course {
     my $courseidinfo;
-    if (defined($ENV{'request.course.id'})) {
-	$courseidinfo = &Apache::lonxml::latex_special_symbols(&Apache::lonnet::unescape($ENV{'course.'.$ENV{'request.course.id'}.'.description'}),'header');
+    if (defined($env{'request.course.id'})) {
+	$courseidinfo = &Apache::lonxml::latex_special_symbols(&Apache::lonnet::unescape($env{'course.'.$env{'request.course.id'}.'.description'}),'header');
     }
     return $courseidinfo;
 }
@@ -607,7 +609,7 @@ sub page_cleanup {
 
 sub details_for_menu {
     my ($helper)=@_;
-    my $postdata=$ENV{'form.postdata'};
+    my $postdata=$env{'form.postdata'};
     if (!$postdata) { $postdata=$helper->{VARS}{'postdata'}; }
     my $name_of_resource = &Apache::lonnet::gettitle($postdata);
     my $symbolic = &Apache::lonnet::symbread($postdata);
@@ -618,9 +620,9 @@ sub details_for_menu {
 	$map =~ m|([^/]+)$|;
 	$name_of_sequence = $1;
     }
-    my $name_of_map = &Apache::lonnet::gettitle($ENV{'request.course.uri'});
+    my $name_of_map = &Apache::lonnet::gettitle($env{'request.course.uri'});
     if ($name_of_map =~ /^\s*$/) {
-	$ENV{'request.course.uri'} =~ m|([^/]+)$|;
+	$env{'request.course.uri'} =~ m|([^/]+)$|;
 	$name_of_map = $1;
     }
     return ($name_of_resource,$name_of_sequence,$name_of_map);
@@ -648,7 +650,8 @@ sub latex_corrections {
 	$first_comment = index($result,'<!--',$first_comment);
     }
     $result =~ s/^\s+$//gm; #remove empty lines
-    $result =~ s/(\s)(\s+)/$1/g; #removes more than one empty space
+    #removes more than one empty space
+    $result =~ s|(\s\s+)|($1=~/[\n\r]/)?"\n":" "|ge;
     $result =~ s/\\\\\s*\\vskip/\\vskip/gm;
     $result =~ s/\\\\\s*\\noindent\s*(\\\\)+/\\\\\\noindent /g;
     $result =~ s/{\\par }\s*\\\\/\\\\/gm;
@@ -695,7 +698,7 @@ sub IndexCreation {
 sub print_latex_header {
     my $mode=shift;
     my $output='\documentclass[letterpaper]{article}';
-    if (($mode eq 'batchmode') || (!$ENV{'request.role.adv'})) {
+    if (($mode eq 'batchmode') || (!$env{'request.role.adv'})) {
 	$output.='\batchmode';
     }
     $output.='\newcommand{\keephidden}[1]{}\renewcommand{\deg}{$^{\circ}$}'."\n".
@@ -781,6 +784,27 @@ sub unsupported {
 }
 
 
+#
+#   Retrieve the hash of page breaks.
+#
+#  Inputs:
+#    helper   - reference to helper object.
+#  Outputs
+#    A reference to a page break hash.
+#
+#
+
+sub get_page_breaks  {
+    my ($helper) = @_;
+    my %page_breaks;
+    
+    foreach my $break (split /\|\|\|/, $helper->{'VARS'}->{'FINISHPAGE'}) {
+	$page_breaks{$break} = 1;
+    }
+    
+    return %page_breaks;
+}
+
 sub output_data {
     my ($r,$helper,$rparmhash) = @_;
     my %parmhash = %$rparmhash;
@@ -819,6 +843,20 @@ $bodytag
 Please stand by while processing your print request, this may take some time ...
 ENDPART
 
+
+
+    # fetch the pagebreaks and store them in the course environment
+    # The page breaks will be pulled into the hash %page_breaks which is
+    # indexed by symb and contains 1's for each break.
+
+    $env{'form.pagebreaks'}  = $helper->{'VARS'}->{'FINISHPAGE'};
+    $env{'form.lastprinttype'} = $helper->{'VARS'}->{'PRINT_TYPE'}; 
+    &Apache::loncommon::store_course_settings('print',
+					      {'pagebreaks'    => 'scalar',
+					       'lastprinttype' => 'scalar'});
+
+    my %page_breaks  = &get_page_breaks($helper);
+
     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
@@ -830,7 +868,7 @@ ENDPART
 	$laystyle='book';
     }
     my ($textwidth,$textheight,$oddoffset,$evenoffset) = &page_format($papersize,$laystyle,$numberofcolumns);
-    my $assignment =  $ENV{'form.assignment'};
+    my $assignment =  $env{'form.assignment'};
     my $LaTeXwidth=&recalcto_mm($textwidth); 
     my @print_array=();
     my @student_names=();
@@ -843,10 +881,22 @@ ENDPART
     my %form;
     $form{'grade_target'} = 'tex';
     $form{'textwidth'}    = &get_textwidth($helper, $LaTeXwidth);
-    
+
+    # If form.showallfoils is set, then request all foils be shown:
+    # privilege will be enforced both by not allowing the 
+    # check box selecting this option to be presnt unless it's ok,
+    # and by lonresponse's priv. check.
+    # The if is here because lonresponse.pm only cares that
+    # showallfoils is defined, not what the value is.
+
+    if ($helper->{'VARS'}->{'showallfoils'} eq "1") { 
+	$form{'showallfoils'} = $helper->{'VARS'}->{'showallfoils'};
+    }
+
     if ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'current_document') {
       #-- single document - problem, page, html, xml, ...
 	my ($currentURL,$cleanURL);
+
 	if ($helper->{'VARS'}->{'construction'} ne '1') {
             #prints published resource
 	    $currentURL=$helper->{'VARS'}->{'postdata'};
@@ -866,8 +916,8 @@ ENDPART
 		$moreenv{'request.filename'}=$cleanURL;
 		if ($helper->{'VARS'}->{'style_file'}=~/\w/) {
 		    $moreenv{'construct.style'}=$helper->{'VARS'}->{'style_file'};
-		    my $dom = $ENV{'user.domain'};
-		    my $user = $ENV{'user.name'};
+		    my $dom = $env{'user.domain'};
+		    my $user = $env{'user.name'};
 		    my $put_result = &Apache::lonnet::put('environment',{'construct.style'=>$helper->{'VARS'}->{'style_file'}},$dom,$user);
 		}
                 if ($helper->{'VARS'}->{'probstatus'} eq 'exam') {$form{'problemtype'}='exam';}
@@ -883,6 +933,7 @@ ENDPART
 		&Apache::lonnet::appenv(%moreenv);
 		&Apache::lonnet::delenv('form.counter');
 		&Apache::lonxml::init_counter();
+		$resources_printed .= $currentURL.':';
 		$texversion.=&Apache::lonnet::ssi($currentURL,%form);
 		&Apache::lonnet::delenv('form.counter');
 		&Apache::lonnet::delenv('request.filename');
@@ -893,6 +944,7 @@ ENDPART
 		$form{'grade_target'}='answer';
 		$form{'answer_output_mode'}='tex';
 		$form{'rndseed'}=$rndseed;
+		$resources_printed .= $currentURL.':';
 		my $answer=&Apache::lonnet::ssi($currentURL,%form);
 		if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
 		    $texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
@@ -940,17 +992,21 @@ ENDPART
 			$form{'suppress_tries'}=$parmhash{'suppress_tries'};
 			$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
 			$form{'rndseed'}=$rndseed;
+			$resources_printed .=$urlp.':';
 			$texversion=&Apache::lonnet::ssi($urlp,%form);
 		    }
 		    if((($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
 		       ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) && 
 		       ($urlp=~/\.(problem|exam|quiz|assess|survey|form|library|page)$/)) {
-			$form{'grade_target'}='answer';
-			$form{'answer_output_mode'}='tex';
-			$form{'rndseed'}=$rndseed;
-			$form{'problem_split'}=$parmhash{'problem_stream_switch'};
-                        if ($urlp=~/\/res\//) {$ENV{'request.state'}='published';}
-			my $answer=&Apache::lonnet::ssi($urlp,%form);
+			#  Don't permanently modify %$form...
+			my %answerform = %form;
+			$answerform{'grade_target'}='answer';
+			$answerform{'answer_output_mode'}='tex';
+			$answerform{'rndseed'}=$rndseed;
+			$answerform{'problem_split'}=$parmhash{'problem_stream_switch'};
+                        if ($urlp=~/\/res\//) {$env{'request.state'}='published';}
+			$resources_printed .= $urlp.':';
+			my $answer=&Apache::lonnet::ssi($urlp,%answerform);
 			if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
 			    $texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
 			} else {
@@ -982,6 +1038,7 @@ ENDPART
 	} elsif ($cleanURL=~/\/(smppg|syllabus|aboutme|bulletinboard)$/) { 
 		$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
 		if ($currentURL=~/\/syllabus$/) {$currentURL=~s/\/res//;}
+		$resources_printed .= $currentURL.':';
 		my $texversion=&Apache::lonnet::ssi($currentURL,%form);
 		$result .= $texversion;
 	} else {
@@ -1012,10 +1069,6 @@ ENDPART
 	my $flag_latex_header_remove = 'NO';
 	my $flag_page_in_sequence = 'NO';
 	my @master_seq=split /\|\|\|/, $helper->{'VARS'}->{'RESOURCES'};
-	my %page_breaks;
-	foreach my $break (split /\|\|\|/, $helper->{'VARS'}->{'FINISHPAGE'}) {
-	    $page_breaks{$break} = 1;
-	}
 	my $prevassignment='';
 	&Apache::lonnet::delenv('form.counter');
 	&Apache::lonxml::init_counter();
@@ -1038,6 +1091,7 @@ ENDPART
 	    if ($i==0) {$prevassignment=$assignment;}
 	    my $texversion='';
 	    if ($urlp=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {
+		$resources_printed .= $urlp.':';
 		$texversion.=&Apache::lonnet::ssi($urlp,%form);
 		if ($urlp=~/\.page$/) {
 		    ($texversion,my $number_of_columns_page) = &page_cleanup($texversion);
@@ -1046,16 +1100,19 @@ ENDPART
 		    $flag_page_in_sequence = 'YES';
 		} 
 		my $lonidsdir=$r->dir_config('lonIDsDir');
-		my $envfile=$ENV{'user.environment'};
+		my $envfile=$env{'user.environment'};
 		$envfile=~/\/([^\/]+)\.id$/;
 		$envfile=$1;
 		&Apache::lonnet::transfer_profile_to_env($lonidsdir,$envfile);
-		my $current_counter=$ENV{'form.counter'};
+		my $current_counter=$env{'form.counter'};
 		if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
 		   ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) {
-		    $form{'grade_target'}='answer';
-		    $form{'answer_output_mode'}='tex';
-		    my $answer=&Apache::lonnet::ssi($urlp,%form);
+		    #  Don't permanently pervert the %form hash
+		    my %answerform = %form;
+		    $answerform{'grade_target'}='answer';
+		    $answerform{'answer_output_mode'}='tex';
+		    $resources_printed .= $urlp.':';
+		    my $answer=&Apache::lonnet::ssi($urlp,%answerform);
 		    &Apache::lonnet::appenv(('form.counter' => $current_counter));
 		    if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
 			$texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
@@ -1090,6 +1147,7 @@ ENDPART
 	    } elsif ($urlp=~/\/(smppg|syllabus|aboutme|bulletinboard)$/) { 
 		$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
 		if ($urlp=~/\/syllabus$/) {$urlp=~s/\/res//;}
+		$resources_printed .= $urlp.':';
 		my $texversion=&Apache::lonnet::ssi($urlp,%form);
 		if ($flag_latex_header_remove ne 'NO') {
 		    $texversion = &latex_header_footer_remove($texversion);
@@ -1152,23 +1210,25 @@ ENDPART
 	 $moreenv{'textwidth'}=&get_textwidth($helper,$LaTeXwidth);
 	 $moreenv{'print_discussions'}=$helper->{'VARS'}->{'PRINT_DISCUSSIONS'};
 	 $moreenv{'problem_split'}    = $parmhash{'problem_stream_switch'};
+	 $moreenv{'suppress_tries'}   = $parmhash{'suppress_tries'};
 	 if ($helper->{'VARS'}->{'PRINT_DISCUSSIONS'} eq 'yes') {$moreenv{'problem_split'}='yes';}
 	 my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Print Status','Class Print Status',$#students+1,'inline','75');
 	 my $student_counter=-1;
 	 foreach my $person (@students) {
 
-             my $duefile="/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout.due";
+             my $duefile="/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout.due";
 	     if (-e $duefile) {
 		 my $temp_file = Apache::File->new('>>'.$duefile);
 		 print $temp_file "1969\n";
 	     }
 	     $student_counter++;
 	     my $i=int($student_counter/$helper->{'VARS'}{'NUMBER_TO_PRINT'});
-	     my ($output,$fullname)=&print_resources($r,$helper,
+	     my ($output,$fullname, $printed)=&print_resources($r,$helper,
 						     $person,$type,
 						     \%moreenv,\@master_seq,
 						     $flag_latex_header_remove,
 						     $LaTeXwidth);
+	     $resources_printed .= ":";
 	     $print_array[$i].=$output;
 	     $student_names[$i].=$person.':'.$fullname.'_END_';
 	     &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,&mt('last student').' '.$fullname);
@@ -1179,8 +1239,8 @@ ENDPART
 	 $result .= $print_array[0].'  \end{document}';
      } elsif (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_anon')     ||
 	      ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'resources_for_anon')  ) { 
-	 my $cdom =$ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
-	 my $cnum =$ENV{'course.'.$ENV{'request.course.id'}.'.num'};
+	 my $cdom =$env{'course.'.$env{'request.course.id'}.'.domain'};
+	 my $cnum =$env{'course.'.$env{'request.course.id'}.'.num'};
 	 my $num_todo=$helper->{'VARS'}->{'NUMBER_TO_PRINT_TOTAL'};
 	 my $code_name=$helper->{'VARS'}->{'ANON_CODE_STORAGE_NAME'};
 	 my $old_name=$helper->{'VARS'}->{'REUSE_OLD_CODES'};
@@ -1217,10 +1277,11 @@ ENDPART
 	 foreach my $code (sort(@allcodes)) {
 	     my $file_num=int($count/$number_per_page);
 	     $moreenv{'CODE'}=&num_to_letters($code);
-	     my ($output,$fullname)=
+	     my ($output,$fullname, $printed)=
 		 &print_resources($r,$helper,'anonymous',$type,\%moreenv,
 				  \@master_seq,$flag_latex_header_remove,
 				  $LaTeXwidth);
+	     $resources_printed .= ":";
 	     $print_array[$file_num].=$output;
 	     &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
 				       &mt('last assignment').' '.$fullname);
@@ -1251,14 +1312,18 @@ ENDPART
 		} else {
 		    $urlp =~ s|^$Apache::lonnet::perlvar{'lonDocRoot'}||;
 		}
+		$resources_printed .= $urlp.':';
 		my $texversion=&Apache::lonnet::ssi($urlp,%form);
 		if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
 		   ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) {
-		    $form{'grade_target'}='answer';
-		    $form{'answer_output_mode'}='tex';
-		    $form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
-		    $form{'rndseed'}=$rndseed;
-		    my $answer=&Apache::lonnet::ssi($urlp,%form);
+		    #  Don't permanently pervert %form:
+		    my %answerform = %form;
+		    $answerform{'grade_target'}='answer';
+		    $answerform{'answer_output_mode'}='tex';
+		    $answerform{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
+		    $answerform{'rndseed'}=$rndseed;
+		    $resources_printed .= $urlp.':';
+		    my $answer=&Apache::lonnet::ssi($urlp,%answerform);
 		    if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
 			$texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
 		    } else {
@@ -1310,10 +1375,11 @@ ENDPART
 	$result =~ s/\\evensidemargin\s*=\s*-?\d*\.?\d*\s*(cm|mm|in)/\\evensidemargin= $helper->{'VARS'}->{'pagesize.lmargin'} $helper->{'VARS'}->{'pagesize.lmarginunit'} /;
 	$result =~ s/\\oddsidemargin\s*=\s*-?\d*\.?\d*\s*(cm|mm|in)/\\oddsidemargin= $helper->{'VARS'}->{'pagesize.lmargin'} $helper->{'VARS'}->{'pagesize.lmarginunit'} /;
     }
+
 #-- writing .tex file in prtspool 
     my $temp_file;
     my $identifier = &Apache::loncommon::get_cgi_id();
-    my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout_".$identifier.".tex";
+    my $filename = "/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout_$identifier.tex";
     if (!($#print_array>0)) { 
 	unless ($temp_file = Apache::File->new('>'.$filename)) {
 	    $r->log_error("Couldn't open $filename for output $!");
@@ -1336,7 +1402,8 @@ ENDPART
 	    my $temp_file;
 	    my $newfilename=$filename;
 	    my $num=$i+1;
-	    $newfilename =~s/\.tex$/_$num\.tex/; 
+	    $newfilename =~s/\.tex$//; 
+	    $newfilename=sprintf("%s_%03d.tex",$newfilename, $num);
 	    unless ($temp_file = Apache::File->new('>'.$newfilename)) {
 		$r->log_error("Couldn't open $newfilename for output $!");
 		return SERVER_ERROR; 
@@ -1353,9 +1420,9 @@ ENDPART
 	if ($#student_names>-1) {
 	    $student_names=$student_names[0].'_ENDPERSON_';
 	} else {
-	    my $fullname = &get_name($ENV{'user.name'},$ENV{'user.domain'});
-	    $student_names=join(':',$ENV{'user.name'},$ENV{'user.domain'},
-				$ENV{'request.course.sec'},$fullname).
+	    my $fullname = &get_name($env{'user.name'},$env{'user.domain'});
+	    $student_names=join(':',$env{'user.name'},$env{'user.domain'},
+				$env{'request.course.sec'},$fullname).
 				    '_ENDPERSON_'.'_END_';
 	}
     }
@@ -1372,19 +1439,27 @@ ENDPART
 	    $URLback=~s|^/~|/priv/|;
 	}
     }
-
+    # logic for now is too complex to trace if this has been defined
+    #  yet.
+    my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+    my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     &Apache::lonnet::appenv('cgi.'.$identifier.'.file'   => $filename,
                             'cgi.'.$identifier.'.layout'  => $laystyle,
                             'cgi.'.$identifier.'.numcol'  => $numberofcolumns,
 			    'cgi.'.$identifier.'.paper'  => $papersize,
                             'cgi.'.$identifier.'.selection' => $selectionmade,
-			    'cgi.'.$identifier.'tableofcontents' => $helper->{'VARS'}->{'TABLE_CONTENTS'},
-			    'cgi.'.$identifier.'tableofindex' => $helper->{'VARS'}->{'TABLE_INDEX'},
-			    'cgi.'.$identifier.'role' => $ENV{'request.role.adv'},
-                            'cgi.'.$identifier.'numberoffiles' => $#print_array,
-                            'cgi.'.$identifier.'studentnames' => $student_names,
-                            'cgi.'.$identifier.'backref' => $URLback,);
- 
+			    'cgi.'.$identifier.'.tableofcontents' => $helper->{'VARS'}->{'TABLE_CONTENTS'},
+			    'cgi.'.$identifier.'.tableofindex' => $helper->{'VARS'}->{'TABLE_INDEX'},
+			    'cgi.'.$identifier.'.role' => $env{'request.role.adv'},
+                            'cgi.'.$identifier.'.numberoffiles' => $#print_array,
+                            'cgi.'.$identifier.'.studentnames' => $student_names,
+                            'cgi.'.$identifier.'.backref' => $URLback,);
+    &Apache::lonnet::appenv("cgi.$identifier.user"    => $env{'user.name'},
+			    "cgi.$identifier.domain"  => $env{'user.domain'},
+			    "cgi.$identifier.courseid" => $cnum, 
+			    "cgi.$identifier.coursedom" => $cdom, 
+			    "cgi.$identifier.resources" => $resources_printed);
+
 $r->print(<<FINALEND);
 <br />
 <meta http-equiv="Refresh" content="0; url=/cgi-bin/printout.pl?$identifier" />
@@ -1420,6 +1495,7 @@ sub print_resources {
     my ($r,$helper,$person,$type,$moreenv,$master_seq,$remove_latex_header,
 	$LaTeXwidth)=@_;
     my $current_output = ''; 
+    my $printed = '';
     my ($username,$userdomain,$usersection) = split /:/,$person;
     my $fullname = &get_name($username,$userdomain);
     my $namepostfix;
@@ -1427,15 +1503,14 @@ sub print_resources {
 	$namepostfix="\\\\Name: ";
 	$fullname = "CODE - ".$moreenv->{'CODE'};
     }
-    my %page_breaks;
-    foreach my $break (split /\|\|\|/,$helper->{'VARS'}->{'FINISHPAGE'}) {
-	$page_breaks{$break} = 1;
-    }
     my $i           = 0;
     #goes through all resources, checks if they are available for 
     #current student, and produces output   
     &Apache::lonnet::delenv('form.counter');
     &Apache::lonxml::init_counter();
+
+    my %page_breaks  = &get_page_breaks($helper);
+
     foreach my $curresline (@{$master_seq})  {
 	if (defined $page_breaks{$curresline}) {
 	    if($i != 0) {
@@ -1448,18 +1523,21 @@ sub print_resources {
 	    my ($map,$id,$res_url) = &Apache::lonnet::decode_symb($curresline);
 	    if (&Apache::lonnet::allowed('bre',$res_url)) {
 		if ($res_url=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {
-		    my $rendered = &Apache::loncommon::get_student_view($curresline,$username,$userdomain,$ENV{'request.course.id'},'tex',$moreenv);
+		    $printed .= $curresline.':';
+		    my $rendered = &Apache::loncommon::get_student_view($curresline,$username,$userdomain,$env{'request.course.id'},'tex',$moreenv);
 		    my $lonidsdir=$r->dir_config('lonIDsDir');
-		    my $envfile=$ENV{'user.environment'};
+		    my $envfile=$env{'user.environment'};
 		    $envfile=~/\/([^\/]+)\.id$/;
 		    $envfile=$1;
 		    &Apache::lonnet::transfer_profile_to_env($lonidsdir,$envfile);
-		    my $current_counter=$ENV{'form.counter'};
+		    my $current_counter=$env{'form.counter'};
 		    if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
 		       ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) {
-			$moreenv->{'answer_output_mode'}='tex';
-			$moreenv->{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
-			my $ansrendered = &Apache::loncommon::get_student_answers($curresline,$username,$userdomain,$ENV{'request.course.id'},%{$moreenv});
+			#   Use a copy of the hash so we don't pervert it on future loop passes.
+			my %answerenv = %{$moreenv};
+			$answerenv{'answer_output_mode'}='tex';
+			$answerenv{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
+			my $ansrendered = &Apache::loncommon::get_student_answers($curresline,$username,$userdomain,$env{'request.course.id'},%answerenv);
 			&Apache::lonnet::appenv(('form.counter' => $current_counter));
 			if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
 			    $rendered=~s/(\\keephidden{ENDOFPROBLEM})/$ansrendered$1/;
@@ -1477,13 +1555,14 @@ sub print_resources {
 		    }
 		    $current_output .= $rendered;		    
 		} elsif ($res_url=~/\/(smppg|syllabus|aboutme|bulletinboard)$/) {
-		    my $rendered = &Apache::loncommon::get_student_view($curresline,$username,$userdomain,$ENV{'request.course.id'},'tex',$moreenv);
+		    $printed .= $curresline.':';
+		    my $rendered = &Apache::loncommon::get_student_view($curresline,$username,$userdomain,$env{'request.course.id'},'tex',$moreenv);
 		    my $lonidsdir=$r->dir_config('lonIDsDir');
-		    my $envfile=$ENV{'user.environment'};
+		    my $envfile=$env{'user.environment'};
 		    $envfile=~/\/([^\/]+)\.id$/;
 		    $envfile=$1;
 		    &Apache::lonnet::transfer_profile_to_env($lonidsdir,$envfile);
-		    my $current_counter=$ENV{'form.counter'};
+		    my $current_counter=$env{'form.counter'};
 		    if ($remove_latex_header eq 'YES') {
 			$rendered = &latex_header_footer_remove($rendered);
 		    } else {
@@ -1515,7 +1594,7 @@ sub print_resources {
 	for (my $j=0;$j<$helper->{'VARS'}->{'EMPTY_PAGES'};$j++) {$blankpages.='\clearpage\strut\clearpage';}
 	$current_output = '\strut\vspace*{-6 mm}\\newline\\noindent\\makebox[\\textwidth/$number_of_columns][b]{\\hrulefill}\vspace*{-2 mm}\\newline\\noindent{\\tiny Printed from LON-CAPA\\copyright MSU{\\hfill} Licensed under GNU General Public License }\\newpage '.$blankpages.'\setcounter{page}{1}\noindent\parbox{\minipagewidth}{\noindent\\lhead{\\textit{\\textbf{'.$fullname.'}}'.$courseidinfo.' \\hfill \\thepage \\\\ \\textit{'.$currentassignment.'}'.$namepostfix.'}} \vskip 5 mm '.$current_output;
     }
-    return ($current_output,$fullname);
+    return ($current_output,$fullname, $printed);
 
 }
 
@@ -1528,7 +1607,7 @@ sub handler {
 #    if ($loaderror) { return $loaderror; }
 #    $loaderror=
 #       &Apache::lonnet::overloaderror($r,
-#         $ENV{'course.'.$ENV{'request.course.id'}.'.home'});
+#         $env{'course.'.$env{'request.course.id'}.'.home'});
 #    if ($loaderror) { return $loaderror; }
 
     my $result = printHelper($r);
@@ -1541,12 +1620,12 @@ sub handler {
 #	foreach $key (keys %{$helper->{'VARS'}}) {
 #	    $r->print(' '.$key.'->'.$helper->{'VARS'}->{$key}.'<-<br />');
 #	}
-#	foreach $key (keys %ENV) {
-#	    $r->print(' '.$key.'->'.$ENV{$key}.'<-<br />');
+#	foreach $key (keys %env) {
+#	    $r->print(' '.$key.'->'.$env{$key}.'<-<br />');
 #	}
 #	return OK;
 
-    my %parmhash=&Apache::lonnet::coursedescription($ENV{'request.course.id'});
+    my %parmhash=&Apache::lonnet::coursedescription($env{'request.course.id'});
  
 #	my $key; 
 #	foreach $key (keys %parmhash) {
@@ -1555,7 +1634,14 @@ sub handler {
 #
 
 
-			 
+    #  If a figure conversion queue file exists for this user.domain
+    # we delete it since it can only be bad (if it were good, printout.pl
+    # would have deleted it the last time around.
+
+    my $conversion_queuefile = "/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout.dat";
+    if(-e $conversion_queuefile) {
+	unlink $conversion_queuefile;
+    }
     &output_data($r,$helper,\%parmhash);
     return OK;
 } 
@@ -1575,7 +1661,7 @@ sub printHelper {
     my $r = shift;
 
     if ($r->header_only) {
-        if ($ENV{'browser.mathml'}) {
+        if ($env{'browser.mathml'}) {
             &Apache::loncommon::content_type($r,'text/xml');
         } else {
             &Apache::loncommon::content_type($r,'text/html');
@@ -1585,7 +1671,7 @@ sub printHelper {
     }
 
     # Send header, nocache
-    if ($ENV{'browser.mathml'}) {
+    if ($env{'browser.mathml'}) {
         &Apache::loncommon::content_type($r,'text/xml');
     } else {
         &Apache::loncommon::content_type($r,'text/html');
@@ -1609,29 +1695,51 @@ sub printHelper {
     $helper->declareVar('assignment');
     $helper->declareVar('style_file');
     $helper->declareVar('student_sort');
+    $helper->declareVar('FINISHPAGE');
+    $helper->declareVar('PRINT_TYPE');
+    $helper->declareVar("showallfoils");
+
+    #  The page breaks can get loaded initially from the course environment:
+
+    if((!defined($env{"form.CURRENT_STATE"}))  ||
+       ($env{'form.CURRENT_STATE'} == "START")) {
+	$helper->{VARS}->{FINISHPAGE} = ""; # In case they did a back e.g.
+    }
+
+
+    
+    &Apache::loncommon::restore_course_settings('print',
+						{'pagebreaks'  => 'scalar',
+					         'lastprinttype' => 'scalar'});
+
+    
+    if("$helper->{VARS}->{PRINT_TYPE}" eq "$env{'form.lastprinttype'}") {
+	$helper->{VARS}->{FINISHPAGE} = $env{'form.pagebreaks'};
+    }
+    
     
     # This will persistently load in the data we want from the
     # very first screen.
     # Detect whether we're coming from construction space
-    if ($ENV{'form.postdata'}=~/^(?:http:\/\/[^\/]+\/|\/|)\~([^\/]+)\/(.*)$/) {
+    if ($env{'form.postdata'}=~/^(?:http:\/\/[^\/]+\/|\/|)\~([^\/]+)\/(.*)$/) {
         $helper->{VARS}->{'filename'} = "~$1/$2";
         $helper->{VARS}->{'construction'} = 1;
     } else {
-        if ($ENV{'form.postdata'}) {
-            $helper->{VARS}->{'symb'} = &Apache::lonnet::symbread($ENV{'form.postdata'});
+        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.symb'}) {
+            $helper->{VARS}->{'symb'} = $env{'form.symb'};
         }
-        if ($ENV{'form.url'}) {
+        if ($env{'form.url'}) {
             $helper->{VARS}->{'symb'} = &Apache::lonnet::symbread($helper->{VARS}->{'postdata'});
         }
     }
 
-    if ($ENV{'form.symb'}) {
-        $helper->{VARS}->{'symb'} = $ENV{'form.symb'};
+    if ($env{'form.symb'}) {
+        $helper->{VARS}->{'symb'} = $env{'form.symb'};
     }
-    if ($ENV{'form.url'}) {
+    if ($env{'form.url'}) {
         $helper->{VARS}->{'symb'} = &Apache::lonnet::symbread($helper->{VARS}->{'postdata'});
 
     }
@@ -1663,17 +1771,17 @@ sub printHelper {
         }
         $subdir = &Apache::lonnet::filelocation("", $url);
     }
-    if (!$helper->{VARS}->{'curseed'} && $ENV{'form.curseed'}) {
-	$helper->{VARS}->{'curseed'}=$ENV{'form.curseed'};
+    if (!$helper->{VARS}->{'curseed'} && $env{'form.curseed'}) {
+	$helper->{VARS}->{'curseed'}=$env{'form.curseed'};
     }
-    if (!$helper->{VARS}->{'probstatus'} && $ENV{'form.problemtype'}) {
-	$helper->{VARS}->{'probstatus'}=$ENV{'form.problemtype'};
+    if (!$helper->{VARS}->{'probstatus'} && $env{'form.problemtype'}) {
+	$helper->{VARS}->{'probstatus'}=$env{'form.problemtype'};
     }
 
     my $userCanSeeHidden = Apache::lonnavmaps::advancedUser();
-    my $userPriviledged = ($ENV{'request.role'}=~m/^cc\./ or
-			   $ENV{'request.role'}=~m/^in\./ or
-			   $ENV{'request.role'}=~m/^ta\./);
+    my $userPriviledged = ($env{'request.role'}=~m/^cc\./ or
+			   $env{'request.role'}=~m/^in\./ or
+			   $env{'request.role'}=~m/^ta\./);
 
     Apache::lonhelper::registerHelperTags();
 
@@ -1716,8 +1824,8 @@ sub printHelper {
     $helper->declareVar('SEQUENCE');
 
     # Useful for debugging: Dump the help vars
-    #$r->print(Dumper($helper->{VARS}));
-    #$r->print($map);
+#    $r->print(Dumper($helper->{VARS}));
+#    $r->print($map);
 
     # If we're in a sequence...
     if (($helper->{'VARS'}->{'construction'} ne '1') &&
@@ -1783,7 +1891,6 @@ HELPERFRAGMENT
               suppressEmptySequences='0' addstatus='1' closeallpages='1'>
       <nextstate>PAGESIZE</nextstate>
       <filterfunc>return $isNotMap; </filterfunc>
-      <mapurl> $map</mapursl>
       <valuefunc>return $symbFilter;</valuefunc>
       <option text='NewPage' variable='FINISHPAGE' />
     </resource>
@@ -1816,7 +1923,7 @@ RESOURCE_SELECTOR
 
         &Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_STUDENTS);
   <state name="CHOOSE_STUDENTS" title="Select Students and Resources">
-      <student multichoice='1' variable="STUDENTS" nextstate="PAGESIZE" />
+      <student multichoice='1' variable="STUDENTS" nextstate="PAGESIZE" coursepersonnel="1"/>
       <message><b>Select sort order</b> </message>
     <choices variable='student_sort'>
       <choice computer='0'>Sort by section then student</choice>
@@ -1826,8 +1933,8 @@ RESOURCE_SELECTOR
   </state>
 CHOOSE_STUDENTS
 
-	my $cdom = $ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
-	my $cnum = $ENV{'course.'.$ENV{'request.course.id'}.'.num'};
+	my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+	my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
         my @names=&Apache::lonnet::getkeys('CODEs',$cdom,$cnum);
 	my $namechoice='<choice></choice>';
 	foreach my $name (sort {uc($a) cmp uc($b)} @names) {
@@ -1892,7 +1999,7 @@ RESOURCE_SELECTOR
 
 	&Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_STUDENTS1);
   <state name="CHOOSE_STUDENTS1" title="Select Students and Resources">
-    <student multichoice='1' variable="STUDENTS" nextstate="PAGESIZE" />
+    <student multichoice='1' variable="STUDENTS" nextstate="PAGESIZE" coursepersonnel="1" />
     <choices variable='student_sort'>
       <choice computer='0'>Sort by section then student</choice>
       <choice computer='1'>Sort by students across sections.</choice>
@@ -1932,7 +2039,7 @@ CHOOSE_ANON2
     }
 
     # 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)/)) or defined $helper->{'VARS'}->{'construction'}) and $ENV{'request.role.adv'} and $subdir ne $Apache::lonnet::perlvar{'lonDocRoot'}.'/res/') {    
+    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'} and $subdir ne $Apache::lonnet::perlvar{'lonDocRoot'}.'/res/') {    
         push @{$printChoices}, ["<b>".&mt('Problems')."</b> ".&mt('from current subdirectory')." <b><i>$subdir</i></b>", 'problems_from_directory', 'CHOOSE_FROM_SUBDIR'];
 
         my $f = '$filename';
@@ -1996,14 +2103,13 @@ CHOOSE_FROM_ANY_SEQUENCE
     Apache::lonhelper::message->new();
     $paramHash = Apache::lonhelper::getParamHash();
     $paramHash->{'variable'} = 'PRINT_TYPE';
-    $helper->declareVar('PRINT_TYPE');
     $paramHash->{CHOICES} = $printChoices;
     Apache::lonhelper::choices->new();
 
     my $startedTable = 0; # have we started an HTML table yet? (need
                           # to close it later)
 
-    if (($ENV{'request.role.adv'} and &Apache::lonnet::allowed('vgr',$ENV{'request.course.id'})) or 
+    if (($env{'request.role.adv'} and &Apache::lonnet::allowed('vgr',$env{'request.course.id'})) or 
 	($helper->{VARS}->{'construction'} eq '1')) {
 	addMessage("<hr width='33%' /><table><tr><td align='right'>Print: </td><td>");
         $paramHash = Apache::lonhelper::getParamHash();
@@ -2012,15 +2118,14 @@ CHOOSE_FROM_ANY_SEQUENCE
         $paramHash->{CHOICES} = [
                                    ['Without Answers', 'yes'],
                                    ['With Answers', 'no'],
-                                   ['Only Answers', 'only'],
-                                   ['As Exam Problem', 'exam']
+                                   ['Only Answers', 'only']
                                 ];
         Apache::lonhelper::dropdown->new();
 	addMessage("</td></tr>");
 	$startedTable = 1;
     }
 
-    if ($ENV{'request.role.adv'}) {
+    if ($env{'request.role.adv'}) {
 	if (!$startedTable) {
 	    addMessage("<hr width='33%' /><table><tr><td align='right'>LaTeX mode: </td><td>");
 	    $startedTable = 1;
@@ -2070,10 +2175,24 @@ CHOOSE_FROM_ANY_SEQUENCE
 				     ['Yes', 'yes'] ];
 	    Apache::lonhelper::dropdown->new();
 	    addMessage("</td></tr>");
+
+            #  If advanced roles, then allow to show all foils.
+
+            if ($env{'request.role.adv'}) {
+		addMessage("<tr><td align = 'right'>  </td><td>");
+		$paramHash = Apache::lonhelper::getParamHash();
+		$paramHash->{'multichoice'} = "true";
+		$paramHash->{'allowempty'}  = "true";
+		$paramHash->{'variable'}   = "showallfoils";
+		$paramHash->{'CHOICES'} = [ ["Show all foils", "1"] ];
+		Apache::lonhelper::choices->new();
+		addMessage("</td></tr>");
+            }
+
 	}
 
 	if ($helper->{'VARS'}->{'construction'}) { 
-	    my $stylevalue=$ENV{'construct.style'};
+	    my $stylevalue=$env{'construct.style'};
 	    my $xmlfrag .= <<"RNDSEED";
 	    <message><tr><td align='right'>Use random seed:  </td><td></message>
 	    <string variable="curseed" size="15" maxlength="15">
@@ -2082,12 +2201,17 @@ CHOOSE_FROM_ANY_SEQUENCE
 	        </defaultvalue>
 	    </string>
 	     <message></td></tr><tr><td align="right">Use style file:</td><td></message>
-             <message><input type="text" size="40" name="style_file_value" value="$stylevalue"  />&nbsp; <a href="javascript:openbrowser('helpform','style_file','sty')">Select style file</a> </td><td></message>
-             <message></td></tr></message>
+             <message><input type="text" size="40" name="style_file_value" value="$stylevalue"  />&nbsp; <a href="javascript:openbrowser('helpform','style_file','sty')">Select style file</a> </td><tr><td></message>
+	     <choices allowempty="1" multichoice="true" variable="showallfoils">
+                <choice computer="1">Show all foils?</choice>
+             </choices>
+	     <message></td></tr></message>
 RNDSEED
             &Apache::lonxml::xmlparse($r, 'helper', $xmlfrag);
-	    $helper->{'VARS'}->{'style_file'}=$ENV{'form.style_file_value'};
-	}
+	    $helper->{'VARS'}->{'style_file'}=$env{'form.style_file_value'};
+	    
+	} 
+
     }
 
 
@@ -2154,12 +2278,16 @@ no strict;
 @ISA = ("Apache::lonhelper::element");
 use strict;
 use Apache::lonlocal;
+use Apache::lonnet;
 
 my $maxColumns = 2;
+# it'd be nice if these all worked
+#my @paperSize = ("letter [8 1/2x11 in]", "legal [8 1/2x14 in]", 
+#                 "tabloid (ledger) [11x17 in]", "executive [7 1/2x10 in]",
+#                 "a2 [420x594 mm]", "a3 [297x420 mm]", "a4 [210x297 mm]", 
+#                 "a5 [148x210 mm]", "a6 [105x148 mm]" );
 my @paperSize = ("letter [8 1/2x11 in]", "legal [8 1/2x14 in]", 
-                 "tabloid (ledger) [11x17 in]", "executive [7 1/2x10 in]",
-                 "a2 [420x594 mm]", "a3 [297x420 mm]", "a4 [210x297 mm]", 
-                 "a5 [148x210 mm]", "a6 [105x148 mm]" );
+		 "a4 [210x297 mm]");
 
 # Tentative format: Orientation (L = Landscape, P = portrait) | Colnum |
 #                   Paper type
@@ -2195,8 +2323,8 @@ sub render {
   </tr>
   <tr>
     <td>
-      <input type="radio" name="${var}.layout" value="L" /> Landscape<br />
-      <input type="radio" name="${var}.layout" value="P" checked='1'  /> Portrait
+      <label><input type="radio" name="${var}.layout" value="L" /> Landscape </label><br />
+      <label><input type="radio" name="${var}.layout" value="P" checked='1'  /> Portrait </label>
     </td>
     <td align="center">
       <select name="${var}.cols">
@@ -2214,7 +2342,7 @@ STATEHTML
     $result .= "</select></td><td>\n";
     $result .= "<select name='${var}.paper'>\n";
 
-    my %parmhash=&Apache::lonnet::coursedescription($ENV{'request.course.id'});
+    my %parmhash=&Apache::lonnet::coursedescription($env{'request.course.id'});
     my $DefaultPaperSize=$parmhash{'default_paper_size'};
     if ($DefaultPaperSize eq '') {$DefaultPaperSize='letter';}
     $i = 0;
@@ -2238,8 +2366,8 @@ sub postprocess {
     my $var = $self->{'variable'};
     my $helper = Apache::lonhelper->getHelper();
     $helper->{VARS}->{$var} = 
-        $ENV{"form.$var.layout"} . '|' . $ENV{"form.$var.cols"} . '|' .
-        $ENV{"form.$var.paper"};
+        $env{"form.$var.layout"} . '|' . $env{"form.$var.cols"} . '|' .
+        $env{"form.$var.paper"};
     return 1;
 }
 
@@ -2269,7 +2397,7 @@ is no tag interface. You actually pass p
 =cut
 
 use Apache::lonhelper;
-
+use Apache::lonnet;
 no strict;
 @ISA = ("Apache::lonhelper::element");
 use strict;
@@ -2367,12 +2495,12 @@ sub postprocess {
 
     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 $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 = '';