--- loncom/interface/lonprintout.pm	2009/11/30 11:03:07	1.566
+++ loncom/interface/lonprintout.pm	2010/03/26 20:01:36	1.568.2.2
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.566 2009/11/30 11:03:07 foxr Exp $
+# $Id: lonprintout.pm,v 1.568.2.2 2010/03/26 20:01:36 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1581,7 +1581,7 @@ sub print_page_in_course {
 
 	    $form{'grade_target'}  = 'tex';
 	    $form{'textwidth'}    = &get_textwidth($helper, $LaTeXwidth);
-	    $form{'pdfFormFiels'} = $pdfFormFields; # 
+	    $form{'pdfFormFields'} = 'no';
 	    $form{'showallfoils'} = $helper->{'VARS'}->{'showallfoils'};    
 	    
 	    $form{'problem_split'}=$parmhash{'problem_stream_switch'};
@@ -1972,7 +1972,7 @@ ENDPART
     my %form;
     $form{'grade_target'} = 'tex';
     $form{'textwidth'}    = &get_textwidth($helper, $LaTeXwidth);
-    $form{'pdfFormFields'} = $pdfFormFields;
+    $form{'pdfFormFields'} = 'no';
 
     # If form.showallfoils is set, then request all foils be shown:
     # privilege will be enforced both by not allowing the 
@@ -2119,8 +2119,7 @@ ENDPART
 		$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
 		if ($currentURL=~/\/syllabus$/) {$currentURL=~s/\/res//;}
 		$resources_printed .= $currentURL.':';
-		my $texversion = &print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
-		$texversion .= &ssi_with_retries($currentURL, $ssi_retry_count, %form);
+		my $texversion = &ssi_with_retries($currentURL, $ssi_retry_count, %form);
 		if ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes') {
 		    my $annotation = &annotate($currentURL);
 		    $texversion    =~ s/(\\end{document})/$annotation$1/;
@@ -2153,7 +2152,6 @@ ENDPART
 
        
 	} else {
-	    &Apache::lonnet::logthis("Unsupported type handler");
 	    $result.=&unsupported($currentURL,$helper->{'VARS'}->{'LATEX_TYPE'},
 				  $helper->{'VARS'}->{'symb'});
 	}
@@ -2303,8 +2301,7 @@ ENDPART
 		$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
 		if ($urlp=~/\/syllabus$/) {$urlp=~s/\/res//;}
 		$resources_printed .= $urlp.':';
-		my $texversion = &print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
-		$texversion .= &ssi_with_retries($urlp, $ssi_retry_count, %form);
+		my $texversion = &ssi_with_retries($urlp, $ssi_retry_count, %form);
 		if ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes') {
 		    my $annotation = &annotate($urlp);
 		    $texversion =~ s/(\\end{document)/$annotation$1/;
@@ -2808,7 +2805,7 @@ sub print_resources {
     #   so we will just rely on prntout.pl to strip  ENDOFSTUDENTSTAMP from the
     #   postscript.  Each ENDOFSTUDENTSTAMP will go on a line by itself.
     #
-
+    my $syllabus_first = 0;
     foreach my $curresline (@{$master_seq})  {
 	if (defined $page_breaks{$curresline}) {
 	    if($i != 0) {
@@ -2867,6 +2864,9 @@ sub print_resources {
 		    }
 		    $current_output .= $rendered;		    
 		} elsif ($res_url=~/\/(smppg|syllabus|aboutme|bulletinboard)$/) {
+		    if ($i == 1) {
+			$syllabus_first = 1;
+		    }
 		    $printed .= $curresline.':';
 		    my $rendered = &get_student_view_with_retries($curresline,$ssi_retry_count,$username,$userdomain,$env{'request.course.id'},'tex',$moreenv);
 		    if ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes') {
@@ -2911,8 +2911,11 @@ sub print_resources {
     my $header_start = ($columns_in_format == 1) ? '\lhead'
 	                                         : '\fancyhead[LO]';
     $header_line = $header_start.'{'.$header_line.'}';
-    if ($current_output=~/\\documentclass/) {
+    if ($current_output=~/\\documentclass/ && (!$syllabus_first)) {
 	$current_output =~ s/\\begin{document}/\\setlength{\\topmargin}{1cm} \\begin{document}\\noindent\\parbox{\\minipagewidth}{\\noindent$header_line$namepostfix}\\vskip 5 mm /;
+    } elsif ($syllabus_first) {
+
+	$current_output =~ s/\\\\ Last updated:/Last updated:/
     } else {
 	my $blankpages = 
 	    '\clearpage\strut\clearpage'x$helper->{'VARS'}->{'EMPTY_PAGES'};
@@ -3378,7 +3381,7 @@ ALL_PROBLEMS
 							  'multichoice="1" addstatus="1" closeallpages="1"',
 							  'RESOURCES', 
 							  'PRINT_FORMATTING',
-							  '',
+							  $map,
 							  $isProblem, '', $symbFilter,
 							  $start_new_option);
 	$resource_selector .=  <<RESOURCE_SELECTOR;
@@ -4027,9 +4030,6 @@ sub render {
     my $PaperType=&mt('Paper type');
     my $landscape=&mt('Landscape');
     my $portrait=&mt('Portrait');
-    my $pdfFormLabel=&mt('PDF-Formfields');
-    my $with=&mt('with Formfields');
-    my $without=&mt('without Formfields');
     
 
     $result.='<h3>'.&mt('Layout Options').'</h3>'
@@ -4038,7 +4038,6 @@ sub render {
             .'<th>'.$PageLayout.'</th>'
             .'<th>'.$NumberOfColumns.'</th>'
             .'<th>'.$PaperType.'</th>'
-            .'<th>'.$pdfFormLabel.'</th>'
             .&Apache::loncommon::end_data_table_header_row()
             .&Apache::loncommon::start_data_table_row()
     .'<td>'
@@ -4078,12 +4077,7 @@ sub render {
     }
     $result .= <<HTML;
         </select>
-    </td>
-    <td align='center'>
-        <select name='${var}.pdfFormFields'>
-            <option selected="selected" value="no">$without</option>
-            <option value="yes">$with</option>
-        </select>
+        <hidden name="${var}.pdfFormFields" value="no" />
     </td>
 HTML
     $result.=&Apache::loncommon::end_data_table_row()