loncom/interface/lonprintout.pm - diff

Return to lonprintout.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonprintout.pm between versions 1.627.2.32.2.4 and 1.695

version 1.627.2.32.2.4, 2023/01/17 23:02:49	version 1.695, 2024/10/16 17:48:08
Line 309 CHOOSE_STUDENTS	Line 309 CHOOSE_STUDENTS
# prompt_text - Text to use to prompt user.	# prompt_text - Text to use to prompt user.
# resource_options - Resource tag options e.g.	# resource_options - Resource tag options e.g.
# "multichoice='1', toponly='1', addstatus='1',	# "multichoice='1', toponly='1', addstatus='1',
# modallink='1'"	# modallink='1'"
# that control the selection and appearance of the	# that control the selection and appearance of the
# resource selector.	# resource selector.
# variable - Name of the variable to hold the choice	# variable - Name of the variable to hold the choice
Line 452 sub generate_common_choosers {	Line 452 sub generate_common_choosers {
my $randomly_ordered_warning =	my $randomly_ordered_warning =
&get_randomly_ordered_warning($helper, $map);	&get_randomly_ordered_warning($helper, $map);

# code for a few states used for printout launched from both	# code for a few states used for printout launched from both
# /adm/navmpas and from a resource by a privileged user:	# /adm/navmaps and from a resource by a privileged user:
# - To allow resources to be selected for printing.	# - To allow resources to be selected for printing.
# - To determine pagination between assignments.	# - To determine pagination between assignments.
# - To determine how many assignments should be bundled into a single PDF.	# - To determine how many assignments should be bundled into a single PDF.
Line 711 sub printable {	Line 711 sub printable {
# date for printing checks printstartdate param first, then, if not set,	# date for printing checks printstartdate param first, then, if not set,
# opendate param, then, if not set, contentopen param.	# opendate param, then, if not set, contentopen param.


sub get_print_dates {	sub get_print_dates {
my $res = shift;	my $res = shift;
my $partsref = $res->parts();	my $partsref = $res->parts();
Line 756 sub get_print_dates {	Line 755 sub get_print_dates {
# get_print_dates but namvaps::course_print_dates are gotten...and not converted	# get_print_dates but namvaps::course_print_dates are gotten...and not converted
# to times either.	# to times either.
#	#
# @param $res - Reference to a resource has from lonnvampas::resource.	# @param $res - Reference to a resource hash from lonnavmaps::resource.
#	#
# @return (opendate, closedate)	# @return (opendate, closedate)
#	#
Line 770 sub course_print_dates {	Line 769 sub course_print_dates {
my @close_dates;	my @close_dates;
my $navmap = $res->{NAV_MAP}; # Slightly OO dirty.	my $navmap = $res->{NAV_MAP}; # Slightly OO dirty.

# Don't bother looping over undefined or empty parts arraY;	# Don't bother looping over undefined or empty parts array;

if (@parts) {	if (@parts) {
foreach my $part (@parts) {	foreach my $part (@parts) {
Line 796 sub map_print_dates {	Line 795 sub map_print_dates {
my $navmap = $res->{NAV_MAP}; # slightly OO dirty.	my $navmap = $res->{NAV_MAP}; # slightly OO dirty.


# Don't bother looping over undefined or empty parts arraY;	# Don't bother looping over undefined or empty parts array;

if (@parts) {	if (@parts) {
foreach my $part (@parts) {	foreach my $part (@parts) {
Line 879 sub master_seq_to_person_seq {	Line 878 sub master_seq_to_person_seq {
}	}

my $navmap = Apache::lonnavmaps::navmap->new($username, $userdomain,	my $navmap = Apache::lonnavmaps::navmap->new($username, $userdomain,
$code,$unhidden);	$code, $unhidden);
my ($start,$finish);	my ($start,$finish);

if ($map) {	if ($map) {
Line 897 sub master_seq_to_person_seq {	Line 896 sub master_seq_to_person_seq {
my $iterator = $navmap->getIterator($start,$finish,{},1);	my $iterator = $navmap->getIterator($start,$finish,{},1);

# Iterate on the resource..select the items that are randomly selected	# Iterate on the resource..select the items that are randomly selected
# and that are in the seq_has. Presumably the iterator will take care	# and that are in the seq_hash. Presumably the iterator will take care
# of the random ordering part of the deal.	# of the random ordering part of the deal.
	#
my $curres;	my $curres;
while ($curres = $iterator->next()) {	while ($curres = $iterator->next()) {
#	#
# Only process resources..that are not removed by randomout...	# Only process resources..that are not removed by randomout...
# and are selected for printint as well.	# and are selected for printint as well.
#	#

if (ref($curres) && ! $curres->randomout()) {	if (ref($curres) && ! $curres->randomout()) {
my $currsymb = $curres->symb();	my $currsymb = $curres->symb();
if (exists($seq_hash{$currsymb})) {	if (exists($seq_hash{$currsymb})) {
Line 974 sub set_font_size {	Line 973 sub set_font_size {
my ($text) = @_;	my ($text) = @_;

# There appear to be cases where the font directive is empty.. in which	# There appear to be cases where the font directive is empty.. in which
# case the first substituion would insert a spurious \ oh happy day.	# case the first substitution would insert a spurious \ oh happy day.
# as this has been the cause of much mystery and hair pulling _sigh_	# as this has been the cause of much mystery and hair pulling _sigh_

if ($font_size ne '') {	if ($font_size ne '') {

$text =~ s/\\begin\{document}/\\begin{document}{\\$font_size/;	$text =~ s/\\begin\{document}/\\begin{document}{\\$font_size/;
$text =~ s/\\end\{document}/}\\end{document}/;	$text =~ s/\\end\{document}/}\\end{document}/;

}	}
return $text;	return $text;

Line 992 sub set_font_size {	Line 992 sub set_font_size {
# - The PDF, if necessary, is replicated.	# - The PDF, if necessary, is replicated.
# - The PDF is added to the list of files to convert to postscript (along with the images).	# - The PDF is added to the list of files to convert to postscript (along with the images).
# - The LaTeX is added to include the final converted postscript in the file as an included	# - The LaTeX is added to include the final converted postscript in the file as an included
# job. The assumption is that the includedpsheader.ps header will be included.	# job. The assumption is that the includepsheader.ps header will be included.
#	#
# Parameters:	# Parameters:
# pdf_uri - URI of the PDF file to include.	# pdf_uri - URI of the PDF file to include.
Line 1016 sub include_pdf {	Line 1016 sub include_pdf {
$file = &Apache::lonnet::filelocation('',$pdf_uri);	$file = &Apache::lonnet::filelocation('',$pdf_uri);
}	}

# The file isn ow replicated locally.. or it did not exist in the first place	# The file is now replicated locally ... or it did not exist in the first place
# (unlikely). If it did exist, add the pdf to the set of files/images that	# (unlikely). If it did exist, add the pdf to the set of files/images that
# need tob e converted for this print job:	# need to be converted for this print job:

my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'};	my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'};
$file =~ s{(.*)/res/}{$londocroot/res/};	$file =~ s{(.*)/res/}{$londocroot/res/};
Line 1155 sub printf_style_subst {	Line 1155 sub printf_style_subst {
if ($size ne "") {	if ($size ne "") {
$subst = substr($subst, 0, $size);	$subst = substr($subst, 0, $size);

# Here's a nice edge case.. supose the end of the	# Here's a nice edge case ... suppose the end of the
# substring is a \. In that case may have just	# substring is a \. In that case may have just
# chopped off a TeX escape... in that case, we append	# chopped off a TeX escape... in that case, we append
# " " for the trailing character, and let the field	# " " for the trailing character, and let the field
# spill over a bit (sigh).	# spill over a bit (sigh).
Line 1192 sub printf_style_subst {	Line 1192 sub printf_style_subst {
# %s - The section if it is supplied.	# %s - The section if it is supplied.
#	#
sub format_page_header {	sub format_page_header {
my ($width, $format, $assignment, $course, $student) = @_;	my ($width, $format, $assignment, $course, $student, $section) = @_;



$width = &recalcto_mm($width); # Get width in mm.	$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?	# Default format?

Line 1213 sub format_page_header {	Line 1213 sub format_page_header {
# - Allow the assignment to be 2 lines (wrapped).	# - 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);

} else {	$format = "%$name_length".'n';
# 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!!!

}	if ($section) {
	$format .= ' - Sec: '."%$sec_length".'s';
	}

return $format;	$format .= '\\\\%c \\\\ %a';


	}
	# 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	# 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	# there is '\\ \\ ' in the page header. That's cause a error in LaTeX
Line 1444 sub compare_names {	Line 1440 sub compare_names {
}	}

# Break the tie on the first name, but there are leading (possibly trailing	# Break the tie on the first name, but there are leading (possibly trailing
# whitespaces to get rid of first	# whitespaces to get rid of first)
#	#
$f1 =~ s/^\s+//; # Remove leading...	$f1 =~ s/^\s+//; # Remove leading...
$f1 =~ s/\s+$//; # Trailing spaces from first 1...	$f1 =~ s/\s+$//; # Trailing spaces from first 1...
Line 1477 sub latex_header_footer_remove {	Line 1473 sub latex_header_footer_remove {
#	#
sub encapsulate_minipage {	sub encapsulate_minipage {
my ($text,$problem_split) = @_;	my ($text,$problem_split) = @_;
if (!($problem.split =~ /yes/i)) {	if (!($problem_split =~ /yes/i)) {
$text = '\begin{minipage}{\textwidth}'.$text.'\end{minipage}';	$text = '\begin{minipage}{\textwidth}'.$text.'\end{minipage}';
}	}
return $text;	return $text;
Line 1865 my %page_formats=	Line 1861 my %page_formats=
('letter' => {	('letter' => {
'book' => {	'book' => {
'1' => [ '7.1 in','9.8 in', '-0.57 in','-0.57 in','0.275 in'],	'1' => [ '7.1 in','9.8 in', '-0.57 in','-0.57 in','0.275 in'],
'2' => ['3.66 in','9.8 in', '-0.57 in','-0.57 in','0.275 in']	'2' => ['3.66 in','9.8 in', '-0.57 in','-0.57 in','-0.4 in']
},	},
'album' => {	'album' => {
'1' => [ '8.8 in', '6.8 in','-0.55 in', '-0.55 in','0.394 in'],	'1' => [ '8.8 in', '6.8 in','-0.55 in', '-0.55 in','0.394 in'],
'2' => [ '4.8 in', '6.8 in','-0.5 in', '-1.0 in','3.5 in']	'2' => [ '4.8 in', '6.8 in','-0.5 in', '-1.0 in','3.25 in']
},	},
},	},
'legal' => {	'legal' => {
Line 1981 sub get_course {	Line 1977 sub get_course {
my $courseidinfo;	my $courseidinfo;
if (defined($env{'request.course.id'})) {	if (defined($env{'request.course.id'})) {
$courseidinfo = &Apache::lonxml::latex_special_symbols(&unescape($env{'course.'.$env{'request.course.id'}.'.description'}),'header');	$courseidinfo = &Apache::lonxml::latex_special_symbols(&unescape($env{'course.'.$env{'request.course.id'}.'.description'}),'header');
	my $sec = $env{'request.course.sec'};

}	}
return $courseidinfo;	return $courseidinfo;
}	}
Line 2003 sub page_format_transformation {	Line 2001 sub page_format_transformation {

my $name = &get_name();	my $name = &get_name();
my $courseidinfo = &get_course();	my $courseidinfo = &get_course();
if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }
my $header_text = $parmhash{'print_header_format'};	my $header_text = $parmhash{'print_header_format'};
$header_text = &format_page_header($textwidth, $header_text, $assignment,	$header_text = &format_page_header($textwidth, $header_text, $assignment,
$courseidinfo, $name);	$courseidinfo, $name);
Line 2215 sub unsupported {	Line 2212 sub unsupported {
}	}
if ($mode ne '') {$mode='\\'.$mode}	if ($mode ne '') {$mode='\\'.$mode}
my $result = &print_latex_header($mode);	my $result = &print_latex_header($mode);
if ($cleanURL=~m\|^(/adm/wrapper/)?ext/\|) {	if ($cleanURL=~m\|^(/adm/wrapper)?/ext/\|) {
$cleanURL=~s\|^(/adm/wrapper/)?ext/\|http://\|;	$cleanURL=~s\|^(/adm/wrapper)?/ext/\|http://\|;
$cleanURL=~s\|^http://https://\|https://\|;	$cleanURL=~s\|^http://https://\|https://\|;
if ($shown eq $currentURL) {	if ($shown eq $currentURL) {
$shown = &Apache::lonxml::latex_special_symbols($cleanURL);	$shown = &Apache::lonxml::latex_special_symbols($cleanURL);
Line 2228 sub unsupported {	Line 2225 sub unsupported {
if ($shown eq $currentURL) {	if ($shown eq $currentURL) {
$result.=&Apache::lonxml::latex_special_symbols($currentURL);	$result.=&Apache::lonxml::latex_special_symbols($currentURL);
} else {	} else {
$result.=$shown;	$result.=$shown;
}	}
}	}
$result.= '\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill} \end{document}';	$result.= '\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill} \end{document}';
Line 2300 sub print_page_in_course {	Line 2297 sub print_page_in_course {
} elsif ($resource->ext()) {	} elsif ($resource->ext()) {
$result.=&latex_header_footer_remove(&unsupported($current_url,$mode,$resource->symb));	$result.=&latex_header_footer_remove(&unsupported($current_url,$mode,$resource->symb));
} elsif ($resource_src =~ /\.(problem\|exam\|quiz\|assess\|survey\|form\|library\|xml\|html\|htm\|xhtml\|xhtm)$/) {	} elsif ($resource_src =~ /\.(problem\|exam\|quiz\|assess\|survey\|form\|library\|xml\|html\|htm\|xhtml\|xhtm)$/) {
# these resources go through the XML transformer:	# these resources go through the XML transformer:
$result .= &Apache::lonxml::latex_special_symbols($resource->title()) . '\\\\';	$result .= &Apache::lonxml::latex_special_symbols($resource->title()) . '\\\\';

my $urlp = &Apache::lonnet::clutter($resource_src);	my $urlp = &Apache::lonnet::clutter($resource_src);
Line 2314 sub print_page_in_course {	Line 2311 sub print_page_in_course {

$form{'grade_target'} = 'tex';	$form{'grade_target'} = 'tex';
$form{'textwidth'} = &get_textwidth($helper, $LaTeXwidth);	$form{'textwidth'} = &get_textwidth($helper, $LaTeXwidth);
$form{'pdfFormFields'} = 'no'; #	$form{'pdfFormFields'} = $pdfFormFields; #
$form{'showallfoils'} = $helper->{'VARS'}->{'showallfoils'};	$form{'showallfoils'} = $helper->{'VARS'}->{'showallfoils'};

$form{'problem_split'}=$parmhash{'problem_stream_switch'};	$form{'problem_split'}=$parmhash{'problem_stream_switch'};
Line 2535 sub load_skips {	Line 2532 sub load_skips {

my ($helper) = @_;	my ($helper) = @_;

# If this is the first time, unrap the resources and extra spaces:	# If this is the first time, unwrap the resources and extra spaces:

if (!$skips_loaded) {	if (!$skips_loaded) {
@extraspace = (split(/\\|\\|\\|/, $helper->{'VARS'}->{'EXTRASPACE'}));	@extraspace = (split(/\\|\\|\\|/, $helper->{'VARS'}->{'EXTRASPACE'}));
Line 2842 ENDPART	Line 2839 ENDPART
my @student_names=();	my @student_names=();


# Common settings for the %form has:	# Common settings for the %form hash:
# In some cases these settings get overriddent by specific cases, but the	# In some cases these settings get overridden by specific cases, but the
# settings are common enough to make it worthwhile factoring them out	# settings are common enough to make it worthwhile factoring them out
# here.	# here.
#	#
my %form;	my %form;
$form{'grade_target'} = 'tex';	$form{'grade_target'} = 'tex';
$form{'textwidth'} = &get_textwidth($helper, $LaTeXwidth);	$form{'textwidth'} = &get_textwidth($helper, $LaTeXwidth);
$form{'pdfFormFields'} = 'no';	$form{'pdfFormFields'} = $pdfFormFields;

# If form.showallfoils is set, then request all foils be shown:	# If form.showallfoils is set, then request all foils be shown:
# privilege will be enforced both by not allowing the	# privilege will be enforced both by not allowing the
Line 2989 ENDPART	Line 2986 ENDPART
$result = &print_latex_header() . $result;	$result = &print_latex_header() . $result;
}	}
# End construction space sequence.	# End construction space sequence.
} elsif ($cleanURL=~/\/(smppg\|syllabus\|aboutme\|bulletinboard)$/) {	} elsif ($cleanURL=~/\/(smppg\|syllabus\|aboutme\|bulletinboard\|ext\.tool)$/) {
$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};	$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
if ($currentURL=~/\/syllabus$/) {$currentURL=~s/\/res//;}	if ($currentURL=~/\/syllabus$/) {$currentURL=~s/\/res//;}
	if ($currentURL=~/\/ext\.tool$/) {$currentURL=~s/^\/adm\/wrapper//;}
$resources_printed .= $currentURL.':';	$resources_printed .= $currentURL.':';
my $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') {	if ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes') {
Line 3173 ENDPART	Line 3171 ENDPART
if (($selectionmade == 4) and ($assignment ne $prevassignment)) {	if (($selectionmade == 4) and ($assignment ne $prevassignment)) {
my $name = &get_name();	my $name = &get_name();
my $courseidinfo = &get_course();	my $courseidinfo = &get_course();
if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }
$prevassignment=$assignment;	$prevassignment=$assignment;
my $header_text = $parmhash{'print_header_format'};	my $header_text = $parmhash{'print_header_format'};
$header_text = &format_page_header($textwidth, $header_text,	$header_text = &format_page_header($textwidth, $header_text,
Line 3188 ENDPART	Line 3185 ENDPART
}	}
$result .= $texversion;	$result .= $texversion;
$flag_latex_header_remove = 'YES';	$flag_latex_header_remove = 'YES';
} elsif ($urlp=~/\/(smppg\|syllabus\|aboutme\|bulletinboard)$/) {	} elsif ($urlp=~/\/(smppg\|syllabus\|aboutme\|bulletinboard\|ext\.tool)$/) {
$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};	$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
if ($urlp=~/\/syllabus$/) {$urlp=~s/\/res//;}	if ($urlp=~/\/syllabus$/) {$urlp=~s/\/res//;}
	if ($urlp=~/\/ext\.tool$/) {$urlp=~s/^\/adm\/wrapper//;}
$resources_printed .= $urlp.':';	$resources_printed .= $urlp.':';
my $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') {	if ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes') {
Line 3306 ENDPART	Line 3304 ENDPART

my $map;	my $map;
if ($helper->{VARS}->{'symb'}) {	if ($helper->{VARS}->{'symb'}) {
($map, my $id, my $resource) =	unless ((($print_type eq 'all_problems_students') \|\|
&Apache::lonnet::decode_symb($helper->{VARS}->{'symb'});	($print_type eq 'incomplete_problems_selpeople_course')) &&
	$perm{'pfo'}) {
	($map, my $id, my $resource) =
	&Apache::lonnet::decode_symb($helper->{VARS}->{'symb'});
	}
	} elsif (($helper->{'VARS'}->{'postdata'} eq '/adm/navmaps') && ($perm{'pfo'})) {
	$map = $helper->{'VARS'}->{'SEQUENCE'};
}	}

#loop over students	#loop over students
Line 3397 ENDPART	Line 3401 ENDPART
if ($helper->{VARS}{'symb'}) {	if ($helper->{VARS}{'symb'}) {
($map, my $id, my $resource) =	($map, my $id, my $resource) =
&Apache::lonnet::decode_symb($helper->{VARS}{'symb'});	&Apache::lonnet::decode_symb($helper->{VARS}{'symb'});
	} elsif (($helper->{'VARS'}->{'postdata'} eq '/adm/navmaps') && ($perm{'pfo'})) {
	$map = $helper->{'VARS'}->{'SEQUENCE'};
}	}
my %moreenv = ('textwidth' => &get_textwidth($helper,$LaTeXwidth));	my %moreenv = ('textwidth' => &get_textwidth($helper,$LaTeXwidth));
$moreenv{'problem_split'} = $parmhash{'problem_stream_switch'};	$moreenv{'problem_split'} = $parmhash{'problem_stream_switch'};
Line 3456 ENDPART	Line 3462 ENDPART
my $count=0;	my $count=0;
my $nohidemap;	my $nohidemap;
if ($perm{'pav'} && $perm{'vgr'}) {	if ($perm{'pav'} && $perm{'vgr'}) {
$nohidemap = 1;	$nohidemap = 1;
}	}
foreach my $code (sort(@allcodes)) {	foreach my $code (sort(@allcodes)) {
my $file_num=int($count/$number_per_page);	my $file_num=int($count/$number_per_page);
Line 3598 ENDPART	Line 3604 ENDPART
}	}
}	}
if ($env{'request.enc'}) {	if ($env{'request.enc'}) {
$url = &Apache::lonenc::encrypted($url);	$url = &Apache::lonenc::encrypted($url);
}	}
if ($url ne '') {	if ($url ne '') {
my $symb = $helper->{VARS}{'symb'};	my $symb = $helper->{VARS}{'symb'};
Line 3795 sub print_resources {	Line 3801 sub print_resources {
# nice to put the special in as a postscript comment	# nice to put the special in as a postscript comment
# e.g. \special{ps:\ENDOFSTUDENTSTAMP} unfortunately,	# e.g. \special{ps:\ENDOFSTUDENTSTAMP} unfortunately,
# The special gets passed the \ and dvips puts it in the output file	# The special gets passed the \ and dvips puts it in the output file
# so we will just rely on prntout.pl to strip ENDOFSTUDENTSTAMP from the	# so we will just rely on printout.pl to strip ENDOFSTUDENTSTAMP from the
# postscript. Each ENDOFSTUDENTSTAMP will go on a line by itself.	# postscript. Each ENDOFSTUDENTSTAMP will go on a line by itself.
#	#

Line 3804 sub print_resources {	Line 3810 sub print_resources {
my $assignment;	my $assignment;
my $courseidinfo = &get_course();	my $courseidinfo = &get_course();
my $possprint = scalar(@{$master_seq});	my $possprint = scalar(@{$master_seq});
if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }
if ($usersection ne '') {$courseidinfo.=' - Sec. '.$usersection}

foreach my $curresline (@{$master_seq}) {	foreach my $curresline (@{$master_seq}) {
if (defined $page_breaks{$curresline}) {	if (defined $page_breaks{$curresline}) {
Line 3889 sub print_resources {	Line 3893 sub print_resources {
$rendered =~ s/\\end\{document}//;	$rendered =~ s/\\end\{document}//;
}	}
$current_output .= $rendered;	$current_output .= $rendered;
} elsif ($res_url=~/\/(smppg\|syllabus\|aboutme\|bulletinboard)$/) {	} elsif ($res_url=~/\/(smppg\|syllabus\|aboutme\|bulletinboard\|ext\.tool)$/) {
if ($i == 1) {	if ($i == 1) {
$syllabus_first = 1;	$syllabus_first = 1;
}	}
Line 3906 sub print_resources {	Line 3910 sub print_resources {
$rendered =~ s/\\end\{document}//;	$rendered =~ s/\\end\{document}//;
}	}
$current_output .= $rendered.'\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}\strut \vskip 0 mm \strut ';	$current_output .= $rendered.'\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}\strut \vskip 0 mm \strut ';
} elsif($res_url = ~/\.pdf$/) {	} elsif($res_url =~ /\.pdf$/) {
my $url = &Apache::lonnet::clutter($res_url);	my $url = &Apache::lonnet::clutter($res_url);
my $rendered = &include_pdf($url);	my $rendered = &include_pdf($url);
if ($remove_latex_header ne 'NO') {	if ($remove_latex_header ne 'NO') {
Line 3930 sub print_resources {	Line 3934 sub print_resources {
if (($assignment ne $current_assignment) && ($assignment ne "")) {	if (($assignment ne $current_assignment) && ($assignment ne "")) {
my $header_line = &format_page_header($LaTeXwidth, $parmhash{'print_header_format'},	my $header_line = &format_page_header($LaTeXwidth, $parmhash{'print_header_format'},
$assignment, $courseidinfo,	$assignment, $courseidinfo,
$fullname);	$fullname, $usersection);
my $header_start = ($columns_in_format == 1) ? '\lhead'	my $header_start = ($columns_in_format == 1) ? '\lhead'
: '\fancyhead[LO]';	: '\fancyhead[LO]';
$header_line = $header_start.'{'.$header_line.'}';	$header_line = $header_start.'{'.$header_line.'}';
Line 3962 sub print_resources {	Line 3966 sub print_resources {
} elsif ($print_incomplete) {	} elsif ($print_incomplete) {
$message = &mt('No incomplete resources');	$message = &mt('No incomplete resources');
}	}
if ($message) {	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") {	if ($remove_latex_header eq "NO") {
$current_output = &print_latex_header() . $current_output;	$current_output = &print_latex_header() . $current_output;
Line 3977 sub print_resources {	Line 3981 sub print_resources {
}	}
my $currentassignment=&Apache::lonxml::latex_special_symbols($helper->{VARS}->{'assignment'},'header');	my $currentassignment=&Apache::lonxml::latex_special_symbols($helper->{VARS}->{'assignment'},'header');
my $header_line =	my $header_line =
&format_page_header($LaTeXwidth, $parmhash{'print_header_format'},	&format_page_header($LaTeXwidth, $parmhash{'print_header_format'},
$currentassignment, $courseidinfo, $fullname);	$currentassignment, $courseidinfo, $fullname, $usersection);
my $header_start = ($columns_in_format == 1) ? '\lhead' : '\fancyhead[LO]';	my $header_start = ($columns_in_format == 1) ? '\lhead' : '\fancyhead[LO]';
my $newheader = $header_start.'{'.$header_line.'}';	my $newheader = $header_start.'{'.$header_line.'}';

if ($current_output=~/\\documentclass/) {	if ($current_output=~/\\documentclass/) {
$current_output =~ s/\\begin\{document}/\\setlength{\\topmargin}{1cm} \\begin{document}\\noindent\\parbox{\\minipagewidth}{\\noindent$newheader$namepostfix}\\vskip 5 mm /;	$current_output =~ s/\\begin\{document}/\\setlength{\\topmargin}{1cm} \\begin{document}\\noindent\\parbox{\\minipagewidth}{\\noindent$newheader$namepostfix}\\vskip 5 mm /;

} else {	} else {
my $blankpages =	my $blankpages =
'\clearpage\strut\clearpage'x$helper->{'VARS'}->{'EMPTY_PAGES'};	'\clearpage\strut\clearpage'x$helper->{'VARS'}->{'EMPTY_PAGES'};
Line 3992 sub print_resources {	Line 3996 sub print_resources {
&copyright_line().' \newpage '.$blankpages.$end_of_student.	&copyright_line().' \newpage '.$blankpages.$end_of_student.
'\setcounter{page}{1}\noindent\parbox{\minipagewidth}{\noindent'.	'\setcounter{page}{1}\noindent\parbox{\minipagewidth}{\noindent'.
$newheader.$namepostfix. '} \vskip 5 mm '.$current_output;	$newheader.$namepostfix. '} \vskip 5 mm '.$current_output;

}	}
#	#
# Close the student bracketing.	# Close the student bracketing.
Line 4296 sub printHelper {	Line 4301 sub printHelper {
if (ref($navmap)) {	if (ref($navmap)) {
my $res;	my $res;
if ($symb ne '') {	if ($symb ne '') {
$res = $navmap->getBySymb($symb);	$res = $navmap->getBySymb($symb);
} elsif ($map ne '') {	} elsif ($map ne '') {
$res = $navmap->getResourceByUrl($map);	$res = $navmap->getResourceByUrl($map);
}	}
Line 4306 sub printHelper {	Line 4311 sub printHelper {
($course_open, $course_close) = &course_print_dates($res);	($course_open, $course_close) = &course_print_dates($res);
($map_open, $map_close) = &map_print_dates($res);	($map_open, $map_close) = &map_print_dates($res);
} else {	} else {
$res_error = 1;	$res_error = 1;
}	}
} else {	} else {
$res_error = 1;	$res_error = 1;
Line 4651 ALL_PROBLEMS	Line 4656 ALL_PROBLEMS
# with one state, and use REGEXPs at inclusion time to set state names	# with one state, and use REGEXPs at inclusion time to set state names
# and next states for better mix and match capability	# and next states for better mix and match capability
#	#

my $resource_selector=<<RESOURCE_SELECTOR;	my $resource_selector=<<RESOURCE_SELECTOR;
<state name="SELECT_RESOURCES" title="Select Resources">	<state name="SELECT_RESOURCES" title="Select Resources">
$randomly_ordered_warning	$randomly_ordered_warning
Line 4749 CHOOSE_ANON2	Line 4754 CHOOSE_ANON2

# FIXME: That RE should come from a library somewhere.	# FIXME: That RE should come from a library somewhere.
if (($perm{'pav'}	if (($perm{'pav'}
&& ($subdir ne '')	&& ($subdir ne '')
&& $subdir ne $Apache::lonnet::perlvar{'lonDocRoot'}.'/res/'	&& $subdir ne $Apache::lonnet::perlvar{'lonDocRoot'}.'/res/'
&& (defined($helper->{'VARS'}->{'construction'})	&& (defined($helper->{'VARS'}->{'construction'})
\|\|	\|\|
Line 4820 CHOOSE_FROM_SUBDIR	Line 4825 CHOOSE_FROM_SUBDIR
'<b>','</b>','<b>','</b>','<b>','</b>'),	'<b>','</b>','<b>','</b>','<b>','</b>'),
'select_sequences_resources_for_anon','CHOOSE_SEQUENCE_ANON2']);	'select_sequences_resources_for_anon','CHOOSE_SEQUENCE_ANON2']);
if ($escapedSequenceName) {	if ($escapedSequenceName) {
&generate_common_choosers($r,$helper,$escapedSequenceName,$escapedSequenceName,$isProblem,$symbFilter,$start_new_option);	my ($randomly_ordered_warning,$codechoice,$code_selection,$namechoice) =
	&generate_common_choosers($r,$helper,$escapedSequenceName,$escapedSequenceName,
	$isProblem,$symbFilter,$start_new_option);

	my $resource_selector = <<RESOURCE_SELECTOR;
	<state name="CHOOSE_STUDENTS2" title="Select Students and Resources">
	<choices variable='student_sort'>
	<choice computer='0'>Sort by section then student</choice>
	<choice computer='1'>Sort by students across sections.</choice>
	</choices>
	<message><br /><hr /><br /></message>
	<student multichoice='1' variable="STUDENTS" nextstate="SELECT_RESOURCES" coursepersonnel="1" />

	</state>
	<state name="SELECT_RESOURCES" title="Select Resources">
	$randomly_ordered_warning
	<nextstate>PRINT_FORMATTING</nextstate>
	<message>(mark desired resources then click "next" button) <br /></message>
	<resource variable="RESOURCES" multichoice="1" addstatus="1"
	closeallpages="1" modallink="1" suppressNavmap="1" $nocurrloc>
	<filterfunc>return $isNotMap;</filterfunc>
	<mapurl>$escapedSequenceName</mapurl>
	<valuefunc>return $symbFilter;</valuefunc>
	$start_new_option
	</resource>
	</state>
	RESOURCE_SELECTOR

	my $anon3 = &generate_code_selector($helper,
	'CHOOSE_ANON3',
	'SELECT_RESOURCES',
	$codechoice,
	$code_selection,
	$namechoice) . $resource_selector;

	&Apache::lonxml::xmlparse($r, 'helper',$anon3);
}	}
}	}
}	}
if (($subdir eq '') && ($url eq '/adm/navmaps') && ($perm{'pfo'})) {	if (($subdir eq '') && ($url eq '/adm/navmaps') && ($perm{'pfo'})) {
&Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_FROM_ANY_SEQUENCE);	&Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_FROM_ANY_SEQUENCE);
<state name="CHOOSE_SEQUENCE" title="Select Sequence To Print From">	<state name="CHOOSE_SEQUENCE" title="Select Sequence To Print From">
<message>Select the sequence to print resources from:</message>	<message>Select the sequence to print resources from:</message>
<resource variable="SEQUENCE">	<resource variable="SEQUENCE">
Line 4859 CHOOSE_FROM_SUBDIR	Line 4899 CHOOSE_FROM_SUBDIR
<state name="CHOOSE_SEQUENCE_STUDENTS1" title="Select Sequence To Print From">	<state name="CHOOSE_SEQUENCE_STUDENTS1" title="Select Sequence To Print From">
<message>Select the sequence to print resources from:</message>	<message>Select the sequence to print resources from:</message>
<resource variable="SEQUENCE">	<resource variable="SEQUENCE">
<nextstate>CHOOSE_STUDENTS</nextstate>	<nextstate>CHOOSE_STUDENTS2</nextstate>
<filterfunc>return &Apache::lonprintout::printable_sequence(\$res);</filterfunc>	<filterfunc>return &Apache::lonprintout::printable_sequence(\$res);</filterfunc>
<valuefunc>return $urlValue;</valuefunc>	<valuefunc>return $urlValue;</valuefunc>
<choicefunc>return \$res->hasResource(\$res,sub { return !\$_[0]->is_sequence() },0,0);	<choicefunc>return \$res->hasResource(\$res,sub { return !\$_[0]->is_sequence() },0,0);
Line 4869 CHOOSE_FROM_SUBDIR	Line 4909 CHOOSE_FROM_SUBDIR
<state name="CHOOSE_SEQUENCE_ANON2" title="Select Sequence To Print From">	<state name="CHOOSE_SEQUENCE_ANON2" title="Select Sequence To Print From">
<message>Select the sequence to print resources from:</message>	<message>Select the sequence to print resources from:</message>
<resource variable="SEQUENCE">	<resource variable="SEQUENCE">
<nextstate>CHOOSE_ANON1</nextstate>	<nextstate>CHOOSE_ANON3</nextstate>
<filterfunc>return &Apache::lonprintout::printable_sequence(\$res);</filterfunc>	<filterfunc>return &Apache::lonprintout::printable_sequence(\$res);</filterfunc>
<valuefunc>return $urlValue;</valuefunc>	<valuefunc>return $urlValue;</valuefunc>
<choicefunc>return \$res->hasResource(\$res,sub { return !\$_[0]->is_sequence() },0,0);	<choicefunc>return \$res->hasResource(\$res,sub { return !\$_[0]->is_sequence() },0,0);
Line 4959 CHOOSE_FROM_ANY_SEQUENCE	Line 4999 CHOOSE_FROM_ANY_SEQUENCE

if ($noprintmsg) {	if ($noprintmsg) {
$paramHash = Apache::lonhelper::getParamHash();	$paramHash = Apache::lonhelper::getParamHash();
$paramHash->{MESSAGE_TEXT} =	$paramHash->{MESSAGE_TEXT} =
'<p class="LC_info">'.$noprintmsg.'</p>';	'<p class="LC_info">'.$noprintmsg.'</p>';
Apache::lonhelper::message->new();	Apache::lonhelper::message->new();
}	}
}	}
$paramHash = Apache::lonhelper::getParamHash();	$paramHash = Apache::lonhelper::getParamHash();
Line 5186 FONT_SELECTION	Line 5226 FONT_SELECTION
return "$helper->{VARS}->{'probstatus'}";	return "$helper->{VARS}->{'probstatus'}";
</defaultvalue>	</defaultvalue>
<choice computer="problem">Homework Problem</choice>	<choice computer="problem">Homework Problem</choice>
<choice computer="exam">Exam Problem</choice>	<choice computer="exam">Bubblesheet Exam Problem</choice>
<choice computer="survey">Survey question</choice>	<choice computer="survey">Survey question</choice>
,choice computer="anonsurvey"Anonymous survey question</choice>	,choice computer="anonsurvey"Anonymous survey question</choice>
</dropdown>	</dropdown>
Line 5304 sub render {	Line 5344 sub render {
my $PaperType=&mt('Paper type');	my $PaperType=&mt('Paper type');
my $landscape=&mt('Landscape');	my $landscape=&mt('Landscape');
my $portrait=&mt('Portrait');	my $portrait=&mt('Portrait');
	my $pdfFormLabel=&mt('PDF Form Fields');
	my $with=&mt('with Form Fields');
	my $without=&mt('without Form Fields');


$result.='<h3>'.&mt('Layout Options').'</h3>'	$result.='<h3>'.&mt('Layout Options').'</h3>'
Line 5312 sub render {	Line 5355 sub render {
.'<th>'.$PageLayout.'</th>'	.'<th>'.$PageLayout.'</th>'
.'<th>'.$NumberOfColumns.'</th>'	.'<th>'.$NumberOfColumns.'</th>'
.'<th>'.$PaperType.'</th>'	.'<th>'.$PaperType.'</th>'
	.'<th>'.$pdfFormLabel.'</th>'
.&Apache::loncommon::end_data_table_header_row()	.&Apache::loncommon::end_data_table_header_row()
.&Apache::loncommon::start_data_table_row()	.&Apache::loncommon::start_data_table_row()
.'<td>'	.'<td>'
Line 5352 sub render {	Line 5396 sub render {
$result .= <<HTML;	$result .= <<HTML;
</select>	</select>
</td>	</td>
	<td align='center'>
	<select name='${var}.pdfFormFields'>
	<option selected="selected" value="no">$without</option>
	<option value="yes">$with</option>
	</select>
	</td>
HTML	HTML
$result.=&Apache::loncommon::end_data_table_row()	$result.=&Apache::loncommon::end_data_table_row()
.&Apache::loncommon::end_data_table();	.&Apache::loncommon::end_data_table();

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.627.2.32.2.4
changed lines
	Added in v.1.695