--- loncom/interface/lonprintout.pm	2007/04/17 15:45:03	1.497
+++ loncom/interface/lonprintout.pm	2007/07/04 14:17:36	1.502
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.497 2007/04/17 15:45:03 www Exp $
+# $Id: lonprintout.pm,v 1.502 2007/07/04 14:17:36 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -48,6 +48,28 @@ my %perm;
 my %parmhash;
 my $resources_printed;
 
+# Fetch the contents of a resource, uninterpreted.
+# This is used here to fetch a latex file to be included
+# verbatim into the printout<
+# NOTE: Ask Guy if there is a lonnet function similar to this?
+#
+# Parameters:
+#   URL of the file
+#
+sub fetch_raw_resource {
+    my ($url) = @_;
+
+    my $filename  = &Apache::lonnet::filelocation("", $url);
+    my $contents  = &Apache::lonnet::getfile($filename);
+
+    if ($contents == -1) {
+	return "File open failed for $filename";      # This will bomb the print.
+    }
+    return $contents;
+
+    
+}
+
 #
 #   printf_style_subst  item format_string repl
 #  
@@ -845,7 +867,11 @@ sub page_format_transformation {
     my ($textwidth,$textheight,$oddoffset,$evenoffset,$topmargin);
 
     if ($selectionmade eq '4') {
-	$assignment='Problems from the Whole Course';
+	if ($choice eq 'all_problems') {
+	    $assignment='Problems from the Whole Course';
+	} else {
+	    $assignment='Resources from the Whole Course';
+	}
     } else {
 	$assignment=&Apache::lonxml::latex_special_symbols($assignment,'header');
     }
@@ -1265,6 +1291,7 @@ sub output_data {
     my ($r,$helper,$rparmhash) = @_;
     my %parmhash = %$rparmhash;
     $resources_printed = '';
+    my $do_postprocessing = 1;
     my $js = <<ENDPART;
 <script type="text/javascript">
     var editbrowser;
@@ -1455,6 +1482,14 @@ ENDPART
 		$resources_printed .= $currentURL.':';
 		my $texversion=&Apache::lonnet::ssi($currentURL,%form);
 		$result .= $texversion;
+	} elsif ($cleanURL =~/.tex$/) {
+	    # For this sort of print of a single LaTeX file,
+	    # We can just print the LaTeX file as it is uninterpreted in any way:
+	    #
+
+	    $result = &fetch_raw_resource($currentURL);
+	    $do_postprocessing = 0; # Don't massage the result.
+
 	} else {
 	    $result.=&unsupported($currentURL,$helper->{'VARS'}->{'LATEX_TYPE'},
 				  $helper->{'VARS'}->{'symb'});
@@ -1859,15 +1894,20 @@ ENDPART
 	$result .= '\end{document}';      	
     }
 #-------------------------------------------------------- corrections for the different page formats
-    $result = &page_format_transformation($papersize,$laystyle,$numberofcolumns,$helper->{'VARS'}->{'PRINT_TYPE'},$result,$helper->{VARS}->{'assignment'},$helper->{'VARS'}->{'TABLE_CONTENTS'},$helper->{'VARS'}->{'TABLE_INDEX'},$selectionmade);
-    $result = &latex_corrections($number_of_columns,$result,$selectionmade,
-				 $helper->{'VARS'}->{'ANSWER_TYPE'});
-    #if ($numberofcolumns == 1) {
+
+    # Only post process if that has not been turned off e.g. by a raw latex resource.
+
+    if ($do_postprocessing) {
+	$result = &page_format_transformation($papersize,$laystyle,$numberofcolumns,$helper->{'VARS'}->{'PRINT_TYPE'},$result,$helper->{VARS}->{'assignment'},$helper->{'VARS'}->{'TABLE_CONTENTS'},$helper->{'VARS'}->{'TABLE_INDEX'},$selectionmade);
+	$result = &latex_corrections($number_of_columns,$result,$selectionmade,
+				     $helper->{'VARS'}->{'ANSWER_TYPE'});
+	#if ($numberofcolumns == 1) {
 	$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'} /;
-    #}
+	#}
+    }
 
 #-- writing .tex file in prtspool 
     my $temp_file;
@@ -2565,7 +2605,7 @@ CHOOSE_STUDENTS
        </validator>
     </string>
     <message></td></tr><tr><td></message>
-    <message><b>Names to store the CODEs under for later:</b></message>
+    <message><b>Names to save the CODEs under for later:</b></message>
     <message></td><td></message>
     <string variable="ANON_CODE_STORAGE_NAME" maxlength="50" size="20" />
     <message></td></tr><tr><td></message>
@@ -2676,7 +2716,7 @@ CHOOSE_STUDENTS1
        </validator>
     </string>
     <message></td></tr><tr><td></message>
-    <message><b>Names to store the CODEs under for later:</b></message>
+    <message><b>Names to save the CODEs under for later:</b></message>
     <message></td><td></message>
     <string variable="ANON_CODE_STORAGE_NAME" maxlength="50" size="20" />
     <message></td></tr><tr><td></message>