--- loncom/interface/lonprintout.pm 2025/01/16 06:01:09 1.627.2.32.2.8
+++ loncom/interface/lonprintout.pm 2025/01/15 23:10:25 1.706
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Printout
#
-# $Id: lonprintout.pm,v 1.627.2.32.2.8 2025/01/16 06:01:09 raeburn Exp $
+# $Id: lonprintout.pm,v 1.706 2025/01/15 23:10:25 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -906,7 +906,6 @@ sub master_seq_to_person_seq {
# Only process resources..that are not removed by randomout...
# and are selected for printint as well.
#
-
if (ref($curres) && ! $curres->randomout()) {
my $currsymb = $curres->symb();
if (exists($seq_hash{$currsymb})) {
@@ -981,7 +980,8 @@ sub set_font_size {
if ($font_size ne '') {
$text =~ s/\\begin\{document}/\\begin{document}{\\$font_size/;
- $text =~ s/\\end\{document}/}\\end{document}/;
+ $text =~ s/\\end\{document}/}\\end{document}/;
+
}
return $text;
@@ -1198,7 +1198,7 @@ sub format_page_header {
$width = &recalcto_mm($width); # Get width in mm.
- my $chars_per_line = int($width/2); # Character/textline.
+ my $chars_per_line = int($width/1.6); # Character/textline.
# Default format?
@@ -1214,35 +1214,35 @@ sub format_page_header {
# - Allow the assignment to be 2 lines (wrapped).
#
- my $firstline = "$student $course";
- if (length($firstline) > $chars_per_line) {
- my $lastchar = $chars_per_line - length($student) - 1;
- if ($lastchar > 0) {
- $course = substr($course, 0, $lastchar);
- } else { # Nothing left of course:
- $course = '';
- }
- }
- if (length($assignment) > $chars_per_line) {
- $assignment = substr($assignment, 0, $chars_per_line);
- }
+
- $format = "\\textbf{$student} $course \\hfill \\thepage \\\\ \\textit{$assignment}";
+ my $name_length = int($chars_per_line *3 /4);
+ my $sec_length = int($chars_per_line / 5);
+
+ $format = "%$name_length".'n';
+
+ if ($section) {
+ $format .= ' - Sec: '."%$sec_length".'s';
+ }
+ $format .= '\\hfill\\thepage';
+
+ $format .= '\\\\%c \\\\ %a';
- } else {
- # An open question is how to handle long user formatted page headers...
- # A possible future is to support e.g. %na so that the user can control
- # the truncation of the elements that can appear in the header.
- #
- $format = &printf_style_subst("a", $format, $assignment);
- $format = &printf_style_subst("c", $format, $course);
- $format = &printf_style_subst("n", $format, $student);
-
- # If the user put %'s in the format string, they must be escaped
- # to \% else LaTeX will think they are comments and terminate
- # the line.. which is bad!!!
}
+ # An open question is how to handle long user formatted page headers...
+ # A possible future is to support e.g. %na so that the user can control
+ # the truncation of the elements that can appear in the header.
+ #
+ $format = &printf_style_subst("a", $format, $assignment);
+ $format = &printf_style_subst("c", $format, $course);
+ $format = &printf_style_subst("n", $format, $student);
+ $format = &printf_style_subst("s", $format, $section);
+
+
+ # If the user put %'s in the format string, they must be escaped
+ # 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
@@ -1251,9 +1251,6 @@ sub format_page_header {
my $testPrintout = '\\\\'.&mt('Authoring Space').' \\\\'.&mt('Test-Printout ');
$format =~ s/\\\\\s\\\\\s/$testPrintout/;
}
-
- return $format;
-
#
# We're going to trust LaTeX to break lines appropriately, but
# we'll truncate anything that's more than 3 lines worth of
@@ -1982,6 +1979,8 @@ sub get_course {
my $courseidinfo;
if (defined($env{'request.course.id'})) {
$courseidinfo = &Apache::lonxml::latex_special_symbols(&unescape($env{'course.'.$env{'request.course.id'}.'.description'}),'header');
+ my $sec = $env{'request.course.sec'};
+
}
return $courseidinfo;
}
@@ -2002,7 +2001,6 @@ sub page_format_transformation {
}
($textwidth,$textheight,$oddoffset,$evenoffset,$topmargin) = &page_format($papersize,$layout,$numberofcolumns,$topmargin);
-
my $name;
if ($mostrecent ne '') {
$name = $mostrecent;
@@ -2010,7 +2008,6 @@ sub page_format_transformation {
$name = &get_name();
}
my $courseidinfo = &get_course();
- if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }
my $header_text = $parmhash{'print_header_format'};
$header_text = &format_page_header($textwidth, $header_text, $assignment,
$courseidinfo, $name);
@@ -2019,9 +2016,9 @@ sub page_format_transformation {
my $fancypagestatement='';
if ($numberofcolumns eq '2') {
$fancypagestatement="\\fancyhead{}\\fancyhead[LO]{$header_text}";
- if ($parmhash{'print_header_format'} eq '') {
- $fancypagestatement .= "\\fancyhead[RE]{\\thepage \\\\}";
- }
+ if ($parmhash{'print_header_format'} eq '') {
+ $fancypagestatement .= "\\fancyhead[RE]{\\thepage \\\\[\\baselineskip]}";
+ }
} else {
$fancypagestatement="\\rhead{}\\chead{}\\lhead{$header_text}";
}
@@ -2348,7 +2345,7 @@ sub print_page_in_course {
$form{'grade_target'} = 'tex';
$form{'textwidth'} = &get_textwidth($helper, $LaTeXwidth);
- $form{'pdfFormFields'} = 'no'; #
+ $form{'pdfFormFields'} = $pdfFormFields; #
$form{'showallfoils'} = $helper->{'VARS'}->{'showallfoils'};
$form{'problem_split'}=$parmhash{'problem_stream_switch'};
@@ -2405,8 +2402,8 @@ sub print_page_in_course {
$texversion.=&path_to_problem($urlp,$LaTeXwidth);
}
$texversion.='\vskip 1 mm '.$answer.'\end{document}';
- }
- }
+ }
+ }
# Print annotations.
@@ -2880,7 +2877,7 @@ ENDPART
my %form;
$form{'grade_target'} = 'tex';
$form{'textwidth'} = &get_textwidth($helper, $LaTeXwidth);
- $form{'pdfFormFields'} = 'no';
+ $form{'pdfFormFields'} = $pdfFormFields;
# If form.showallfoils is set, then request all foils be shown:
# privilege will be enforced both by not allowing the
@@ -2986,7 +2983,7 @@ ENDPART
}
-
+
}
@@ -3204,7 +3201,6 @@ ENDPART
if (($selectionmade == 4) and ($assignment ne $prevassignment)) {
my $name = &get_name();
my $courseidinfo = &get_course();
- if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }
$prevassignment=$assignment;
my $header_text = $parmhash{'print_header_format'};
$header_text = &format_page_header($textwidth, $header_text,
@@ -3857,8 +3853,6 @@ sub print_resources {
my $assignment;
my $courseidinfo = &get_course();
my $possprint = scalar(@{$master_seq});
- if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }
- if ($usersection ne '') {$courseidinfo.=' - Sec. '.$usersection}
foreach my $curresline (@{$master_seq}) {
if (defined $page_breaks{$curresline}) {
@@ -4013,7 +4007,7 @@ sub print_resources {
$message = &mt('No incomplete resources');
}
if ($message) {
- $current_output = &encapsulate_minipage("\\vskip -10mm \n$message\n \\vskip 100 mm { }\n",$moreenv->{'problem_split'});
+ $current_output = &encapsulate_minipage("\\vskip -10mm \n$message\n \\vskip 100 mm { }\n",$moreenv->{'problem_split'});
}
if ($remove_latex_header eq "NO") {
$current_output = &print_latex_header() . $current_output;
@@ -4027,13 +4021,13 @@ sub print_resources {
}
my $currentassignment=&Apache::lonxml::latex_special_symbols($helper->{VARS}->{'assignment'},'header');
my $header_line =
- &format_page_header($LaTeXwidth, $parmhash{'print_header_format'},
- $currentassignment, $courseidinfo, $fullname, $usersection);
+ &format_page_header($LaTeXwidth, $parmhash{'print_header_format'},
+ $currentassignment, $courseidinfo, $fullname, $usersection);
my $header_start = ($columns_in_format == 1) ? '\lhead' : '\fancyhead[LO]';
my $newheader = $header_start.'{'.$header_line.'}';
-
if ($current_output=~/\\documentclass/) {
$current_output =~ s/\\begin\{document}/\\setlength{\\topmargin}{1cm} \\begin{document}\\noindent\\parbox{\\minipagewidth}{\\noindent$newheader$namepostfix}\\vskip 5 mm /;
+
} else {
my $blankpages =
'\clearpage\strut\clearpage'x$helper->{'VARS'}->{'EMPTY_PAGES'};
@@ -4042,6 +4036,7 @@ sub print_resources {
©right_line().' \newpage '.$blankpages.$end_of_student.
'\setcounter{page}{1}\noindent\parbox{\minipagewidth}{\noindent'.
$newheader.$namepostfix. '} \vskip 5 mm '.$current_output;
+
}
#
# Close the student bracketing.
@@ -4108,7 +4103,6 @@ sub handler {
unlink $conversion_queuefile;
}
-
&output_data($r,$helper,\%parmhash);
return OK;
}
@@ -4299,7 +4293,6 @@ sub printHelper {
}
if ($sequenceTitle ne '') {$helper->{VARS}->{'assignment'}=$sequenceTitle;}
-
# Extract map
my $symb = $helper->{VARS}->{'symb'};
my ($map, $id, $url);
@@ -4342,7 +4335,7 @@ sub printHelper {
if (ref($navmap)) {
my $res;
if ($symb ne '') {
- $res = $navmap->getBySymb($symb);
+ $res = $navmap->getBySymb($symb);
} elsif ($map ne '') {
$res = $navmap->getResourceByUrl($map);
}
@@ -4792,15 +4785,15 @@ CHOOSE_ANON2
}
# FIXME: That RE should come from a library somewhere.
- if (($perm{'pav'}
- && ($subdir ne '')
+ if (($perm{'pav'}
+ && ($subdir ne '')
&& $subdir ne $Apache::lonnet::perlvar{'lonDocRoot'}.'/res/'
&& (defined($helper->{'VARS'}->{'construction'})
||
(&Apache::lonnet::allowed('bre',$subdir) eq 'F'
- &&
+ &&
$helper->{VARS}->{'postdata'}=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)/)
- ))
+ ))
&& $helper->{VARS}->{'assignment'} eq ""
) {
my $pretty_dir = &Apache::lonnet::hreflocation($subdir);
@@ -5038,9 +5031,9 @@ CHOOSE_FROM_ANY_SEQUENCE
if ($noprintmsg) {
$paramHash = Apache::lonhelper::getParamHash();
- $paramHash->{MESSAGE_TEXT} =
+ $paramHash->{MESSAGE_TEXT} =
''.$noprintmsg.'
';
- Apache::lonhelper::message->new();
+ Apache::lonhelper::message->new();
}
}
$paramHash = Apache::lonhelper::getParamHash();
@@ -5055,7 +5048,7 @@ CHOOSE_FROM_ANY_SEQUENCE
my $startedTable = 0; # have we started an HTML table yet? (need
# to close it later)
- if (($perm{'pav'} and $perm{'vgr'}) or
+ if (($perm{'pav'} and $perm{'vgr'}) or
($helper->{VARS}->{'construction'} eq '1')) {
&addMessage(''.&mt('Print Options').' '
@@ -5265,7 +5258,7 @@ FONT_SELECTION
return "$helper->{VARS}->{'probstatus'}";
Homework Problem
- Exam Problem
+ Bubblesheet Exam Problem
Survey question
,choice computer="anonsurvey"Anonymous survey question
@@ -5383,6 +5376,9 @@ sub render {
my $PaperType=&mt('Paper type');
my $landscape=&mt('Landscape');
my $portrait=&mt('Portrait');
+ my $pdfFormLabel=&mt('PDF Form Fields');
+ my $with=&mt('with Form Fields');
+ my $without=&mt('without Form Fields');
$result.=''.&mt('Layout Options').' '
@@ -5391,6 +5387,7 @@ sub render {
.''.$PageLayout.' '
.''.$NumberOfColumns.' '
.''.$PaperType.' '
+ .''.$pdfFormLabel.' '
.&Apache::loncommon::end_data_table_header_row()
.&Apache::loncommon::start_data_table_row()
.''
@@ -5431,6 +5428,12 @@ sub render {
$result .= <
+
+
+ $without
+ $with
+
+
HTML
$result.=&Apache::loncommon::end_data_table_row()
.&Apache::loncommon::end_data_table();