--- loncom/interface/lonprintout.pm	2007/01/22 10:38:32	1.496
+++ loncom/interface/lonprintout.pm	2007/04/20 20:13:58	1.498
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.496 2007/01/22 10:38:32 foxr Exp $
+# $Id: lonprintout.pm,v 1.498 2007/04/20 20:13:58 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -48,6 +48,34 @@ 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);
+    #
+    # fetch if needed:
+    #
+    if (! -e $filename) {
+	my $repcopy_result = &Apache::lonnet::repcopy($filename);
+
+	if ($repcopy_result ne 'ok') {
+	    return "File open failed for $filename";   # This will bomb the print.
+	}
+    }
+    my $contents = &Apache::lonnet::readfile($filename);
+
+    return $contents;
+    
+}
+
 #
 #   printf_style_subst  item format_string repl
 #  
@@ -1455,6 +1483,13 @@ 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);
+
 	} else {
 	    $result.=&unsupported($currentURL,$helper->{'VARS'}->{'LATEX_TYPE'},
 				  $helper->{'VARS'}->{'symb'});
@@ -2798,7 +2833,10 @@ CHOOSE_FROM_ANY_SEQUENCE
 
     if (($perm{'pav'} 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>");
+	addMessage("<hr width='33%' /><table><tr><td align='right'>".
+                   '<label for="ANSWER_TYPE_forminput">'.
+                   &mt('Print').
+                   "</label>: </td><td>");
         $paramHash = Apache::lonhelper::getParamHash();
 	$paramHash->{'variable'} = 'ANSWER_TYPE';   
 	$helper->declareVar('ANSWER_TYPE');         
@@ -2814,10 +2852,16 @@ CHOOSE_FROM_ANY_SEQUENCE
 
     if ($perm{'pav'}) {
 	if (!$startedTable) {
-	    addMessage("<hr width='33%' /><table><tr><td align='right'>LaTeX mode: </td><td>");
+	    addMessage("<hr width='33%' /><table><tr><td align='right'>".
+                       '<label for="LATEX_TYPE_forminput">'.
+                       &mt('LaTeX mode').
+                       "</label>: </td><td>");
 	    $startedTable = 1;
 	} else {
-	    addMessage("<tr><td align='right'>LaTeX mode: </td><td>");
+	    addMessage("<tr><td align='right'>".
+                       '<label for="LATEX_TYPE_forminput">'.
+                        &mt('LaTeX mode').
+                       "</label>: </td><td>");
 	}
         $paramHash = Apache::lonhelper::getParamHash();
 	$paramHash->{'variable'} = 'LATEX_TYPE';   
@@ -2833,7 +2877,10 @@ CHOOSE_FROM_ANY_SEQUENCE
 	}
         Apache::lonhelper::dropdown->new();
  
-	addMessage("</td></tr><tr><td align='right'>Print Table of Contents: </td><td>");
+	addMessage("</td></tr><tr><td align='right'>".
+                   '<label="TABLE_CONTENTS_forminput">'.
+                   &mt('Print Table of Contents').
+                   "</label>: </td><td>");
         $paramHash = Apache::lonhelper::getParamHash();
 	$paramHash->{'variable'} = 'TABLE_CONTENTS';   
 	$helper->declareVar('TABLE_CONTENTS');         
@@ -2844,7 +2891,10 @@ CHOOSE_FROM_ANY_SEQUENCE
 	addMessage("</td></tr>");
         
 	if (not $helper->{VARS}->{'construction'}) {
-	    addMessage("<tr><td align='right'>Print Index: </td><td>");
+	    addMessage("<tr><td align='right'>".
+                       '<label for="TABLE_INDEX_forminput">'.
+                       &mt('Print Index').
+                       "</label>: </td><td>");
 	    $paramHash = Apache::lonhelper::getParamHash();
 	    $paramHash->{'variable'} = 'TABLE_INDEX';   
 	    $helper->declareVar('TABLE_INDEX');         
@@ -2853,7 +2903,10 @@ CHOOSE_FROM_ANY_SEQUENCE
 				     ['Yes', 'yes'] ];
 	    Apache::lonhelper::dropdown->new();
 	    addMessage("</td></tr>");
-	    addMessage("<tr><td align='right'>Print Discussions: </td><td>");
+	    addMessage("<tr><td align='right'>".
+                       '<label for="PRINT_DISCUSSIONS_forminput">'.
+                       &mt('Print Discussions').
+                       "</label>: </td><td>");
 	    $paramHash = Apache::lonhelper::getParamHash();
 	    $paramHash->{'variable'} = 'PRINT_DISCUSSIONS';   
 	    $helper->declareVar('PRINT_DISCUSSIONS');         
@@ -2875,14 +2928,21 @@ CHOOSE_FROM_ANY_SEQUENCE
 
 	if ($helper->{'VARS'}->{'construction'}) { 
 	    my $stylevalue=$env{'construct.style'};
+            my $randseedtext=&mt("Use random seed");
+            my $stylefiletext=&mt("Use style file");
+
 	    my $xmlfrag .= <<"RNDSEED";
-	    <message><tr><td align='right'>Use random seed:  </td><td></message>
+	    <message><tr><td align='right'>
+            <label for="curseed_forminput">$randseedtext</label>:
+            </td><td></message>
 	    <string variable="curseed" size="15" maxlength="15">
 		<defaultvalue>
 	            return $helper->{VARS}->{'curseed'};
 	        </defaultvalue>
 	    </string>
-	     <message></td></tr><tr><td align="right">Use style file:</td><td></message>
+	     <message></td></tr><tr><td align="right">
+             <label for="style_file_value">$stylefiletext</label>:
+             </td><td></message>
              <message><input type="text" size="40" name="style_file_value" value="$stylevalue"  />&nbsp; <a href="javascript:openbrowser('helpform','style_file_value','sty')">Select style file</a> </td><tr><td></message>
 	     <choices allowempty="1" multichoice="true" variable="showallfoils">
                 <choice computer="1">Show all foils?</choice>