--- loncom/interface/lonprintout.pm 2006/06/30 01:11:04 1.449
+++ loncom/interface/lonprintout.pm 2007/01/15 11:53:50 1.495
@@ -1,7 +1,8 @@
+#
# The LearningOnline Network
# Printout
#
-# $Id: lonprintout.pm,v 1.449 2006/06/30 01:11:04 albertel Exp $
+# $Id: lonprintout.pm,v 1.495 2007/01/15 11:53:50 foxr Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -22,7 +23,6 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
# /home/httpd/html/adm/gpl.txt
-#
# http://www.lon-capa.org/
#
#
@@ -38,14 +38,126 @@ use Apache::grades;
use Apache::edit;
use Apache::File();
use Apache::lonnavmaps;
-use Apache::lonratedt;
+use LONCAPA::map();
use POSIX qw(strftime);
use Apache::lonlocal;
use Carp;
-use lib '/home/httpd/lib/perl/';
use LONCAPA;
my %perm;
+my %parmhash;
+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.
+#
+
+# Substitutions:
+# %a - Assignment name.
+# %c - Course name.
+# %n - Student name.
+#
+sub format_page_header {
+ my ($width, $format, $assignment, $course, $student) = @_;
+
+ $width = &recalcto_mm($width); # Get width in mm.
+ # Default format?
+
+ 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}";
+
+ } 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!!!
+
+
+ }
+
+
+ return $format;
+
+}
#
# Convert a numeric code to letters
@@ -63,7 +175,7 @@ sub num_to_letters {
sub letters_to_num {
my ($letters) = @_;
my @letters = split('', uc($letters));
- my %substitution;
+ my %substitution;
my $digit = 0;
foreach my $letter ('A'..'J') {
$substitution{$letter} = $digit;
@@ -378,7 +490,7 @@ sub character_chart {
$result =~ s/&\#147;/\`\`/g;
$result =~ s/&\#148;/\'\'/g;
$result =~ s/&\#149;/\\ensuremath\{\\bullet\}/g;
- $result =~ s/&\#150;/--/g;
+ $result =~ s/&(\#150|\#8211);/--/g;
$result =~ s/&\#151;/---/g;
$result =~ s/&\#152;/\\ensuremath\{\\sim\}/g;
$result =~ s/&\#153;/\\texttrademark /g;
@@ -585,6 +697,20 @@ sub character_chart {
$result =~ s/&(clubs|\#9827);/\\ensuremath\{\\clubsuit\}/g;
$result =~ s/&(hearts|\#9829);/\\ensuremath\{\\heartsuit\}/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;
}
@@ -593,12 +719,12 @@ sub character_chart {
my %page_formats=
('letter' => {
'book' => {
- '1' => [ '7.1 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.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.275 in']
},
'album' => {
- '1' => [ '8.8 in', '6.8 in','-40 pt in', '-60 pt','1 cm'],
- '2' => [ '4.4 in', '6.8 in','-0.5 in', '-1.5 in','3.5 in']
+ '1' => [ '8.8 in', '6.8 in','-0.55 in', '-0.55 in','1.0 in'],
+ '2' => [ '4.8 in', '6.8 in','-0.5 in', '-1.0 in','3.5 in']
},
},
'legal' => {
@@ -653,12 +779,12 @@ my %page_formats=
},
'a4' => {
'book' => {
- '1' => ['176 mm','272 mm','-40 pt in','-60 pt','-0.5 in'],
- '2' => [ '91 mm','272 mm','-40 pt in','-60 pt','-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','-1.397 c,','-2.11 cm','-1.27 cm']
},
'album' => {
- '1' => ['8.5 in','7.7 in','-40 pt in','-60 pt','0 in'],
- '2' => ['3.9 in','7.7 in','-40 pt in','-60 pt','0 in']
+ '1' => ['21.59 cm','19.558 cm','-1.27 cm','-2.11 cm','0 cm'],
+ '2' => ['9.91 cm','19.558 cm','-1.397 cm','-2.11 cm','0 cm']
},
},
'a5' => {
@@ -702,8 +828,7 @@ sub get_name {
if (!defined($udom)) { $udom=$env{'user.domain'}; }
my $plainname=&Apache::loncommon::plainname($uname,$udom);
if ($plainname=~/^\s*$/) { $plainname=$uname.'@'.$udom; }
- # $plainname=&Apache::lonxml::latex_special_symbols($plainname,'header');
- $plainname = &escape_LaTeX($plainname);
+ $plainname=&Apache::lonxml::latex_special_symbols($plainname,'header');
return $plainname;
}
@@ -718,22 +843,28 @@ sub get_course {
sub page_format_transformation {
my ($papersize,$layout,$numberofcolumns,$choice,$text,$assignment,$tableofcontents,$indexlist,$selectionmade) = @_;
my ($textwidth,$textheight,$oddoffset,$evenoffset,$topmargin);
+
if ($selectionmade eq '4') {
$assignment='Problems from the Whole Course';
} else {
$assignment=&Apache::lonxml::latex_special_symbols($assignment,'header');
}
($textwidth,$textheight,$oddoffset,$evenoffset,$topmargin) = &page_format($papersize,$layout,$numberofcolumns,$topmargin);
+
+
my $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);
my $topmargintoinsert = '';
if ($topmargin ne '0') {$topmargintoinsert='\setlength{\topmargin}{'.$topmargin.'}';}
my $fancypagestatement='';
if ($numberofcolumns eq '2') {
- $fancypagestatement="\\fancyhead{}\\fancyhead[LO]{\\textbf{$name} $courseidinfo \\hfill \\thepage \\\\ \\textit{$assignment}}";
+ $fancypagestatement="\\fancyhead{}\\fancyhead[LO]{$header_text}";
} else {
- $fancypagestatement="\\rhead{}\\chead{}\\lhead{\\textbf{$name} $courseidinfo \\hfill \\thepage \\\\ \\textit{$assignment}}";
+ $fancypagestatement="\\rhead{}\\chead{}\\lhead{$header_text}";
}
if ($layout eq 'album') {
$text =~ s/\\begin{document}/\\setlength{\\oddsidemargin}{$oddoffset}\\setlength{\\evensidemargin}{$evenoffset}$topmargintoinsert\n\\setlength{\\textwidth}{$textwidth}\\setlength{\\textheight}{$textheight}\\setlength{\\textfloatsep}{8pt plus 2\.0pt minus 4\.0pt}\n\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\usepackage{fancyhdr}\\addtolength{\\headheight}{\\baselineskip}\n\\pagestyle{fancy}$fancypagestatement\\begin{document}\\voffset=-0\.8 cm\\setcounter{page}{1}\n /;
@@ -776,6 +907,8 @@ sub details_for_menu {
if (!$postdata) { $postdata=$helper->{VARS}{'postdata'}; }
my $name_of_resource = &Apache::lonnet::gettitle($postdata);
my $symbolic = &Apache::lonnet::symbread($postdata);
+ return if ( $symbolic eq '');
+
my ($map,$id,$resource)=&Apache::lonnet::decode_symb($symbolic);
$map=&Apache::lonnet::clutter($map);
my $name_of_sequence = &Apache::lonnet::gettitle($map);
@@ -791,16 +924,21 @@ sub details_for_menu {
return ($name_of_resource,$name_of_sequence,$name_of_map);
}
+sub copyright_line {
+ return '\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}\vspace*{-2 mm}\newline\noindent{\tiny Printed from LON-CAPA\copyright MSU{\hfill} Licensed under GNU General Public License } ';
+}
+my $end_of_student = "\n".'\special{ps:ENDOFSTUDENTSTAMP}'."\n";
sub latex_corrections {
my ($number_of_columns,$result,$selectionmade,$answer_mode) = @_;
# $result =~ s/\\includegraphics{/\\includegraphics\[width=\\minipagewidth\]{/g;
- $result =~ s/\$number_of_columns/$number_of_columns/g;
+ my $copyright = ©right_line();
if ($selectionmade eq '1' || $answer_mode eq 'only') {
- $result =~ s/(\\end{document})/\\strut\\vskip 0 mm\\noindent\\makebox\[\\textwidth\/$number_of_columns\]\[b\]{\\hrulefill}\\newline\\noindent\\tiny Printed from LON-CAPA\\copyright MSU{\\hfill} Licensed under GNU General Public License $1/;
+ $result =~ s/(\\end{document})/\\strut\\vskip 0 mm $copyright $end_of_student $1/;
} else {
- $result =~ s/(\\end{document})/\\strut\\vspace\*{-4 mm}\\newline\\noindent\\makebox\[\\textwidth\/$number_of_columns\]\[b\]{\\hrulefill}\\newline\\noindent\\tiny Printed from LON-CAPA\\copyright MSU{\\hfill} Licensed under GNU General Public License $1/;
+ $result =~ s/(\\end{document})/\\strut\\vspace\*{-4 mm}\\newline $copyright $end_of_student $1/;
}
+ $result =~ s/\$number_of_columns/$number_of_columns/g;
$result =~ s/(\\end{longtable}\s*)(\\strut\\newline\\noindent\\makebox\[\\textwidth\/$number_of_columns\]\[b\]{\\hrulefill})/$2$1/g;
$result =~ s/(\\end{longtable}\s*)\\strut\\newline/$1/g;
#-- LaTeX corrections
@@ -857,7 +995,7 @@ sub IndexCreation {
sub print_latex_header {
my $mode=shift;
- my $output='\documentclass[letterpaper,twoside]{article}';
+ my $output='\documentclass[letterpaper,twoside]{article}\raggedbottom';
if (($mode eq 'batchmode') || (!$perm{'pav'})) {
$output.='\batchmode';
}
@@ -1021,10 +1159,112 @@ sub get_page_breaks {
return %page_breaks;
}
+# Output a sequence (recursively if neeed)
+# from construction space.
+# Parameters:
+# url = URL of the sequence to print.
+# helper - Reference to the helper hash.
+# form - Copy of the format hash.
+# LaTeXWidth
+# Returns:
+# Text to add to the printout.
+# NOTE if the first element of the outermost sequence
+# is itself a sequence, the outermost caller may need to
+# prefix the latex with the page headers stuff.
+#
+sub print_construction_sequence {
+ my ($currentURL, $helper, %form, $LaTeXwidth) = @_;
+ my $result;
+ my $rndseed=time;
+ if ($helper->{'VARS'}->{'curseed'}) {
+ $rndseed=$helper->{'VARS'}->{'curseed'};
+ }
+ my $errtext=&LONCAPA::map::mapread($currentURL);
+ #
+ # These make this all support recursing for subsequences.
+ #
+ my @order = @LONCAPA::map::order;
+ my @resources = @LONCAPA::map::resources;
+ for (my $member=0;$member<=$#order;$member++) {
+ $resources[$order[$member]]=~/^([^:]*):([^:]*):/;
+ my $urlp=$2;
+ if ($urlp=~/\.(problem|exam|quiz|assess|survey|form|library|xml|html|htm|xhtml|xhtm)$/) {
+ my $texversion='';
+ if ($helper->{'VARS'}->{'ANSWER_TYPE'} ne 'only') {
+ $form{'problem_split'}=$parmhash{'problem_stream_switch'};
+ $form{'suppress_tries'}=$parmhash{'suppress_tries'};
+ $form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
+ $form{'rndseed'}=$rndseed;
+ $resources_printed .=$urlp.':';
+ $texversion=&Apache::lonnet::ssi($urlp,%form);
+ }
+ if((($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
+ ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) &&
+ ($urlp=~/\.(problem|exam|quiz|assess|survey|form|library|page)$/)) {
+ # Don't permanently modify %$form...
+ my %answerform = %form;
+ $answerform{'grade_target'}='answer';
+ $answerform{'answer_output_mode'}='tex';
+ $answerform{'rndseed'}=$rndseed;
+ $answerform{'problem_split'}=$parmhash{'problem_stream_switch'};
+ if ($urlp=~/\/res\//) {$env{'request.state'}='published';}
+ $resources_printed .= $urlp.':';
+ my $answer=&Apache::lonnet::ssi($urlp,%answerform);
+ if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
+ $texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
+ } else {
+ # If necessary, encapsulate answer in minipage:
+
+ $texversion=&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
+ my $title = &Apache::lonnet::gettitle($helper->{'VARS'}->{'symb'});
+ $title = &Apache::lonxml::latex_special_symbols($title);
+ my $body ='\vskip 0 mm \noindent\textbf{'.$title.'}\vskip 0 mm ';
+ $body.=&path_to_problem($urlp,$LaTeXwidth);
+ $body.='\vskip 1 mm '.$answer.'\end{document}';
+ $body = &encapsulate_minipage($body);
+ $texversion.=$body;
+ }
+ }
+ $texversion = &latex_header_footer_remove($texversion);
+
+ if ($helper->{'VARS'}->{'TABLE_INDEX'} eq 'yes') {
+ $texversion=&IndexCreation($texversion,$urlp);
+ }
+ if ($helper->{'VARS'}->{'CONSTR_RESOURSE_URL'} eq 'yes') {
+ $texversion=~s/(\\addcontentsline\{toc\}\{subsection\}\{[^\}]*\})/$1 URL: \\verb|$urlp| \\strut\\\\\\strut /;
+ }
+ $result.=$texversion;
+
+ } elsif ($urlp=~/\.(sequence|page)$/) {
+
+ # header:
+
+ $result.='\strut\newline\noindent Sequence/page '.$urlp.'\strut\newline\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}\newline\noindent ';
+
+ # IF sequence, recurse:
+
+ if ($urlp =~ /\.sequence$/) {
+ my $sequence_url = $urlp;
+ my $domain = $env{'user.domain'}; # Constr. space only on local
+ my $user = $env{'user.name'};
+
+ $sequence_url =~ s/^\/res\/$domain/\/home/;
+ $sequence_url =~ s/^(\/home\/$user)/$1\/public_html/;
+# $sequence_url =~ s|\/~([^\/]+)\/|\/home\/$1\/public_html\/|;
+ $result .= &print_construction_sequence($sequence_url,
+ $helper, %form,
+ $LaTeXwidth);
+ }
+ }
+ }
+ if ($helper->{VARS}->{'construction'} eq '1') {$result=~s/(\\begin{document})/$1 \\fbox\{RANDOM SEED IS $rndseed\} /;}
+ return $result;
+}
+
sub output_data {
my ($r,$helper,$rparmhash) = @_;
my %parmhash = %$rparmhash;
- my $resources_printed = '';
+ $resources_printed = '';
my $js = <<ENDPART;
<script type="text/javascript">
var editbrowser;
@@ -1173,7 +1413,9 @@ ENDPART
} else {
$texversion=&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
if ($helper->{'VARS'}->{'construction'} ne '1') {
- $texversion.='\vskip 0 mm \noindent\textbf{'.&Apache::lonnet::gettitle($helper->{'VARS'}->{'symb'}).'}\vskip 0 mm ';
+ my $title = &Apache::lonnet::gettitle($helper->{'VARS'}->{'symb'});
+ $title = &Apache::lonxml::latex_special_symbols($title);
+ $texversion.='\vskip 0 mm \noindent\textbf{'.$title.'}\vskip 0 mm ';
$texversion.=&path_to_problem($cleanURL,$LaTeXwidth);
} else {
$texversion.='\vskip 0 mm \noindent\textbf{Prints from construction space - there is no title.}\vskip 0 mm ';
@@ -1198,70 +1440,15 @@ ENDPART
} elsif ($cleanURL!~m|^/adm/|
&& $currentURL=~/\.sequence$/ && $helper->{'VARS'}->{'construction'} eq '1') {
#printing content of sequence from the construction space
- my $flag_latex_header_remove = 'NO';
- my $rndseed=time;
- if ($helper->{'VARS'}->{'curseed'}) {
- $rndseed=$helper->{'VARS'}->{'curseed'};
- }
$currentURL=~s|\/~([^\/]+)\/|\/home\/$1\/public_html\/|;
- my $errtext=&Apache::lonratedt::mapread($currentURL);
- for (my $member=0;$member<=$#Apache::lonratedt::order;$member++) {
- $Apache::lonratedt::resources[$Apache::lonratedt::order[$member]]=~/^([^:]*):([^:]*):/;
- my $urlp=$2;
- if ($urlp=~/\.(problem|exam|quiz|assess|survey|form|library|xml|html|htm|xhtml|xhtm)$/) {
- my $texversion='';
- if ($helper->{'VARS'}->{'ANSWER_TYPE'} ne 'only') {
- $form{'problem_split'}=$parmhash{'problem_stream_switch'};
- $form{'suppress_tries'}=$parmhash{'suppress_tries'};
- $form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
- $form{'rndseed'}=$rndseed;
- $resources_printed .=$urlp.':';
- $texversion=&Apache::lonnet::ssi($urlp,%form);
- }
- if((($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
- ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) &&
- ($urlp=~/\.(problem|exam|quiz|assess|survey|form|library|page)$/)) {
- # Don't permanently modify %$form...
- my %answerform = %form;
- $answerform{'grade_target'}='answer';
- $answerform{'answer_output_mode'}='tex';
- $answerform{'rndseed'}=$rndseed;
- $answerform{'problem_split'}=$parmhash{'problem_stream_switch'};
- if ($urlp=~/\/res\//) {$env{'request.state'}='published';}
- $resources_printed .= $urlp.':';
- my $answer=&Apache::lonnet::ssi($urlp,%answerform);
- if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
- $texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
- } else {
- # If necessary, encapsulate answer in minipage:
-
- $texversion=&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
- my $body ='\vskip 0 mm \noindent\textbf{'.&Apache::lonnet::gettitle($helper->{'VARS'}->{'symb'}).'}\vskip 0 mm ';
- $body.=&path_to_problem($urlp,$LaTeXwidth);
- $body.='\vskip 1 mm '.$answer.'\end{document}';
- $body = &encapsulate_minipage($body);
- $texversion.=$body;
- }
- }
- if ($flag_latex_header_remove ne 'NO') {
- $texversion = &latex_header_footer_remove($texversion);
- } else {
- $texversion =~ s/\\end{document}//;
- }
- if ($helper->{'VARS'}->{'TABLE_INDEX'} eq 'yes') {
- $texversion=&IndexCreation($texversion,$urlp);
- }
- if ($helper->{'VARS'}->{'CONSTR_RESOURSE_URpL'} eq 'yes') {
- $texversion=~s/(\\addcontentsline\{toc\}\{subsection\}\{[^\}]*\})/$1 URL: \\verb|$urlp| \\strut\\\\\\strut /;
- }
- $result.=$texversion;
- $flag_latex_header_remove = 'YES';
- } elsif ($urlp=~/\.(sequence|page)$/) {
- $result.='\strut\newline\noindent Sequence/page '.$urlp.'\strut\newline\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}\newline\noindent ';
- }
+ $result .= &print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
+ $result .= &print_construction_sequence($currentURL, $helper, %form,
+ $LaTeXwidth);
+ $result .= '\end{document}';
+ if (!($result =~ /\\begin\{document\}/)) {
+ $result = &print_latex_header() . $result;
}
- if ($helper->{VARS}->{'construction'} eq '1') {$result=~s/(\\begin{document})/$1 \\fbox\{RANDOM SEED IS $rndseed\} /;}
- $result .= '\end{document}';
+ # End construction space sequence.
} elsif ($cleanURL=~/\/(smppg|syllabus|aboutme|bulletinboard)$/) {
$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
if ($currentURL=~/\/syllabus$/) {$currentURL=~s/\/res//;}
@@ -1349,7 +1536,9 @@ ENDPART
} else {
if ($urlp=~/\.(problem|exam|quiz|assess|survey|form|library)$/) {
$texversion=&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
- my $body ='\vskip 0 mm \noindent\textbf{'.&Apache::lonnet::gettitle($master_seq[$i]).'}\vskip 0 mm ';
+ my $title = &Apache::lonnet::gettitle($master_seq[$i]);
+ $title = &Apache::lonxml::latex_special_symbols($title);
+ my $body ='\vskip 0 mm \noindent\textbf{'.$title.'}\vskip 0 mm ';
$body .= &path_to_problem ($urlp,$LaTeXwidth);
$body .='\vskip 1 mm '.$answer;
$body = &encapsulate_minipage($body);
@@ -1372,10 +1561,15 @@ ENDPART
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,
+ $assignment,
+ $courseidinfo,
+ $name);
if ($numberofcolumns eq '1') {
- $result .='\newpage \noindent\parbox{\minipagewidth}{\noindent\\lhead{\\textit{\\textbf{'.$name.'}}'.$courseidinfo.' \\hfill \\thepage \\\\ \\textit{'.$assignment.'}}} \vskip 5 mm ';
+ $result .='\newpage \noindent\parbox{\minipagewidth}{\noindent\\lhead{'.$header_text.'}} \vskip 5 mm ';
} else {
- $result .='\newpage \noindent\parbox{\minipagewidth}{\noindent\\fancyhead[LO]{\\textit{\\textbf{'.$name.'}}'.$courseidinfo.' \\hfill \\thepage \\\\ \\textit{'.$assignment.'}}} \vskip 5 mm ';
+ $result .='\newpage \noindent\parbox{\minipagewidth}{\noindent\\fancyhead[LO]{'.$header_text.'}} \vskip 5 mm ';
}
}
$result .= $texversion;
@@ -1562,6 +1756,7 @@ ENDPART
}
my @master_seq=split /\|\|\|/, $helper->{'VARS'}->{'RESOURCES'};
my ($type) = split(/_/,$helper->{'VARS'}->{'PRINT_TYPE'});
+ &adjust_number_to_print($helper);
my $number_per_page=$helper->{'VARS'}->{'NUMBER_TO_PRINT'};
if ($number_per_page eq '0' || $number_per_page eq 'all') {
$number_per_page=$num_todo;
@@ -1667,18 +1862,12 @@ ENDPART
$result = &page_format_transformation($papersize,$laystyle,$numberofcolumns,$helper->{'VARS'}->{'PRINT_TYPE'},$result,$helper->{VARS}->{'assignment'},$helper->{'VARS'}->{'TABLE_CONTENTS'},$helper->{'VARS'}->{'TABLE_INDEX'},$selectionmade);
$result = &latex_corrections($number_of_columns,$result,$selectionmade,
$helper->{'VARS'}->{'ANSWER_TYPE'});
- for (my $i=1;$i<=$#print_array;$i++) {
- $print_array[$i] =
- &latex_corrections($number_of_columns,$print_array[$i],
- $selectionmade,
- $helper->{'VARS'}->{'ANSWER_TYPE'});
- }
-
- $result =~ s/\\textwidth\s*=\s*-?\d*\.?\d*\s*(cm|mm|in)/\\textwidth= $helper->{'VARS'}->{'pagesize.width'} $helper->{'VARS'}->{'pagesize.widthunit'} /;
- $result =~ s/\\textheight\s*=?\s*-?\d*\.?\d*\s*(cm|mm|in)/\\textheight $helper->{'VARS'}->{'pagesize.height'} $helper->{'VARS'}->{'pagesize.heightunit'} /;
- $result =~ s/\\evensidemargin\s*=\s*-?\d*\.?\d*\s*(cm|mm|in)/\\evensidemargin= $helper->{'VARS'}->{'pagesize.lmargin'} $helper->{'VARS'}->{'pagesize.lmarginunit'} /;
- $result =~ s/\\oddsidemargin\s*=\s*-?\d*\.?\d*\s*(cm|mm|in)/\\oddsidemargin= $helper->{'VARS'}->{'pagesize.lmargin'} $helper->{'VARS'}->{'pagesize.lmarginunit'} /;
-
+ #if ($numberofcolumns == 1) {
+ $result =~ s/\\textwidth\s*=\s*-?\d*\.?\d*\s*(cm|mm|in)/\\textwidth= $helper->{'VARS'}->{'pagesize.width'} $helper->{'VARS'}->{'pagesize.widthunit'} /;
+ $result =~ s/\\textheight\s*=?\s*-?\d*\.?\d*\s*(cm|mm|in)/\\textheight $helper->{'VARS'}->{'pagesize.height'} $helper->{'VARS'}->{'pagesize.heightunit'} /;
+ $result =~ s/\\evensidemargin\s*=\s*-?\d*\.?\d*\s*(cm|mm|in)/\\evensidemargin= $helper->{'VARS'}->{'pagesize.lmargin'} $helper->{'VARS'}->{'pagesize.lmarginunit'} /;
+ $result =~ s/\\oddsidemargin\s*=\s*-?\d*\.?\d*\s*(cm|mm|in)/\\oddsidemargin= $helper->{'VARS'}->{'pagesize.lmargin'} $helper->{'VARS'}->{'pagesize.lmarginunit'} /;
+ #}
#-- writing .tex file in prtspool
my $temp_file;
@@ -1699,9 +1888,15 @@ ENDPART
if ($i==0) {
$print_array[$i]=$result;
} else {
+ $print_array[$i].='\end{document}';
+ $print_array[$i] =
+ &latex_corrections($number_of_columns,$print_array[$i],
+ $selectionmade,
+ $helper->{'VARS'}->{'ANSWER_TYPE'});
+
my $anobegin=index($print_array[$i],'\setcounter{page}',0);
substr($print_array[$i],0,$anobegin)='';
- $print_array[$i]=$inc.$print_array[$i].'\end{document}';
+ $print_array[$i]=$inc.$print_array[$i];
}
my $temp_file;
my $newfilename=$filename;
@@ -1798,9 +1993,9 @@ sub print_resources {
my $printed = '';
my ($username,$userdomain,$usersection) = split /:/,$person;
my $fullname = &get_name($username,$userdomain);
- my $namepostfix;
+ my $namepostfix = "\\\\"; # Both anon and not anon should get the same vspace.
if ($person =~ 'anon') {
- $namepostfix="\\\\Name: ";
+ $namepostfix .="Name: ";
$fullname = "CODE - ".$moreenv->{'CODE'};
}
# Fullname may have special latex characters that need \ prefixing:
@@ -1812,8 +2007,7 @@ sub print_resources {
&Apache::lonxml::clear_problem_counter();
my %page_breaks = &get_page_breaks($helper);
- my @format_array = split(/\|/,$helper->{'VARS'}->{'FORMAT'});
- my $columns_in_format = $format_array[1];
+ my $columns_in_format = (split(/\|/,$helper->{'VARS'}->{'FORMAT'}))[1];
#
# end each student with a
# Special that allows the post processor to even out the page
@@ -1861,8 +2055,10 @@ sub print_resources {
my $header =&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
- my $body ='\vskip 0 mm \noindent\textbf{'.&Apache::lonnet::gettitle($curresline).'}\vskip 0 mm ';
- $body .=&path_to_problem($res_url,$LaTeXwidth);
+ my $title = &Apache::lonnet::gettitle($curresline);
+ $title = &Apache::lonxml::latex_special_symbols($title);
+ my $body ='\vskip 0 mm \noindent\textbf{'.$title.'}\vskip 0 mm ';
+ $body .=&path_to_problem($res_url,$LaTeXwidth);
$body .='\vskip 1 mm '.$ansrendered;
$body = &encapsulate_minipage($body);
$rendered = $header.$body;
@@ -1903,26 +2099,27 @@ sub print_resources {
if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }
if ($usersection ne '') {$courseidinfo.=' - Sec. '.$usersection}
my $currentassignment=&Apache::lonxml::latex_special_symbols($helper->{VARS}->{'assignment'},'header');
- if ($current_output=~/\\documentclass/) {
- if ($columns_in_format == 1) {
- $current_output =~ s/\\begin{document}/\\setlength{\\topmargin}{1cm} \\begin{document}\\noindent\\parbox{\\minipagewidth}{\\noindent\\lhead{\\textit{\\textbf{$fullname}}$courseidinfo \\hfill \\thepage \\\\ \\textit{$currentassignment}$namepostfix}}\\vskip 5 mm /;
- } else {
- $current_output =~ s/\\begin{document}/\\setlength{\\topmargin}{1cm} \\begin{document}\\noindent\\parbox{\\minipagewidth}{\\noindent\\fancyhead[LO]{\\textit{\\textbf{$fullname}}$courseidinfo \\hfill \\thepage \\\\ \\textit{$currentassignment}$namepostfix}}\\vskip 5 mm /;
+ my $header_line =
+ &format_page_header($LaTeXwidth, $parmhash{'print_header_format'},
+ $currentassignment, $courseidinfo, $fullname);
+ my $header_start = ($columns_in_format == 1) ? '\lhead'
+ : '\fancyhead[LO]';
+ $header_line = $header_start.'{'.$header_line.'}';
- }
+ if ($current_output=~/\\documentclass/) {
+ $current_output =~ s/\\begin{document}/\\setlength{\\topmargin}{1cm} \\begin{document}\\noindent\\parbox{\\minipagewidth}{\\noindent$header_line$namepostfix}\\vskip 5 mm /;
} else {
- my $blankpages = '';
- for (my $j=0;$j<$helper->{'VARS'}->{'EMPTY_PAGES'};$j++) {$blankpages.='\clearpage\strut\clearpage';}
- if ($columns_in_format == 1) {
- $current_output = '\strut\vspace*{-6 mm}\\newline\\noindent\\makebox[\\textwidth/$number_of_columns][b]{\\hrulefill}\vspace*{-2 mm}\\newline\\noindent{\\tiny Printed from LON-CAPA\\copyright MSU{\\hfill} Licensed under GNU General Public License }\\newpage '.$blankpages.'\setcounter{page}{1}\noindent\parbox{\minipagewidth}{\noindent\\lhead{\\textit{\\textbf{'.$fullname.'}}'.$courseidinfo.' \\hfill \\thepage \\\\ \\textit{'.$currentassignment.'}'.$namepostfix.'}} \vskip 5 mm '.$current_output;
- } else {
- $current_output = '\strut\vspace*{-6 mm}\\newline\\noindent\\makebox[\\textwidth/$number_of_columns][b]{\\hrulefill}\vspace*{-2 mm}\\newline\\noindent{\\tiny Printed from LON-CAPA\\copyright MSU{\\hfill} Licensed under GNU General Public License }\\newpage '.$blankpages.'\setcounter{page}{1}\noindent\parbox{\minipagewidth}{\noindent\\fancyhead[LO]{\\textit{\\textbf{'.$fullname.'}}'.$courseidinfo.' \\hfill \\thepage \\\\ \\textit{'.$currentassignment.'}'.$namepostfix.'}} \vskip 5 mm '.$current_output;
- }
+ my $blankpages =
+ '\clearpage\strut\clearpage'x$helper->{'VARS'}->{'EMPTY_PAGES'};
+
+ $current_output = '\strut\vspace*{-6 mm}\\newline'.
+ ©right_line().' \newpage '.$blankpages.$end_of_student.
+ '\setcounter{page}{1}\noindent\parbox{\minipagewidth}{\noindent'.
+ $header_line.$namepostfix.'} \vskip 5 mm '.$current_output;
}
#
# Close the student bracketing.
#
- $current_output .= "\n\\special{ps:ENDOFSTUDENTSTAMP}\n";
return ($current_output,$fullname, $printed);
}
@@ -1941,7 +2138,7 @@ sub handler {
}
- my %parmhash=&Apache::lonnet::coursedescription($env{'request.course.id'});
+ %parmhash=&Apache::lonnet::coursedescription($env{'request.course.id'});
@@ -1976,7 +2173,7 @@ sub init_perm {
$perm{'pav'}=&Apache::lonnet::allowed('pav',
$env{'request.course.id'}.'/'.$env{'request.course.sec'});
}
- $perm{'pfo'}=&Apache::lonnet::allowed('pav',$env{'request.course.id'});
+ $perm{'pfo'}=&Apache::lonnet::allowed('pfo',$env{'request.course.id'});
if (!$perm{'pfo'}) {
$perm{'pfo'}=&Apache::lonnet::allowed('pfo',
$env{'request.course.id'}.'/'.$env{'request.course.sec'});
@@ -2024,6 +2221,7 @@ sub printHelper {
$helper->declareVar('FINISHPAGE');
$helper->declareVar('PRINT_TYPE');
$helper->declareVar("showallfoils");
+ $helper->declareVar("STUDENTS");
# The page breaks can get loaded initially from the course environment:
# But we only do this in the initial state so that they are allowed to change.
@@ -2035,6 +2233,8 @@ sub printHelper {
{'pagebreaks' => 'scalar',
'lastprinttype' => 'scalar'});
+ # This will persistently load in the data we want from the
+ # very first screen.
if($helper->{VARS}->{PRINT_TYPE} eq $env{'form.lastprinttype'}) {
if (!defined ($env{"form.CURRENT_STATE"})) {
@@ -2049,9 +2249,7 @@ sub printHelper {
}
-
- # This will persistently load in the data we want from the
- # very first screen.
+
# Detect whether we're coming from construction space
if ($env{'form.postdata'}=~/^(?:http:\/\/[^\/]+\/|\/|)\~([^\/]+)\/(.*)$/) {
$helper->{VARS}->{'filename'} = "~$1/$2";
@@ -2059,6 +2257,9 @@ sub printHelper {
} else {
if ($env{'form.postdata'}) {
$helper->{VARS}->{'symb'} = &Apache::lonnet::symbread($env{'form.postdata'});
+ if ( $helper->{VARS}->{'symb'} eq '') {
+ $helper->{VARS}->{'postdata'} = $env{'form.postdata'};
+ }
}
if ($env{'form.symb'}) {
$helper->{VARS}->{'symb'} = $env{'form.symb'};
@@ -2086,6 +2287,7 @@ sub printHelper {
my $symb = $helper->{VARS}->{'symb'};
my ($map, $id, $url);
my $subdir;
+ my $is_published=0; # True when printing from resource space.
# Get the resource name from construction space
if ($helper->{VARS}->{'construction'}) {
@@ -2094,9 +2296,15 @@ sub printHelper {
$subdir = substr($helper->{VARS}->{'filename'},
0, rindex($helper->{VARS}->{'filename'}, '/') + 1);
} else {
- ($map, $id, $url) = &Apache::lonnet::decode_symb($symb);
- $helper->{VARS}->{'postdata'} =
- &Apache::lonenc::check_encrypt(&Apache::lonnet::clutter($url));
+ if ($symb ne '') {
+ ($map, $id, $url) = &Apache::lonnet::decode_symb($symb);
+ $helper->{VARS}->{'postdata'} =
+ &Apache::lonenc::check_encrypt(&Apache::lonnet::clutter($url));
+ } else {
+ $url = $helper->{VARS}->{'postdata'};
+ $is_published=1; # From resource space.
+ }
+ $url = &Apache::lonnet::clutter($url);
if (!$resourceTitle) { # if the resource doesn't have a title, use the filename
my $postdata = $helper->{VARS}->{'postdata'};
@@ -2117,11 +2325,6 @@ sub printHelper {
# "Delete everything after the last slash."
$subdir =~ s|/[^/]+$||;
- if (not $helper->{VARS}->{'construction'}) {
- $subdir=$Apache::lonnet::perlvar{'lonDocRoot'}.'/res/'.$subdir;
- }
- # "Remove all duplicate slashes."
- $subdir =~ s|/+|/|g;
# What can be printed is a very dynamic decision based on
# lots of factors. So we need to dynamically build this list.
@@ -2138,7 +2341,7 @@ sub printHelper {
my $paramHash;
if ($resourceTitle) {
- push @{$printChoices}, ["<b><i>$resourceTitle</i></b> (".&mt('what you just saw on the screen').")", 'current_document', 'PAGESIZE'];
+ push @{$printChoices}, ["<b><i>$resourceTitle</i></b> (".&mt('the resource you just saw on the screen').")", 'current_document', 'PAGESIZE'];
}
# Useful filter strings
@@ -2153,40 +2356,44 @@ sub printHelper {
$helper->declareVar('SEQUENCE');
+ # If we're in a sequence...
+ my $start_new_option;
+ if ($perm{'pav'}) {
+ $start_new_option =
+ "<option text='".&mt('Start new page<br />before selected').
+ "' variable='FINISHPAGE' />";
+ }
- # If we're in a sequence...
- if (($helper->{'VARS'}->{'construction'} ne '1') &&
+ if (($helper->{'VARS'}->{'construction'} ne '1' ) &&
$helper->{VARS}->{'postdata'} &&
$helper->{VARS}->{'assignment'}) {
# Allow problems from sequence
- push @{$printChoices}, ["<b>".&mt('Problems')."</b> ".&mt('in')." <b><i>$sequenceTitle</i></b>", 'map_problems', 'CHOOSE_PROBLEMS'];
+ push @{$printChoices}, [&mt('Selected <b>Problems</b> in folder <b><i>[_1]</i></b>',$sequenceTitle), 'map_problems', 'CHOOSE_PROBLEMS'];
# Allow all resources from sequence
- push @{$printChoices}, ["<b>".&mt('Resources')."</b> ".&mt('in')." <b><i>$sequenceTitle</i></b>", 'map_problems_pages', 'CHOOSE_PROBLEMS_HTML'];
+ push @{$printChoices}, [&mt('Selected <b>Resources</b> in folder <b><i>[_1]</i></b>',$sequenceTitle), 'map_problems_pages', 'CHOOSE_PROBLEMS_HTML'];
my $helperFragment = <<HELPERFRAGMENT;
<state name="CHOOSE_PROBLEMS" title="Select Problem(s) to print">
- <message>(mark them then click "next" button) <br /></message>
<resource variable="RESOURCES" multichoice="1" toponly='1' addstatus="1"
closeallpages="1">
<nextstate>PAGESIZE</nextstate>
<filterfunc>return $isProblem;</filterfunc>
<mapurl>$map</mapurl>
<valuefunc>return $symbFilter;</valuefunc>
- <option text='Newpage' variable='FINISHPAGE' />
+ $start_new_option
</resource>
</state>
<state name="CHOOSE_PROBLEMS_HTML" title="Select Resource(s) to print">
- <message>(mark them then click "next" button) <br /></message>
<resource variable="RESOURCES" multichoice="1" toponly='1' addstatus="1"
closeallpages="1">
<nextstate>PAGESIZE</nextstate>
<filterfunc>return $isNotMap;</filterfunc>
<mapurl>$map</mapurl>
<valuefunc>return $symbFilter;</valuefunc>
- <option text='Newpage' variable='FINISHPAGE' />
+ $start_new_option
</resource>
</state>
HELPERFRAGMENT
@@ -2196,38 +2403,36 @@ HELPERFRAGMENT
# If the user has pfo (print for otheres) allow them to print all
# problems and resources in the entier course, optionally for selected students
- if ($perm{'pfo'} &&
+ if ($perm{'pfo'} && !$is_published &&
($helper->{VARS}->{'postdata'}=~/\/res\// || $helper->{VARS}->{'postdata'}=~/\/(syllabus|smppg|aboutme|bulletinboard)$/)) {
- push @{$printChoices}, ['<b>Problems</b> from <b>entire course</b>', 'all_problems', 'ALL_PROBLEMS'];
- push @{$printChoices}, ['<b>Resources</b> from <b>entire course</b>', 'all_resources', 'ALL_RESOURCES'];
+ push @{$printChoices}, ['Selected <b>Problems</b> from <b>entire course</b>', 'all_problems', 'ALL_PROBLEMS'];
+ push @{$printChoices}, ['Selected <b>Resources</b> from <b>entire course</b>', 'all_resources', 'ALL_RESOURCES'];
&Apache::lonxml::xmlparse($r, 'helper', <<ALL_PROBLEMS);
<state name="ALL_PROBLEMS" title="Select Problem(s) to print">
- <message>(mark them then click "next" button) <br /></message>
<resource variable="RESOURCES" toponly='0' multichoice="1"
suppressEmptySequences='0' addstatus="1" closeallpages="1">
<nextstate>PAGESIZE</nextstate>
<filterfunc>return $isProblemOrMap;</filterfunc>
<choicefunc>return $isNotMap;</choicefunc>
<valuefunc>return $symbFilter;</valuefunc>
- <option text='Newpage' variable='FINISHPAGE' />
+ $start_new_option
</resource>
</state>
<state name="ALL_RESOURCES" title="Select Resource(s) to print">
- <message>(Mark them then click "next" button) <br /> </message>
<resource variable="RESOURCES" toponly='0' multichoice='1'
suppressEmptySequences='0' addstatus='1' closeallpages='1'>
<nextstate>PAGESIZE</nextstate>
<filterfunc>return $isNotMap; </filterfunc>
<valuefunc>return $symbFilter;</valuefunc>
- <option text='NewPage' variable='FINISHPAGE' />
+ $start_new_option
</resource>
</state>
ALL_PROBLEMS
if ($helper->{VARS}->{'assignment'}) {
- push @{$printChoices}, ["<b>".&mt('Problems')."</b> ".&mt('from')." <b><i>$sequenceTitle</i></b> ".&mt('for')." <b>".&mt('selected students')."</b>", 'problems_for_students', 'CHOOSE_STUDENTS'];
- push @{$printChoices}, ["<b>".&mt('Problems')."</b> ".&mt('from')." <b><i>$sequenceTitle</i></b> ".&mt('for')." <b>".&mt('anonymous students')."</b>", 'problems_for_anon', 'CHOOSE_ANON1'];
+ push @{$printChoices}, [&mt("Selected <b>Problems</b> from folder <b><i>[_1]</i></b> for <b>selected people</b>",$sequenceTitle), 'problems_for_students', 'CHOOSE_STUDENTS'];
+ push @{$printChoices}, [&mt("Selected <b>Problems</b> from folder <b><i>[_1]</i></b> for <b>CODEd assignments</b>",$sequenceTitle), 'problems_for_anon', 'CHOOSE_ANON1'];
}
# resource_selector will hold a few states that:
@@ -2248,7 +2453,7 @@ ALL_PROBLEMS
<filterfunc>return $isProblem;</filterfunc>
<mapurl>$map</mapurl>
<valuefunc>return $symbFilter;</valuefunc>
- <option text='New Page' variable='FINISHPAGE' />
+ $start_new_option
</resource>
</state>
<state name="PRINT_FORMATTING" title="How should results be printed?">
@@ -2273,7 +2478,7 @@ RESOURCE_SELECTOR
&Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_STUDENTS);
<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'>
<choice computer='0'>Sort by section then student</choice>
<choice computer='1'>Sort by students across sections.</choice>
@@ -2304,7 +2509,7 @@ CHOOSE_STUDENTS
}
}
- my $code_selection = "<choice></choice>\n";
+ my $code_selection;
foreach my $code (sort {uc($a) cmp uc($b)} (keys(%codes_to_print))) {
my $choice = $code;
if ($code =~ /^[A-Z]+$/) { # Alpha code
@@ -2314,14 +2519,15 @@ CHOOSE_STUDENTS
}
if (%codes_to_print) {
$code_selection .='
- <message><b>Choose single code from list</b></message>
+ <message><b>Choose single CODE from list:</b></message>
<message></td><td></message>
- <choices variable="CODE_SELECTED_FROM_LIST" multichoice="0" allowempty="0">
+ <dropdown variable="CODE_SELECTED_FROM_LIST" multichoice="0" allowempty="0">
+ <choice></choice>
<exec>
push(@{$state->{CHOICES}},@{$helper->{DATA}{ALL_CODE_CHOICES}});
</exec>
- </choices>
- <message></td></tr><tr><td colspan="2"><hr width=\'33%\' /></td></tr><tr><td></message>
+ </dropdown>
+ <message></td></tr><tr><td></message>
'.$/;
}
@@ -2341,9 +2547,12 @@ CHOOSE_STUDENTS
$codechoice='<choice computer="default">Default</choice>';
}
&Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_ANON1);
- <state name="CHOOSE_ANON1" title="Select Students and Resources">
+ <state name="CHOOSE_ANON1" title="Specify CODEd Assignments">
<nextstate>SELECT_PROBLEMS</nextstate>
- <message><table><tr><td><b>Number of anonymous assignments to print:</b></td><td></message>
+ <message><h4>Fill out one of the forms below</h4></message>
+ <message><br /><hr /> <br /></message>
+ <message><h3>Generate new CODEd Assignments</h3></message>
+ <message><table><tr><td><b>Number of CODEd assignments to print:</b></td><td></message>
<string variable="NUMBER_TO_PRINT_TOTAL" maxlength="5" size="5">
<validator>
if (((\$helper->{'VARS'}{'NUMBER_TO_PRINT_TOTAL'}+0) < 1) &&
@@ -2365,9 +2574,10 @@ CHOOSE_STUDENTS
<dropdown variable="CODE_OPTION" multichoice="0" allowempty="0">
$codechoice
</dropdown>
- <message></td></tr><tr><td colspan="2"><hr width='33%' /></td></tr><tr><td></message>
- <message></td></tr><tr><td></message>
- <message><b>Enter a CODE to print:</b></td><td></message>
+ <message></td></tr><tr><td colspan="2"></td></tr><tr><td></message>
+ <message></td></tr><tr><td></table></message>
+ <message><br /><hr /><h3>Print a Specific CODE </h3><br /><table></message>
+ <message><tr><td><b>Enter a CODE to print:</b></td><td></message>
<string variable="SINGLE_CODE" size="10">
<validator>
if(!\$helper->{'VARS'}{'NUMBER_TO_PRINT_TOTAL'} &&
@@ -2380,25 +2590,24 @@ CHOOSE_STUDENTS
}
</validator>
</string>
- <message></td></tr><tr><td colspan="2"><hr width='33%' /></td></tr><tr><td></message>
+ <message></td></tr><tr><td></message>
$code_selection
-
-
- <message><b>Reprint a set of saved CODEs:</b></message>
+ <message></td></tr></table></message>
+ <message><hr /><h3>Reprint a Set of Saved CODEs</h3><table><tr><td></message>
+ <message><b>Select saved CODEs:</b></message>
<message></td><td></message>
<dropdown variable="REUSE_OLD_CODES">
$namechoice
</dropdown>
<message></td></tr></table></message>
- <message><hr width='33%' /></message>
</state>
$resource_selector
CHOOSE_ANON1
if ($helper->{VARS}->{'assignment'}) {
- push @{$printChoices}, ["<b>".&mt('Resources')."</b> ".&mt('from')." <b><i>$sequenceTitle</i></b> ".&mt('for')." <b>".&mt('selected students')."</b>", 'resources_for_students', 'CHOOSE_STUDENTS1'];
- push @{$printChoices}, ["<b>".&mt('Resources')."</b> ".&mt('from')." <b><i>$sequenceTitle</i></b> ".&mt('for')." <b>".&mt('anonymous students')."</b>", 'resources_for_anon', 'CHOOSE_ANON2'];
+ push @{$printChoices}, [&mt("Selected <b>Resources</b> from folder <b><i>[_1]</i></b> for <b>selected people</b>",$sequenceTitle), 'resources_for_students', 'CHOOSE_STUDENTS1'];
+ push @{$printChoices}, [&mt("Selected <b>Resources</b> from folder <b><i>[_1]</i></b> for <b>CODEd assignments</b>",$sequenceTitle), 'resources_for_anon', 'CHOOSE_ANON2'];
}
@@ -2411,7 +2620,7 @@ CHOOSE_ANON1
<filterfunc>return $isNotMap;</filterfunc>
<mapurl>$map</mapurl>
<valuefunc>return $symbFilter;</valuefunc>
- <option text='Newpage' variable='FINISHPAGE' />
+ $start_new_option
</resource>
</state>
<state name="PRINT_FORMATTING" title="Format of the print job">
@@ -2449,9 +2658,12 @@ RESOURCE_SELECTOR
CHOOSE_STUDENTS1
&Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_ANON2);
- <state name="CHOOSE_ANON2" title="Select Students and Resources">
+ <state name="CHOOSE_ANON2" title="Select CODEd Assignments">
<nextstate>SELECT_RESOURCES</nextstate>
- <message><table><tr><td><b>Number of anonymous assignments to print:</b></td><td></message>
+ <message><h4>Fill out one of the forms below</h4></message>
+ <message><br /><hr /> <br /></message>
+ <message><h3>Generate new CODEd Assignments</h3></message>
+ <message><table><tr><td><b>Number of CODEd assignments to print:</b></td><td></message>
<string variable="NUMBER_TO_PRINT_TOTAL" maxlength="5" size="5">
<validator>
if (((\$helper->{'VARS'}{'NUMBER_TO_PRINT_TOTAL'}+0) < 1) &&
@@ -2473,9 +2685,9 @@ CHOOSE_STUDENTS1
<dropdown variable="CODE_OPTION" multichoice="0" allowempty="0">
$codechoice
</dropdown>
- <message></td></tr><tr><td colspan="2"><hr width='33%' /></td></tr><tr><td></message>
- <message></td></tr><tr><td></message>
- <message><b>Enter a CODE to print:</b></td><td></message>
+ <message></td></tr><tr><td></table></message>
+ <message><br /><hr /><h3>Print a Specific CODE </h3><br /><table></message>
+ <message><tr><td><b>Enter a CODE to print:</b></td><td></message>
<string variable="SINGLE_CODE" size="10">
<validator>
if(!\$helper->{'VARS'}{'NUMBER_TO_PRINT_TOTAL'} &&
@@ -2488,28 +2700,38 @@ CHOOSE_STUDENTS1
}
</validator>
</string>
- <message></td></tr><tr><td colspan="2"><hr width='33%' /></td></tr><tr><td></message>
+ <message></td></tr><tr><td></message>
$code_selection
- <message><b>Reprint a set of saved CODEs:</b></message>
+ <message></td></tr></table></message>
+ <message><hr /><h3>Reprint a Set of Saved CODEs</h3><table><tr><td></message>
+ <message><b>Select saved CODEs:</b></message>
<message></td><td></message>
<dropdown variable="REUSE_OLD_CODES">
$namechoice
</dropdown>
<message></td></tr></table></message>
- <message><hr width='33%' /></message>
</state>
$resource_selector
CHOOSE_ANON2
}
# FIXME: That RE should come from a library somewhere.
- if ((((&Apache::lonnet::allowed('bre',$subdir) eq 'F') and ($helper->{VARS}->{'postdata'}=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)/)) or defined $helper->{'VARS'}->{'construction'}) and $perm{'pav'} and $subdir ne $Apache::lonnet::perlvar{'lonDocRoot'}.'/res/') {
- push @{$printChoices}, ["<b>".&mt('Problems')."</b> ".&mt('from current subdirectory')." <b><i>$subdir</i></b>", 'problems_from_directory', 'CHOOSE_FROM_SUBDIR'];
+ if (($perm{'pav'}
+ && $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 $f = '$filename';
+ my $pretty_dir = &Apache::lonnet::hreflocation($subdir);
+ push @{$printChoices}, [&mt("Selected <b>Problems</b> from current subdirectory <b><i>[_1]</i></b>",$pretty_dir), 'problems_from_directory', 'CHOOSE_FROM_SUBDIR'];
my $xmlfrag = <<CHOOSE_FROM_SUBDIR;
- <state name="CHOOSE_FROM_SUBDIR" title="Select File(s) from <b><small>$subdir</small></b> to print">
- <message>(mark them then click "next" button) <br /></message>
+ <state name="CHOOSE_FROM_SUBDIR" title="Select File(s) from <b><small>$pretty_dir</small></b> to print">
+
<files variable="FILES" multichoice='1'>
<nextstate>PAGESIZE</nextstate>
<filechoice>return '$subdir';</filechoice>
@@ -2529,8 +2751,8 @@ CHOOSE_FROM_SUBDIR
# Allow the user to select any sequence in the course, feed it to
# another resource selector for that sequence
- if (!$helper->{VARS}->{'construction'}) {
- push @$printChoices, ["<b>Resources</b> from <b>selected sequence</b> in course",
+ if (!$helper->{VARS}->{'construction'} && !$is_published) {
+ push @$printChoices, ["Selected <b>Resources</b> from <b>selected folder</b> in course",
'select_sequences', 'CHOOSE_SEQUENCE'];
my $escapedSequenceName = $helper->{VARS}->{'SEQUENCE'};
#Escape apostrophes and backslashes for Perl
@@ -2552,10 +2774,10 @@ CHOOSE_FROM_SUBDIR
<resource variable="RESOURCES" multichoice="1" toponly='1' addstatus="1"
closeallpages="1">
<nextstate>PAGESIZE</nextstate>
- <filterfunc>return $isProblem</filterfunc>
+ <filterfunc>return $isNotMap</filterfunc>
<mapurl evaluate='1'>return '$escapedSequenceName';</mapurl>
<valuefunc>return $symbFilter;</valuefunc>
- <option text='Newpage' variable='FINISHPAGE' />
+ $start_new_option
</resource>
</state>
CHOOSE_FROM_ANY_SEQUENCE
@@ -2881,10 +3103,10 @@ sub new {
# $helper->{VARS} to figure out whether the columns are one or two
$self->{'formatvar'} = shift;
- # The state to transition to after selection, or after discovering
- # the cols are not set to 1
+
$self->{NEXTSTATE} = shift;
bless($self);
+
return $self;
}
@@ -2894,67 +3116,142 @@ sub render {
my $result = '';
my $var = $self->{'variable'};
+
+
if (defined $self->{ERROR_MSG}) {
- $result .= '<br /><font color="#FF0000">' . $self->{ERROR_MSG} . '</font><br />';
+ $result .= '<br /><span class="LC_error">' . $self->{ERROR_MSG} . '</span><br />';
}
- my $width = 18;
my $format = $helper->{VARS}->{$self->{'formatvar'}};
- if (substr($format, 2, 1) ne '1') {
- $width = 9;
+
+ # Use format to get sensible defaults for the margins:
+
+
+ my ($laystyle, $cols, $papersize) = split(/\|/, $format);
+ ($papersize) = split(/ /, $papersize);
+
+
+ if ($laystyle eq 'L') {
+ $laystyle = 'album';
+ } else {
+ $laystyle = 'book';
+ }
+
+
+ my %size;
+ ($size{'width_and_units'},
+ $size{'height_and_units'},
+ $size{'margin_and_units'})=
+ &Apache::lonprintout::page_format($papersize, $laystyle, $cols);
+
+ foreach my $dimension ('width','height','margin') {
+ ($size{$dimension},$size{$dimension.'_unit'}) =
+ split(/ +/, $size{$dimension.'_and_units'},2);
+
+ foreach my $unit ('cm','in') {
+ $size{$dimension.'_options'} .= '<option ';
+ if ($size{$dimension.'_unit'} eq $unit) {
+ $size{$dimension.'_options'} .= 'selected="selected" ';
+ }
+ $size{$dimension.'_options'} .= '>'.$unit.'</option>';
+ }
}
+ # Adjust margin for LaTeX margin: .. requires units == cm or in.
+
+ if ($size{'margin_unit'} eq 'in') {
+ $size{'margin'} += 1;
+ } else {
+ $size{'margin'} += 2.54;
+ }
$result .= <<ELEMENTHTML;
-<p>How should the column be formatted?</p>
+
+
+<p>How should each column be formatted?</p>
<table cellpadding='3'>
<tr>
<td align='right'><b>Width</b>:</td>
- <td align='left'><input type='text' name='$var.width' value='$width' size='4'></td>
+ <td align='left'><input type='text' name='$var.width' value="$size{'width'}" size='4' /></td>
<td align='left'>
<select name='$var.widthunit'>
- <option>cm</option><option>in</option>
+ $size{'width_options'}
</select>
</td>
</tr>
<tr>
<td align='right'><b>Height</b>:</td>
- <td align='left'><input type='text' name="$var.height" value="25.9" size='4'></td>
+ <td align='left'><input type='text' name="$var.height" value="$size{'height'}" size='4' /></td>
<td align='left'>
<select name='$var.heightunit'>
- <option>cm</option><option>in</option>
+ $size{'height_options'}
</select>
</td>
</tr>
<tr>
<td align='right'><b>Left margin</b>:</td>
- <td align='left'><input type='text' name='$var.lmargin' value='-1.5' size='4'></td>
+ <td align='left'><input type='text' name='$var.lmargin' value="$size{'margin'}" size='4' /></td>
<td align='left'>
<select name='$var.lmarginunit'>
- <option>cm</option><option>in</option>
+ $size{'margin_options'}
</select>
</td>
</tr>
</table>
-<p>Hint: Some instructors like to leave scratch space for the student by
-making the width much smaller than the width of the page.</p>
+<!--<p>Hint: Some instructors like to leave scratch space for the student by
+making the width much smaller than the width of the page.</p>-->
ELEMENTHTML
return $result;
}
-# If the user didn't select 1 column, skip this state.
+
sub preprocess {
my $self = shift;
my $helper = Apache::lonhelper::getHelper();
my $format = $helper->{VARS}->{$self->{'formatvar'}};
-# if (substr($format, 2, 1) ne '1') {
-# $helper->changeState($self->{NEXTSTATE});
-# }
+
+ # If the user does not have 'pav' privilege, set default widths and
+ # on to the next state right away.
+ #
+ if (!$perm{'pav'}) {
+ my $var = $self->{'variable'};
+ my $format = $helper->{VARS}->{$self->{'formatvar'}};
+
+ my ($laystyle, $cols, $papersize) = split(/\|/, $format);
+ ($papersize) = split(/ /, $papersize);
+
+
+ if ($laystyle eq 'L') {
+ $laystyle = 'album';
+ } else {
+ $laystyle = 'book';
+ }
+ # Figure out some good defaults for the print out and set them:
+
+ my %size;
+ ($size{'width'},
+ $size{'height'},
+ $size{'lmargin'})=
+ &Apache::lonprintout::page_format($papersize, $laystyle, $cols);
+
+ foreach my $dim ('width', 'height', 'lmargin') {
+ my ($value, $units) = split(/ /, $size{$dim});
+
+ $helper->{VARS}->{"$var.".$dim} = $value;
+ $helper->{VARS}->{"$var.".$dim.'unit'} = $units;
+
+ }
+
+
+ # Transition to the next state
+
+ $helper->changeState($self->{NEXTSTATE});
+ }
return 1;
}
@@ -2976,14 +3273,22 @@ sub postprocess {
# /^-?[0-9]+(\.[0-9]*)?$/ -> optional minus, at least on digit, followed
# by an optional period, followed by digits, ending the string
- if ($width !~ /^-?[0-9]+(\.[0-9]*)?$/) {
+ if ($width !~ /^-?[0-9]*(\.[0-9]*)?$/) {
$error .= "Invalid width; please type only a number.<br />\n";
}
- if ($height !~ /^-?[0-9]+(\.[0-9]*)?$/) {
+ if ($height !~ /^-?[0-9]*(\.[0-9]*)?$/) {
$error .= "Invalid height; please type only a number.<br />\n";
}
- if ($lmargin !~ /^-?[0-9]+(\.[0-9]*)?$/) {
+ if ($lmargin !~ /^-?[0-9]*(\.[0-9]*)?$/) {
$error .= "Invalid left margin; please type only a number.<br />\n";
+ } else {
+ # Adjust for LaTeX 1.0 inch margin:
+
+ if ($env{"form.${var}.lmarginunit"} eq "in") {
+ $helper->{VARS}->{$var.'.lmargin'} = $lmargin - 1;
+ } else {
+ $helper->{VARS}->{$var.'.lmargin'} = $lmargin - 2.54;
+ }
}
if (!$error) {