--- loncom/interface/lonprintout.pm 2013/05/30 05:24:11 1.627.2.5
+++ loncom/interface/lonprintout.pm 2013/08/28 14:31:54 1.627.2.8
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Printout
#
-# $Id: lonprintout.pm,v 1.627.2.5 2013/05/30 05:24:11 raeburn Exp $
+# $Id: lonprintout.pm,v 1.627.2.8 2013/08/28 14:31:54 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1109,7 +1109,7 @@ sub format_page_header {
# 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 ');
+ my $testPrintout = '\\\\'.&mt('Authoring Space').' \\\\'.&mt('Test-Printout ');
$format =~ s/\\\\\s\\\\\s/$testPrintout/;
}
#
@@ -1231,6 +1231,7 @@ sub is_code_valid {
my ($code_type, $code_length) = ('letter', 6); # defaults.
my @lines = &Apache::grades::get_scantronformat_file();
foreach my $line (@lines) {
+ next if (($line =~ /^\#/) || ($line eq ''));
my ($name, $type, $length) = (split(/:/, $line))[0,2,4];
if($name eq $code_option) {
$code_length = $length;
@@ -2221,7 +2222,7 @@ sub print_page_in_course {
$texversion.=&path_to_problem($urlp,$LaTeXwidth);
} else {
$texversion.='\vskip 0 mm \noindent\textbf{'.
- &mt("Printing from Construction Space: No Title").'}\vskip 0 mm ';
+ &mt("Printing from Authoring Space: No Title").'}\vskip 0 mm ';
$texversion.=&path_to_problem($urlp,$LaTeXwidth);
}
$texversion.='\vskip 1 mm '.$answer.'\end{document}';
@@ -2802,7 +2803,7 @@ ENDPART
$texversion.=&path_to_problem($cleanURL,$LaTeXwidth);
} else {
$texversion.='\vskip 0 mm \noindent\textbf{'.
- &mt("Printing from Construction Space: No Title").'}\vskip 0 mm ';
+ &mt("Printing from Authoring Space: No Title").'}\vskip 0 mm ';
$texversion.=&path_to_problem($cleanURL,$LaTeXwidth);
}
@@ -3313,7 +3314,7 @@ ENDPART
$moreenv{'CODE'}=&num_to_letters($code);
}
my $actual_seq = \@master_seq;
- if ($randomorder) {
+ if ($randomorder || $randompick) {
$env{'form.CODE'} = $moreenv{'CODE'};
$actual_seq = master_seq_to_person_seq($map, \@master_seq,
undef,
@@ -3375,7 +3376,7 @@ ENDPART
$texversion.=&path_to_problem ($urlp,$LaTeXwidth);
} else {
$texversion.='\vskip 0 mm \noindent\textbf{'.
- &mt("Printing from Construction Space: No Title").'}\vskip 0 mm ';
+ &mt("Printing from Authoring Space: No Title").'}\vskip 0 mm ';
$texversion.=&path_to_problem ($urlp,$LaTeXwidth);
}
$texversion.='\vskip 1 mm '.$answer.'\end{document}';
@@ -4141,13 +4142,13 @@ sub printHelper {
my $start_new_option;
if ($perm{'pav'}) {
$start_new_option =
- "before selected').
+ "').
"' variable='FINISHPAGE' />".
- "before selected').
+ "').
"' variable='EXTRASPACE' type='text' />" .
"".
- "check for mm').
+ "').
"' variable='EXTRASPACE_UNITS' type='checkbox' />"
;
@@ -4312,7 +4313,7 @@ my $suffixXml = <