--- loncom/interface/lonprintout.pm	2002/11/18 14:35:25	1.89
+++ loncom/interface/lonprintout.pm	2002/11/20 17:26:52	1.93
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.89 2002/11/18 14:35:25 sakharuk Exp $
+# $Id: lonprintout.pm,v 1.93 2002/11/20 17:26:52 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -107,7 +107,7 @@ ENDMENUOUT6
     }
       my $subdirtoprint = &Apache::lonnet::filelocation("",$ENV{'form.url'});
       $subdirtoprint =~ s/\/[^\/]+$//;
-      if (&Apache::lonnet::allowed('bre',$subdirtoprint) eq 'F') {
+      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
@@ -165,6 +165,7 @@ sub sequence_content_menu {
 <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>
@@ -357,7 +358,12 @@ ENDDISHEADER
         } 
     }
     $r->print(<<ENDMENUOUT2);
-<br />
+<br />Number of blank pages to add: <select name="addedpages"><option selected>0</option>
+                                                              <option>1</option>
+                                                              <option>2</option>
+                                                              <option>3</option>
+                                    </select>
+<br /> 
 <input type="hidden" name="papersize" value="$ENV{'form.papersize'}">
 <input type="hidden" name="numberofstudents" value="$i">
 <input type="hidden" name="phase" value="three">
@@ -389,6 +395,7 @@ sub additional_print_menu {
 <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 />
@@ -443,19 +450,23 @@ ENDPART
     if ($choice eq 'Standard LaTeX output for current document') {
       #-- single document - problem, page, html, xml  
       $selectionmade = 1;
-      my %moreenv;
-      $moreenv{'form.grade_target'}='tex';
-      if (&Apache::lonnet::allowed('bre',$ENV{'form.url'})) {
+      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*$/) {
+        }
+        $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}You are trying to print eather sequence or something simular. Currently this option is not supported. Sorry for the inconvenience. Bye. Your current URL is '.$ENV{'form.url'}.' \end{document}'
       }
     } elsif ($choice eq 'Standard LaTeX output for the primary sequence' or 
              $choice eq 'Standard LaTeX output for whole primary sequence') {
@@ -573,7 +584,9 @@ ENDPART
 		my $courseidinfo = $ENV{'course.'.$ENV{'request.course.id'}.'.description'};
 		$current_output =~ s/\\begin{document}/\\setlength{\\topmargin}{1cm}\\setlength{\\headheight}{1cm}\\setlength{\\headsep}{0.5cm}\\pagestyle{myheadings}\\markboth{}{{$courseidinfo  - $assignment}}\\begin{document}\\noindent\\textit{\\textbf{$fullname}}\\vskip 3 mm /;
 	    } else {
-		$current_output = '\\vskip 3mm\\clearpage\\strut\\clearpage\setcounter{page}{1}\noindent\parbox{\minipagewidth}{\noindent\textit{\textbf{'.$fullname.'}}\hskip 1.4in } \vskip 5 mm '.$current_output;
+		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 } \\vskip 3mm'.$blanspages.'\setcounter{page}{1}\noindent\parbox{\minipagewidth}{\noindent\textit{\textbf{'.$fullname.'}}\hskip 1.4in } \vskip 5 mm '.$current_output;
 	    }
 	    $result .= $current_output;
 	    &Apache::lonnet::delenv('form.counter');
@@ -1161,7 +1174,7 @@ sub character_chart {
 sub page_format_transformation {
 	my ($papersize,$layout,$numberofcolumns,$choice,$text,$assignment) = @_; 
 	my ($textwidth,$textheight,$oddoffset,$evenoffset) = &page_format($papersize,$layout,$numberofcolumns);
-	my $courseidinfo = $ENV{'course.'.$ENV{'request.course.id'}.'.description'};
+	my $courseidinfo = $ENV{'course.'.$ENV{'request.course.id'}.'.description'};	
 	if ($layout eq 'CBI') {
 	    $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{$ENV{'environment.firstname'} $ENV{'environment.lastname'}}} \\hfill  $courseidinfo} \\vskip 5 mm /;
 	} elsif ($layout eq 'CAPA') {
@@ -1215,9 +1228,9 @@ sub latex_corrections {
 
     $result =~ s/\\includegraphics{/\\includegraphics\[width=\\minipagewidth\]{/g;
     $result =~ s/\$number_of_columns/$number_of_columns/g;
-    $result =~ s/(\\end{document})/\\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*)(\\newline\\noindent\\makebox\[\\textwidth\/$number_of_columns\]\[b\]{\\hrulefill})/$2$1/g;
-    $result =~ s/(\\end{longtable}\s*)\\newline/$1/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;
+    $result =~ s/(\\end{longtable}\s*)\\strut\\newline/$1/g;
 #-- LaTeX corrections     
     my $first_comment = index($result,'<!--',0);
     while ($first_comment != -1) {