--- loncom/interface/lonprintout.pm	2008/08/25 10:16:27	1.537
+++ loncom/interface/lonprintout.pm	2008/09/23 11:57:58	1.542
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.537 2008/08/25 10:16:27 foxr Exp $
+# $Id: lonprintout.pm,v 1.542 2008/09/23 11:57:58 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -280,6 +280,13 @@ sub format_page_header {
     # to \% else LaTeX will think they are comments and terminate
     # the line.. which is bad!!!
     
+    # If the user has role author, $course and $assignment are empty so
+    # there is '\\ \\ ' in the page header. That's cause a error in LaTeX
+    if($format =~ /\\\\\s\\\\\s/) {
+        #TODO find sensible caption for page header
+        my $testPrintout = '\\\\'.&mt('Construction Space').' \\\\'.&mt('Test-Printout ');
+        $format =~ s/\\\\\s\\\\\s/$testPrintout/;
+    }
     
 
     return $format;
@@ -385,8 +392,8 @@ sub is_valid_alpha_code {
 sub is_code_valid {
     my ($code_value, $code_option) = @_;
     my ($code_type, $code_length) = ('letter', 6);	# defaults.
-    open(FG, $Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab');
-    foreach my $line (<FG>) {
+    my @lines = &Apache::grades::get_scantronformat_file();
+    foreach my $line (@lines) {
 	my ($name, $type, $length) = (split(/:/, $line))[0,2,4];
 	if($name eq $code_option) {
 	    $code_length = $length;
@@ -1474,7 +1481,7 @@ ENDPART
     my ($result,$selectionmade) = ('','');
     my $number_of_columns = 1; #used only for pages to determine the width of the cell
     my @temporary_array=split /\|/,$format_from_helper;
-    my ($laystyle,$numberofcolumns,$papersize)=@temporary_array;
+    my ($laystyle,$numberofcolumns,$papersize,$pdfFormFields)=@temporary_array;
     if ($laystyle eq 'L') {
 	$laystyle='album';
     } else {
@@ -1495,6 +1502,7 @@ ENDPART
     my %form;
     $form{'grade_target'} = 'tex';
     $form{'textwidth'}    = &get_textwidth($helper, $LaTeXwidth);
+    $form{'pdfFormFields'} = $pdfFormFields;
 
     # If form.showallfoils is set, then request all foils be shown:
     # privilege will be enforced both by not allowing the 
@@ -1934,9 +1942,9 @@ ENDPART
 	 my $selected_code = $helper->{'VARS'}->{'CODE_SELECTED_FROM_LIST'};
 
 	 my $code_option=$helper->{'VARS'}->{'CODE_OPTION'};
-	 open(FH,$Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab');
+         my @lines = &Apache::grades::get_scantronformat_file();
 	 my ($code_type,$code_length)=('letter',6);
-	 foreach my $line (<FH>) {
+	 foreach my $line (@lines) {
 	     my ($name,$type,$length) = (split(/:/,$line))[0,2,4];
 	     if ($name eq $code_option) {
 		 $code_length=$length;
@@ -2639,9 +2647,9 @@ sub printHelper {
     }
 
     # Useful filter strings
-    my $isProblem = '($res->is_problem()||$res->contains_problem) ';
+    my $isProblem = '($res->is_problem()||$res->contains_problem||$res->is_practice()) ';
     $isProblem .= ' && !$res->randomout()' if !$userCanSeeHidden;
-    my $isProblemOrMap = '$res->is_problem() || $res->contains_problem() || $res->is_sequence()';
+    my $isProblemOrMap = '$res->is_problem() || $res->contains_problem() || $res->is_sequence() || $res->is_practice()';
     my $isNotMap = '!$res->is_sequence()';
     $isNotMap .= ' && !$res->randomout()' if !$userCanSeeHidden;
     my $isMap = '$res->is_map()';
@@ -2852,10 +2860,9 @@ CHOOSE_STUDENTS
 
 	}
 
-	
-	open(FH,$Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab');
+        my @lines = &Apache::grades::get_scantronformat_file();
 	my $codechoice='';
-	foreach my $line (<FH>) {
+	foreach my $line (@lines) {
 	    my ($name,$description,$code_type,$code_length)=
 		(split(/:/,$line))[0,1,2,4];
 	    if ($code_length > 0 && 
@@ -3386,6 +3393,9 @@ 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 .= <<STATEHTML;
 
 <hr width="33%" />
@@ -3394,6 +3404,7 @@ sub render {
     <td align="center"><b>$PageLayout</b></td>
     <td align="center"><b>$NumberOfColumns</b></td>
     <td align="center"><b>$PaperType</b></td>
+    <td align="center"><b>$pdfFormLabel</b></td>
   </tr>
   <tr>
     <td>
@@ -3431,7 +3442,18 @@ STATEHTML
         }
         $i++;
     }
-    $result .= "</select></td></tr></table>";
+    $result .= <<HTML;
+        </select>
+    </td>
+    <td align='center'>
+        <select name='${var}.pdfFormFields'>
+            <option selected value='no'>$without</option>
+            <option value='yes'>$with</option>
+        </select>
+    </td>
+  </tr></table>
+HTML
+
     return $result;
 }
 
@@ -3442,7 +3464,7 @@ sub postprocess {
     my $helper = Apache::lonhelper->getHelper();
     $helper->{VARS}->{$var} = 
         $env{"form.$var.layout"} . '|' . $env{"form.$var.cols"} . '|' .
-        $env{"form.$var.paper"};
+        $env{"form.$var.paper"} . '|' . $env{"form.$var.pdfFormFields"};
     return 1;
 }