--- loncom/interface/lonprintout.pm	2006/05/30 12:46:09	1.439
+++ loncom/interface/lonprintout.pm	2006/06/30 01:06:22	1.448
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.439 2006/05/30 12:46:09 www Exp $
+# $Id: lonprintout.pm,v 1.448 2006/06/30 01:06:22 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -702,7 +702,8 @@ sub get_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');
+   #  $plainname=&Apache::lonxml::latex_special_symbols($plainname,'header');
+    $plainname = &escape_LaTeX($plainname);
     return $plainname;
 }
 
@@ -1672,14 +1673,12 @@ ENDPART
 			       $selectionmade, 
 			       $helper->{'VARS'}->{'ANSWER_TYPE'});
     }
-    &Apache::lonnet::logthis("Resetting page e.g. height -> $helper->{'VARS'}->{'pagesize.height'}");
-    &Apache::lonnet::logthis("Before: $result \n--------------------------\n");
+
     $result =~ s/\\textwidth\s*=\s*-?\d*\.?\d*\s*(cm|mm|in)/\\textwidth= $helper->{'VARS'}->{'pagesize.width'} $helper->{'VARS'}->{'pagesize.widthunit'} /;
     $result =~ s/\\textheight\s*=?\s*-?\d*\.?\d*\s*(cm|mm|in)/\\textheight $helper->{'VARS'}->{'pagesize.height'} $helper->{'VARS'}->{'pagesize.heightunit'} /;
     $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'} /;
 
-    &Apache::lonnet::logthis("After: $result \n----------------------------------\n");
 
 #-- writing .tex file in prtspool 
     my $temp_file;
@@ -1804,6 +1803,9 @@ sub print_resources {
 	$namepostfix="\\\\Name: ";
 	$fullname = "CODE - ".$moreenv->{'CODE'};
     }
+    #  Fullname may have special latex characters that need \ prefixing:
+    #
+
     my $i           = 0;
     #goes through all resources, checks if they are available for 
     #current student, and produces output   
@@ -1812,6 +1814,16 @@ sub print_resources {
     my %page_breaks  = &get_page_breaks($helper);
     my @format_array = split(/\|/,$helper->{'VARS'}->{'FORMAT'});
     my $columns_in_format = $format_array[1];
+    #
+    #   end each student with a 
+    #   Special that allows the post processor to even out the page
+    #   counts later.  Nasty problem this... it would be really
+    #   nice to put the special in as a postscript comment
+    #   e.g. \special{ps:\ENDOFSTUDENTSTAMP}  unfortunately,
+    #   The special gets passed the \ and dvips puts it in the output file
+    #   so we will just rely on prntout.pl to strip  ENDOFSTUDENTSTAMP from the
+    #   postscript.  Each ENDOFSTUDENTSTAMP will go on a line by itself.
+    #
 
     foreach my $curresline (@{$master_seq})  {
 	if (defined $page_breaks{$curresline}) {
@@ -1907,6 +1919,10 @@ sub print_resources {
 	   $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\\fancyhead[LO]{\\textit{\\textbf{'.$fullname.'}}'.$courseidinfo.' \\hfill \\thepage \\\\ \\textit{'.$currentassignment.'}'.$namepostfix.'}} \vskip 5 mm '.$current_output;
 	}
     }
+    #
+    #  Close the student bracketing.
+    #
+    $current_output .= "\n\\special{ps:ENDOFSTUDENTSTAMP}\n";
     return ($current_output,$fullname, $printed);
 
 }
@@ -2298,10 +2314,16 @@ CHOOSE_STUDENTS
 	}
 	if (%codes_to_print) {
 	    $code_selection .='   
-             <exec>
-               push(@{$state->{CHOICES}},@{$helper->{DATA}{ALL_CODE_CHOICES}});
-            </exec>
+	    <message><b>Choose single code from list</b></message>
+		<message></td><td></message>
+		<choices variable="CODE_SELECTED_FROM_LIST" multichoice="0" allowempty="0">
+                  <exec>
+                     push(@{$state->{CHOICES}},@{$helper->{DATA}{ALL_CODE_CHOICES}});
+                  </exec>
+		</choices>
+	    <message></td></tr><tr><td colspan="2"><hr width=\'33%\' /></td></tr><tr><td></message>
             '.$/;
+
 	}
 
 	
@@ -2359,12 +2381,9 @@ CHOOSE_STUDENTS
         </validator>
     </string>
     <message></td></tr><tr><td colspan="2"><hr width='33%' /></td></tr><tr><td></message>
-    <message><b>Choose single code from list</b></message>
-    <message></td><td></message>
-    <choices variable="CODE_SELECTED_FROM_LIST" multichoice="0" allowempty="0">
         $code_selection
-    </choices>
-    <message></td></tr><tr><td colspan="2"><hr width='33%' /></td></tr><tr><td></message>
+
+    
     <message><b>Reprint a set of saved CODEs:</b></message>
     <message></td><td></message>
     <dropdown variable="REUSE_OLD_CODES">
@@ -2470,12 +2489,7 @@ CHOOSE_STUDENTS1
         </validator>
     </string>
     <message></td></tr><tr><td colspan="2"><hr width='33%' /></td></tr><tr><td></message>
-    <message><b>Choose single code from list</b></message>
-    <message></td><td></message>
-    <dropdown variable="CODE_SELECTED_FROM_LIST" multichoice="0" allowempty="0">
         $code_selection
-    </dropdown>
-    <message></td></tr><tr><td colspan="2"><hr width='33%' /></td></tr><tr><td></message>
     <message><b>Reprint a set of saved CODEs:</b></message>
     <message></td><td></message>
     <dropdown variable="REUSE_OLD_CODES">