--- loncom/interface/lonprintout.pm 2006/03/23 22:32:10 1.433
+++ loncom/interface/lonprintout.pm 2006/06/30 01:11:04 1.449
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Printout
#
-# $Id: lonprintout.pm,v 1.433 2006/03/23 22:32:10 albertel Exp $
+# $Id: lonprintout.pm,v 1.449 2006/06/30 01:11:04 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -42,6 +42,8 @@ use Apache::lonratedt;
use POSIX qw(strftime);
use Apache::lonlocal;
use Carp;
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
my %perm;
@@ -700,14 +702,15 @@ 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=&Apache::lonxml::latex_special_symbols($plainname,'header');
+ $plainname = &escape_LaTeX($plainname);
return $plainname;
}
sub get_course {
my $courseidinfo;
if (defined($env{'request.course.id'})) {
- $courseidinfo = &Apache::lonxml::latex_special_symbols(&Apache::lonnet::unescape($env{'course.'.$env{'request.course.id'}.'.description'}),'header');
+ $courseidinfo = &Apache::lonxml::latex_special_symbols(&unescape($env{'course.'.$env{'request.course.id'}.'.description'}),'header');
}
return $courseidinfo;
}
@@ -1322,7 +1325,6 @@ ENDPART
$resources_printed .= $urlp.':';
&Apache::lonxml::remember_problem_counter();
-
$texversion.=&Apache::lonnet::ssi($urlp,%form);
if ($urlp=~/\.page$/) {
($texversion,my $number_of_columns_page) = &page_cleanup($texversion);
@@ -1671,13 +1673,12 @@ ENDPART
$selectionmade,
$helper->{'VARS'}->{'ANSWER_TYPE'});
}
- #changes page's parameters for the one column output
- 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'} /;
- }
+
+ $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;
@@ -1733,7 +1734,7 @@ ENDPART
my $URLback=''; #link to original document
if ($helper->{'VARS'}->{'construction'} ne '1') {
#prints published resource
- $URLback=&Apache::lonnet::escape('/adm/flip?postdata=return:');
+ $URLback=&escape('/adm/flip?postdata=return:');
} else {
#prints resource from the construction space
$URLback='/'.$helper->{'VARS'}->{'filename'};
@@ -1802,6 +1803,9 @@ sub print_resources {
$namepostfix="\\\\Name: ";
$fullname = "CODE - ".$moreenv->{'CODE'};
}
+ # Fullname may have special latex characters that need \ prefixing:
+ #
+
my $i = 0;
#goes through all resources, checks if they are available for
#current student, and produces output
@@ -1810,6 +1814,16 @@ sub print_resources {
my %page_breaks = &get_page_breaks($helper);
my @format_array = split(/\|/,$helper->{'VARS'}->{'FORMAT'});
my $columns_in_format = $format_array[1];
+ #
+ # end each student with a
+ # Special that allows the post processor to even out the page
+ # counts later. Nasty problem this... it would be really
+ # nice to put the special in as a postscript comment
+ # e.g. \special{ps:\ENDOFSTUDENTSTAMP} unfortunately,
+ # 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
+ # postscript. Each ENDOFSTUDENTSTAMP will go on a line by itself.
+ #
foreach my $curresline (@{$master_seq}) {
if (defined $page_breaks{$curresline}) {
@@ -1905,6 +1919,10 @@ sub print_resources {
$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;
}
}
+ #
+ # Close the student bracketing.
+ #
+ $current_output .= "\n\\special{ps:ENDOFSTUDENTSTAMP}\n";
return ($current_output,$fullname, $printed);
}
@@ -2234,7 +2252,6 @@ ALL_PROBLEMS
</resource>
</state>
<state name="PRINT_FORMATTING" title="How should results be printed?">
- <nextstate>NUMBER_PER_PDF</nextstate>
<message><br /><big><i><b>How should the results be printed?</b></i></big><br /></message>
<choices variable="EMPTY_PAGES">
<choice computer='0'>Start each student\'s assignment on a new page/column (add a pagefeed after each assignment)</choice>
@@ -2242,17 +2259,15 @@ ALL_PROBLEMS
<choice computer='2'>Add two empty pages/column after each student\'s assignment</choice>
<choice computer='3'>Add three empty pages/column after each student\'s assignment</choice>
</choices>
- </state>
- <state name="NUMBER_PER_PDF" title="Number printed at once">
<nextstate>PAGESIZE</nextstate>
<message><hr width='33%' /><b>How do you want assignments split into PDF files? </b></message>
<choices variable="SPLIT_PDFS">
<choice computer="all">All assignments in a single PDF file</choice>
<choice computer="sections">Each PDF contains exactly one section</choice>
<choice computer="oneper">Each PDF contains exactly one assignment</choice>
- <choice computer="usenumber">Specify Number:</choice>
+ <choice computer="usenumber" relatedvalue="NUMBER_TO_PRINT">
+ Specify the number of assignments per PDF:</choice>
</choices>
- <string variable="NUMBER_TO_PRINT" maxlength="5" size="5"><defaultvalue>"all"</defaultvalue></string>
</state>
RESOURCE_SELECTOR
@@ -2263,6 +2278,7 @@ RESOURCE_SELECTOR
<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_PROBLEMS" coursepersonnel="1"/>
</state>
$resource_selector
@@ -2296,12 +2312,19 @@ CHOOSE_STUDENTS
}
push(@{$helper->{DATA}{ALL_CODE_CHOICES}},[$code,$choice]);
}
- $code_selection .=
-'
- <exec>
- push(@{$state->{CHOICES}},@{$helper->{DATA}{ALL_CODE_CHOICES}});
- </exec>
- '.$/;
+ if (%codes_to_print) {
+ $code_selection .='
+ <message><b>Choose single code from list</b></message>
+ <message></td><td></message>
+ <choices variable="CODE_SELECTED_FROM_LIST" multichoice="0" allowempty="0">
+ <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>
+ '.$/;
+
+ }
open(FH,$Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab');
@@ -2358,12 +2381,9 @@ CHOOSE_STUDENTS
</validator>
</string>
<message></td></tr><tr><td colspan="2"><hr width='33%' /></td></tr><tr><td></message>
- <message><b>Choose single code from list</b></message>
- <message></td><td></message>
- <choices variable="CODE_SELECTED_FROM_LIST" multichoice="0" allowempty="0">
$code_selection
- </choices>
- <message></td></tr><tr><td colspan="2"><hr width='33%' /></td></tr><tr><td></message>
+
+
<message><b>Reprint a set of saved CODEs:</b></message>
<message></td><td></message>
<dropdown variable="REUSE_OLD_CODES">
@@ -2403,17 +2423,15 @@ CHOOSE_ANON1
<choice computer='2'>Add two empty pages/column after each student\'s assignment</choice>
<choice computer='3'>Add three empty pages/column after each student\'s assignment</choice>
</choices>
- </state>
- <state name="NUMBER_PER_PDF" title="Number assignments per pdf">
<nextstate>PAGESIZE</nextstate>
<message><hr width='33%' /><b>How do you want assignments split into PDF files? </b></message>
<choices variable="SPLIT_PDFS">
<choice computer="all">All assignments in a single PDF file</choice>
<choice computer="sections">Each PDF contains exactly one section</choice>
<choice computer="oneper">Each PDF contains exactly one assignment</choice>
- <choice computer="usenumber">Specify Number:</choice>
+ <choice computer="usenumber" relatedvalue="NUMBER_TO_PRINT">
+ Specify the number of assignments per PDF:</choice>
</choices>
- <string variable="NUMBER_TO_PRINT" maxlength="5" size="5"><defaultvalue>"all"</defaultvalue></string>
</state>
RESOURCE_SELECTOR
@@ -2423,6 +2441,7 @@ RESOURCE_SELECTOR
<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>
@@ -2470,12 +2489,7 @@ CHOOSE_STUDENTS1
</validator>
</string>
<message></td></tr><tr><td colspan="2"><hr width='33%' /></td></tr><tr><td></message>
- <message><b>Choose single code from list</b></message>
- <message></td><td></message>
- <dropdown variable="CODE_SELECTED_FROM_LIST" multichoice="0" allowempty="0">
$code_selection
- </dropdown>
- <message></td></tr><tr><td colspan="2"><hr width='33%' /></td></tr><tr><td></message>
<message><b>Reprint a set of saved CODEs:</b></message>
<message></td><td></message>
<dropdown variable="REUSE_OLD_CODES">
@@ -2884,6 +2898,12 @@ sub render {
$result .= '<br /><font color="#FF0000">' . $self->{ERROR_MSG} . '</font><br />';
}
+ my $width = 18;
+ my $format = $helper->{VARS}->{$self->{'formatvar'}};
+ if (substr($format, 2, 1) ne '1') {
+ $width = 9;
+ }
+
$result .= <<ELEMENTHTML;
<p>How should the column be formatted?</p>
@@ -2891,7 +2911,7 @@ sub render {
<table cellpadding='3'>
<tr>
<td align='right'><b>Width</b>:</td>
- <td align='left'><input type='text' name='$var.width' value='18' size='4'></td>
+ <td align='left'><input type='text' name='$var.width' value='$width' size='4'></td>
<td align='left'>
<select name='$var.widthunit'>
<option>cm</option><option>in</option>
@@ -2932,9 +2952,9 @@ sub preprocess {
my $helper = Apache::lonhelper::getHelper();
my $format = $helper->{VARS}->{$self->{'formatvar'}};
- if (substr($format, 2, 1) ne '1') {
- $helper->changeState($self->{NEXTSTATE});
- }
+# if (substr($format, 2, 1) ne '1') {
+# $helper->changeState($self->{NEXTSTATE});
+# }
return 1;
}