--- loncom/interface/lonprintout.pm	2006/06/12 11:19:02	1.441
+++ loncom/interface/lonprintout.pm	2006/06/26 22:16:06	1.446
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.441 2006/06/12 11:19:02 foxr Exp $
+# $Id: lonprintout.pm,v 1.446 2006/06/26 22:16:06 foxr 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,12 @@ sub print_resources {
 	$namepostfix="\\\\Name: ";
 	$fullname = "CODE - ".$moreenv->{'CODE'};
     }
+    #  Fullname may have special latex characters that need \ prefixing:
+    #
+#    &Apache::lonnet::logthis("Prior to latex escape: $fullname");
+#    $fullname = &escape_LaTeX($fullname);
+#    &Apache::lonnet::logthis("After escape $fullname");
+
     my $i           = 0;
     #goes through all resources, checks if they are available for 
     #current student, and produces output   
@@ -1920,7 +1925,7 @@ sub print_resources {
     #
     #  Close the student bracketing.
     #
-    $current_output .= "\\special{ps:\nENDOFSTUDENTSTAMP\n}";
+    $current_output .= "\n\\special{ps:ENDOFSTUDENTSTAMP}\n";
     return ($current_output,$fullname, $printed);
 
 }
@@ -2543,7 +2548,7 @@ CHOOSE_FROM_SUBDIR
       <nextstate>CHOOSE_FROM_ANY_SEQUENCE</nextstate>
       <filterfunc>return \$res->is_sequence;</filterfunc>
       <valuefunc>return $urlValue;</valuefunc>
-      <choicefunc>return \$res->hasResource(\$res,sub { return !\$_[0]->is_sequence() },0,0);
+      <choicefunc>return \$res->hasResource(\$res,sub { return !\$_[0]->is_sequence() },1,0);
 	</choicefunc>
       </resource>
     </state>