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.483 and 1.497

version 1.483, 2006/08/28 11:11:49	version 1.497, 2007/04/17 15:45:03
Line 23	Line 23
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA	# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#	#
# /home/httpd/html/adm/gpl.txt	# /home/httpd/html/adm/gpl.txt
#
# http://www.lon-capa.org/	# http://www.lon-capa.org/
#	#
#	#
Line 39 use Apache::grades;	Line 38 use Apache::grades;
use Apache::edit;	use Apache::edit;
use Apache::File();	use Apache::File();
use Apache::lonnavmaps;	use Apache::lonnavmaps;
use Apache::lonratedt;	use LONCAPA::map();
use POSIX qw(strftime);	use POSIX qw(strftime);
use Apache::lonlocal;	use Apache::lonlocal;
use Carp;	use Carp;
use lib '/home/httpd/lib/perl/';
use LONCAPA;	use LONCAPA;

my %perm;	my %perm;
my %parmhash;	my %parmhash;
my $resources_printed;	my $resources_printed;

	#
	# printf_style_subst item format_string repl
	#
	# Does printf style substitution for a format string that
	# can have %[n]item in it.. wherever, %[n]item occurs,
	# rep is substituted in format_string. Note that
	# [n] is an optional integer length. If provided,
	# repl is truncated to at most [n] characters prior to
	# substitution.
	#
	sub printf_style_subst {
	my ($item, $format_string, $repl) = @_;
	my $result = "";
	while ($format_string =~ /(%)(\d*)\Q$item\E/g ) {
	my $fmt = $1;
	my $size = $2;
	my $subst = $repl;
	if ($size ne "") {
	$subst = substr($subst, 0, $size);

	# Here's a nice edge case.. supose the end of the
	# substring is a \. In that case may have just
	# chopped off a TeX escape... in that case, we append
	# " " for the trailing character, and let the field
	# spill over a bit (sigh).
	# We don't just chop off the last character in order to deal
	# with one last pathology, and that would be if substr had
	# trimmed us to e.g. \\\


	if ($subst =~ /\\$/) {
	$subst .= " ";
	}
	}
	my $item_pos = pos($format_string);
	$result .= substr($format_string, 0, $item_pos - length($size) -2) . $subst;
	$format_string = substr($format_string, pos($format_string));
	}

	# Put the residual format string into the result:

	$result .= $format_string;

	return $result;
	}


# Format a header according to a format.	# Format a header according to a format.
#	#
Line 60 my $resources_printed;	Line 104 my $resources_printed;
# %n - Student name.	# %n - Student name.
#	#
sub format_page_header {	sub format_page_header {
my ($format, $assignment, $course, $student) = @_;	my ($width, $format, $assignment, $course, $student) = @_;

	$width = &recalcto_mm($width); # Get width in mm.
# Default format?	# Default format?

if ($format eq '') {	if ($format eq '') {
	# For the default format, we may need to truncate
	# elements.. To do this we need to get the page width.
	# we assume that each character is about 2mm in width.
	# (correct for the header text size??). We ignore
	# any formatting (e.g. boldfacing in this).
	#
	# - Allow the student/course to be one line.
	# but only truncate the course.
	# - Allow the assignment to be 2 lines (wrapped).
	#
	my $chars_per_line = $width/2; # Character/textline.


	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}";	$format = "\\textbf{$student} $course \\hfill \\thepage \\\\ \\textit{$assignment}";

} else {	} else {
$format =~ s/%a/$assignment/g;	# An open question is how to handle long user formatted page headers...
$format =~ s/%c/$course/g;	# A possible future is to support e.g. %na so that the user can control
$format =~ s/%n/$student/g;	# 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!!!


}	}


Line 94 sub num_to_letters {	Line 175 sub num_to_letters {
sub letters_to_num {	sub letters_to_num {
my ($letters) = @_;	my ($letters) = @_;
my @letters = split('', uc($letters));	my @letters = split('', uc($letters));
my %substitution;	my %substitution;
my $digit = 0;	my $digit = 0;
foreach my $letter ('A'..'J') {	foreach my $letter ('A'..'J') {
$substitution{$letter} = $digit;	$substitution{$letter} = $digit;
Line 409 sub character_chart {	Line 490 sub character_chart {
$result =~ s/&\#147;/\`\`/g;	$result =~ s/&\#147;/\`\`/g;
$result =~ s/&\#148;/\'\'/g;	$result =~ s/&\#148;/\'\'/g;
$result =~ s/&\#149;/\\ensuremath\{\\bullet\}/g;	$result =~ s/&\#149;/\\ensuremath\{\\bullet\}/g;
$result =~ s/&\#150;/--/g;	$result =~ s/&(\#150\|\#8211);/--/g;
$result =~ s/&\#151;/---/g;	$result =~ s/&\#151;/---/g;
$result =~ s/&\#152;/\\ensuremath\{\\sim\}/g;	$result =~ s/&\#152;/\\ensuremath\{\\sim\}/g;
$result =~ s/&\#153;/\\texttrademark /g;	$result =~ s/&\#153;/\\texttrademark /g;
Line 616 sub character_chart {	Line 697 sub character_chart {
$result =~ s/&(clubs\|\#9827);/\\ensuremath\{\\clubsuit\}/g;	$result =~ s/&(clubs\|\#9827);/\\ensuremath\{\\clubsuit\}/g;
$result =~ s/&(hearts\|\#9829);/\\ensuremath\{\\heartsuit\}/g;	$result =~ s/&(hearts\|\#9829);/\\ensuremath\{\\heartsuit\}/g;
$result =~ s/&(diams\|\#9830);/\\ensuremath\{\\diamondsuit\}/g;	$result =~ s/&(diams\|\#9830);/\\ensuremath\{\\diamondsuit\}/g;
	# Chemically useful 'things' contributed by Hon Kie (bug 4652).
	$result =~ s/&\#8636;/\\ensuremath\{\\leftharpoonup\}/g;
	$result =~ s/&\#8637;/\\ensuremath\{\\leftharpoondown\}/g;
	$result =~ s/&\#8640;/\\ensuremath\{\\rightharpoonup\}/g;
	$result =~ s/&\#8641;/\\ensuremath\{\\rightharpoondown\}/g;
	$result =~ s/&\#8652;/\\ensuremath\{\\rightleftharpoons\}/g;
	$result =~ s/&\#8605;/\\ensuremath\{\\leadsto\}/g;
	$result =~ s/&\#8617;/\\ensuremath\{\\hookleftarrow\}/g;
	$result =~ s/&\#8618;/\\ensuremath\{\\hookrightarrow\}/g;
	$result =~ s/&\#8614;/\\ensuremath\{\\mapsto\}/g;
	$result =~ s/&\#8599;/\\ensuremath\{\\nearrow\}/g;
	$result =~ s/&\#8600;/\\ensuremath\{\\searrow\}/g;
	$result =~ s/&\#8601;/\\ensuremath\{\\swarrow\}/g;
	$result =~ s/&\#8598;/\\ensuremath\{\\nwarrow\}/g;
return $result;	return $result;
}	}

Line 624 sub character_chart {	Line 719 sub character_chart {
my %page_formats=	my %page_formats=
('letter' => {	('letter' => {
'book' => {	'book' => {
'1' => [ '7.1 in','9.8 in', '-0.57 in','-0.57 in','0.7 cm'],	'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.7 cm']	'2' => ['3.66 in','9.8 in', '-0.57 in','-0.57 in','0.275 in']
},	},
'album' => {	'album' => {
'1' => [ '8.8 in', '6.8 in','-0.55 in', '-0.83 in','1 cm'],	'1' => [ '8.8 in', '6.8 in','-0.55 in', '-0.55 in','0.394 in'],
'2' => [ '4.4 in', '6.8 in','-0.5 in', '-1.5 in','3.5 in']	'2' => [ '4.8 in', '6.8 in','-0.5 in', '-1.0 in','3.5 in']
},	},
},	},
'legal' => {	'legal' => {
Line 684 my %page_formats=	Line 779 my %page_formats=
},	},
'a4' => {	'a4' => {
'book' => {	'book' => {
'1' => ['17.6 cm','27.2 cm','-0.55 in','-0.83 in','-0.5 in'],	'1' => ['17.6 cm','27.2 cm','-1.397 cm','-2.11 cm','-1.27 cm'],
'2' => [ '9.1 cm','27.2 cm','-0.55 in','-0.83 in','-0.5 in']	'2' => [ '9.1 cm','27.2 cm','-1.397 cm','-2.11 cm','-1.27 cm']
},	},
'album' => {	'album' => {
'1' => ['8.5 in','7.7 in','-0.55 in','-0.83 in','0 in'],	'1' => ['21.59 cm','19.558 cm','-1.397cm','-2.11 cm','0 cm'],
'2' => ['3.9 in','7.7 in','-0.55 in','-0.83 in','0 in']	'2' => ['9.91 cm','19.558 cm','-1.397 cm','-2.11 cm','0 cm']
},	},
},	},
'a5' => {	'a5' => {
Line 761 sub page_format_transformation {	Line 856 sub page_format_transformation {
my $courseidinfo = &get_course();	my $courseidinfo = &get_course();
if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }	if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }
my $header_text = $parmhash{'print_header_format'};	my $header_text = $parmhash{'print_header_format'};
$header_text = &format_page_header($header_text, $assignment,	$header_text = &format_page_header($textwidth, $header_text, $assignment,
$courseidinfo, $name);	$courseidinfo, $name);
my $topmargintoinsert = '';	my $topmargintoinsert = '';
if ($topmargin ne '0') {$topmargintoinsert='\setlength{\topmargin}{'.$topmargin.'}';}	if ($topmargin ne '0') {$topmargintoinsert='\setlength{\topmargin}{'.$topmargin.'}';}
Line 1084 sub print_construction_sequence {	Line 1179 sub print_construction_sequence {
if ($helper->{'VARS'}->{'curseed'}) {	if ($helper->{'VARS'}->{'curseed'}) {
$rndseed=$helper->{'VARS'}->{'curseed'};	$rndseed=$helper->{'VARS'}->{'curseed'};
}	}
my $errtext=&Apache::lonratedt::mapread($currentURL);	my $errtext=&LONCAPA::map::mapread($currentURL);
#	#
# These make this all support recursing for subsequences.	# These make this all support recursing for subsequences.
#	#
my @order = @Apache::lonratedt::order;	my @order = @LONCAPA::map::order;
my @resources = @Apache::lonratedt::resources;	my @resources = @LONCAPA::map::resources;
for (my $member=0;$member<=$#order;$member++) {	for (my $member=0;$member<=$#order;$member++) {
$resources[$order[$member]]=~/^([^:]):([^:]):/;	$resources[$order[$member]]=~/^([^:]):([^:]):/;
my $urlp=$2;	my $urlp=$2;
Line 1467 ENDPART	Line 1562 ENDPART
if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }	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($header_text,	$header_text = &format_page_header($textwidth, $header_text,
$assignment,	$assignment,
$courseidinfo,	$courseidinfo,
$name);	$name);
Line 1898 sub print_resources {	Line 1993 sub print_resources {
my $printed = '';	my $printed = '';
my ($username,$userdomain,$usersection) = split /:/,$person;	my ($username,$userdomain,$usersection) = split /:/,$person;
my $fullname = &get_name($username,$userdomain);	my $fullname = &get_name($username,$userdomain);
my $namepostfix;	my $namepostfix = "\\\\"; # Both anon and not anon should get the same vspace.
if ($person =~ 'anon') {	if ($person =~ 'anon') {
$namepostfix="\\\\Name: ";	$namepostfix .="Name: ";
$fullname = "CODE - ".$moreenv->{'CODE'};	$fullname = "CODE - ".$moreenv->{'CODE'};
}	}
# Fullname may have special latex characters that need \ prefixing:	# Fullname may have special latex characters that need \ prefixing:
Line 2005 sub print_resources {	Line 2100 sub print_resources {
if ($usersection ne '') {$courseidinfo.=' - Sec. '.$usersection}	if ($usersection ne '') {$courseidinfo.=' - Sec. '.$usersection}
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($parmhash{'print_header_format'},	&format_page_header($LaTeXwidth, $parmhash{'print_header_format'},
$currentassignment, $courseidinfo, $fullname);	$currentassignment, $courseidinfo, $fullname);
my $header_start = ($columns_in_format == 1) ? '\lhead'	my $header_start = ($columns_in_format == 1) ? '\lhead'
: '\fancyhead[LO]';	: '\fancyhead[LO]';
Line 2383 RESOURCE_SELECTOR	Line 2478 RESOURCE_SELECTOR

&Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_STUDENTS);	&Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_STUDENTS);
<state name="CHOOSE_STUDENTS" title="Select Students and Resources">	<state name="CHOOSE_STUDENTS" title="Select Students and Resources">
<message><b>Select sort order</b> </message>	<message><b>Select sorting order of printout</b> </message>
<choices variable='student_sort'>	<choices variable='student_sort'>
<choice computer='0'>Sort by section then student</choice>	<choice computer='0'>Sort by section then student</choice>
<choice computer='1'>Sort by students across sections.</choice>	<choice computer='1'>Sort by students across sections.</choice>
Line 2703 CHOOSE_FROM_ANY_SEQUENCE	Line 2798 CHOOSE_FROM_ANY_SEQUENCE

if (($perm{'pav'} and &Apache::lonnet::allowed('vgr',$env{'request.course.id'})) or	if (($perm{'pav'} and &Apache::lonnet::allowed('vgr',$env{'request.course.id'})) or
($helper->{VARS}->{'construction'} eq '1')) {	($helper->{VARS}->{'construction'} eq '1')) {
addMessage("<hr width='33%' /><table><tr><td align='right'>Print: </td><td>");	addMessage("<hr width='33%' /><table><tr><td align='right'>".
	'<label for="ANSWER_TYPE_forminput">'.
	&mt('Print').
	"</label>: </td><td>");
$paramHash = Apache::lonhelper::getParamHash();	$paramHash = Apache::lonhelper::getParamHash();
$paramHash->{'variable'} = 'ANSWER_TYPE';	$paramHash->{'variable'} = 'ANSWER_TYPE';
$helper->declareVar('ANSWER_TYPE');	$helper->declareVar('ANSWER_TYPE');
Line 2719 CHOOSE_FROM_ANY_SEQUENCE	Line 2817 CHOOSE_FROM_ANY_SEQUENCE

if ($perm{'pav'}) {	if ($perm{'pav'}) {
if (!$startedTable) {	if (!$startedTable) {
addMessage("<hr width='33%' /><table><tr><td align='right'>LaTeX mode: </td><td>");	addMessage("<hr width='33%' /><table><tr><td align='right'>".
	'<label for="LATEX_TYPE_forminput">'.
	&mt('LaTeX mode').
	"</label>: </td><td>");
$startedTable = 1;	$startedTable = 1;
} else {	} else {
addMessage("<tr><td align='right'>LaTeX mode: </td><td>");	addMessage("<tr><td align='right'>".
	'<label for="LATEX_TYPE_forminput">'.
	&mt('LaTeX mode').
	"</label>: </td><td>");
}	}
$paramHash = Apache::lonhelper::getParamHash();	$paramHash = Apache::lonhelper::getParamHash();
$paramHash->{'variable'} = 'LATEX_TYPE';	$paramHash->{'variable'} = 'LATEX_TYPE';
Line 2738 CHOOSE_FROM_ANY_SEQUENCE	Line 2842 CHOOSE_FROM_ANY_SEQUENCE
}	}
Apache::lonhelper::dropdown->new();	Apache::lonhelper::dropdown->new();

addMessage("</td></tr><tr><td align='right'>Print Table of Contents: </td><td>");	addMessage("</td></tr><tr><td align='right'>".
	'<label="TABLE_CONTENTS_forminput">'.
	&mt('Print Table of Contents').
	"</label>: </td><td>");
$paramHash = Apache::lonhelper::getParamHash();	$paramHash = Apache::lonhelper::getParamHash();
$paramHash->{'variable'} = 'TABLE_CONTENTS';	$paramHash->{'variable'} = 'TABLE_CONTENTS';
$helper->declareVar('TABLE_CONTENTS');	$helper->declareVar('TABLE_CONTENTS');
Line 2749 CHOOSE_FROM_ANY_SEQUENCE	Line 2856 CHOOSE_FROM_ANY_SEQUENCE
addMessage("</td></tr>");	addMessage("</td></tr>");

if (not $helper->{VARS}->{'construction'}) {	if (not $helper->{VARS}->{'construction'}) {
addMessage("<tr><td align='right'>Print Index: </td><td>");	addMessage("<tr><td align='right'>".
	'<label for="TABLE_INDEX_forminput">'.
	&mt('Print Index').
	"</label>: </td><td>");
$paramHash = Apache::lonhelper::getParamHash();	$paramHash = Apache::lonhelper::getParamHash();
$paramHash->{'variable'} = 'TABLE_INDEX';	$paramHash->{'variable'} = 'TABLE_INDEX';
$helper->declareVar('TABLE_INDEX');	$helper->declareVar('TABLE_INDEX');
Line 2758 CHOOSE_FROM_ANY_SEQUENCE	Line 2868 CHOOSE_FROM_ANY_SEQUENCE
['Yes', 'yes'] ];	['Yes', 'yes'] ];
Apache::lonhelper::dropdown->new();	Apache::lonhelper::dropdown->new();
addMessage("</td></tr>");	addMessage("</td></tr>");
addMessage("<tr><td align='right'>Print Discussions: </td><td>");	addMessage("<tr><td align='right'>".
	'<label for="PRINT_DISCUSSIONS_forminput">'.
	&mt('Print Discussions').
	"</label>: </td><td>");
$paramHash = Apache::lonhelper::getParamHash();	$paramHash = Apache::lonhelper::getParamHash();
$paramHash->{'variable'} = 'PRINT_DISCUSSIONS';	$paramHash->{'variable'} = 'PRINT_DISCUSSIONS';
$helper->declareVar('PRINT_DISCUSSIONS');	$helper->declareVar('PRINT_DISCUSSIONS');
Line 2780 CHOOSE_FROM_ANY_SEQUENCE	Line 2893 CHOOSE_FROM_ANY_SEQUENCE

if ($helper->{'VARS'}->{'construction'}) {	if ($helper->{'VARS'}->{'construction'}) {
my $stylevalue=$env{'construct.style'};	my $stylevalue=$env{'construct.style'};
	my $randseedtext=&mt("Use random seed");
	my $stylefiletext=&mt("Use style file");

my $xmlfrag .= <<"RNDSEED";	my $xmlfrag .= <<"RNDSEED";
<message><tr><td align='right'>Use random seed: </td><td></message>	<message><tr><td align='right'>
	<label for="curseed_forminput">$randseedtext</label>:
	</td><td></message>
<string variable="curseed" size="15" maxlength="15">	<string variable="curseed" size="15" maxlength="15">
<defaultvalue>	<defaultvalue>
return $helper->{VARS}->{'curseed'};	return $helper->{VARS}->{'curseed'};
</defaultvalue>	</defaultvalue>
</string>	</string>
<message></td></tr><tr><td align="right">Use style file:</td><td></message>	<message></td></tr><tr><td align="right">
	<label for="style_file_value">$stylefiletext</label>:
	</td><td></message>
<message><input type="text" size="40" name="style_file_value" value="$stylevalue" />  <a href="javascript:openbrowser('helpform','style_file_value','sty')">Select style file</a> </td><tr><td></message>	<message><input type="text" size="40" name="style_file_value" value="$stylevalue" />  <a href="javascript:openbrowser('helpform','style_file_value','sty')">Select style file</a> </td><tr><td></message>
<choices allowempty="1" multichoice="true" variable="showallfoils">	<choices allowempty="1" multichoice="true" variable="showallfoils">
<choice computer="1">Show all foils?</choice>	<choice computer="1">Show all foils?</choice>

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

Removed from v.1.483
changed lines
	Added in v.1.497