--- loncom/interface/lonprintout.pm 2003/06/25 19:37:04 1.199
+++ loncom/interface/lonprintout.pm 2003/08/02 13:57:05 1.208
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Printout
#
-# $Id: lonprintout.pm,v 1.199 2003/06/25 19:37:04 sakharuk Exp $
+# $Id: lonprintout.pm,v 1.208 2003/08/02 13:57:05 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -396,7 +396,7 @@ sub page_format {
# 8 - "A6 [105x148 mm]"
#
my ($papersize,$layout,$numberofcolumns) = @_;
- my ($textwidth,$textheight,$oddoffset,$evenoffset) = (0,0,0,0);
+ my ($textwidth,$textheight,$oddoffset,$evenoffset,$topmargin) = (0,0,0,0,0);
if ($papersize eq '0') {
if ($layout eq 'book') {
if ($numberofcolumns == 1) {
@@ -417,10 +417,11 @@ sub page_format {
$oddoffset = '-40 pt';
$evenoffset = '-60 pt';
} elsif ($numberofcolumns == 2) {
- $textwidth = '4.2 in';
+ $textwidth = '4.4 in';
$textheight = '6.8 in';
- $oddoffset = '-40 pt';
- $evenoffset = '-60 pt';
+ $oddoffset = '-0.5 in';
+ $evenoffset = '-1.5 in';
+ $topmargin = '3.5 in';
}
}
# } elsif($papersize eq '1') {
@@ -457,7 +458,7 @@ sub page_format {
# } elsif($papersize eq '7') {
# } elsif($papersize eq '8') {
}
- return $textwidth,$textheight,$oddoffset,$evenoffset;
+ return $textwidth,$textheight,$oddoffset,$evenoffset,$topmargin;
}
@@ -474,10 +475,10 @@ sub get_name {
sub page_format_transformation {
my ($papersize,$layout,$numberofcolumns,$choice,$text,$assignment) = @_;
- my ($textwidth,$textheight,$oddoffset,$evenoffset);
+ my ($textwidth,$textheight,$oddoffset,$evenoffset,$topmargin);
$assignment=~s/_/ /g;
if ($numberofcolumns != 1) {
- ($textwidth,$textheight,$oddoffset,$evenoffset) = &page_format($papersize,$layout,$numberofcolumns);
+ ($textwidth,$textheight,$oddoffset,$evenoffset,$topmargin) = &page_format($papersize,$layout,$numberofcolumns,$topmargin);
} else {
($textwidth,$textheight,$oddoffset,$evenoffset) = ($ENV{'form.width'},$ENV{'form.height'},$ENV{'form.leftmargin'},$ENV{'form.leftmargin'});
}
@@ -488,7 +489,9 @@ sub page_format_transformation {
}
my $courseidinfo = &Apache::lonxml::latex_special_symbols(&Apache::lonnet::unescape($ENV{'course.'.$ENV{'request.course.id'}.'.description'}),'','','header');
if ($layout eq 'album') {
- $text =~ s/\\begin{document}/\\setlength{\\oddsidemargin}{$oddoffset}\\setlength{\\evensidemargin}{$evenoffset}\\setlength{\\topmargin}{200pt}\\setlength{\\textwidth}{$textwidth}\\setlength{\\textheight}{$textheight}\\setlength{\\parindent}{20pt}\\setlength{\\marginparwidth}{90pt}\\setlength{\\textfloatsep}{8pt plus 2\.0pt minus 4\.0pt}\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm} \\begin{document}\\setcounter{page}{1}\\noindent\\parbox{\\minipagewidth}{\\noindent\\fbox{\\textbf{$name}} \\hfill $courseidinfo} \\vskip 5 mm /;
+ my $topmargintoinsert = '';
+ if ($topmargin ne '0') {$topmargintoinsert='\setlength{\topmargin}{'.$topmargin.'}';}
+ $text =~ s/\\begin{document}/\\setlength{\\oddsidemargin}{$oddoffset}\\setlength{\\evensidemargin}{$evenoffset}$topmargintoinsert\\setlength{\\textwidth}{$textwidth}\\setlength{\\textheight}{$textheight}\\setlength{\\textfloatsep}{8pt plus 2\.0pt minus 4\.0pt}\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\usepackage{fancyhdr}\\pagestyle{fancy}\\rhead{}\\chead{}\\lhead{\\textbf{$name} - $courseidinfo \\hfill \\thepage \\\\ \\textit{$assignment}} \\begin{document}\\voffset=-0\.8 cm\\setcounter{page}{1} /;
} elsif ($layout eq 'book') {
if ($choice ne 'All class print') {
$text =~ s/\\begin{document}/\\textheight $textheight\\oddsidemargin = $evenoffset\\evensidemargin = $evenoffset\\textwidth= $textwidth\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\renewcommand{\\ref}{\\keephidden\}\\usepackage{fancyhdr}\\pagestyle{fancy}\\rhead{}\\chead{}\\lhead{\\textbf{$name} - $courseidinfo \\hfill \\thepage \\\\ \\textit{$assignment}}\\begin{document}\\voffset=-0\.8 cm\\setcounter{page}{1}/;
@@ -616,6 +619,7 @@ ENDPART
$currentURL=$helper->{'VARS'}->{'filename'};
$currentURL=~s/\/home\//\/~/;
$currentURL=~s/public_html\///;
+ if ($currentURL=~/([^?]+)/) {$currentURL=$1;}
}
$selectionmade = 1;
if ($currentURL=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {
@@ -623,10 +627,14 @@ ENDPART
$moreenv{'request.filename'}=$currentURL;
my %form;
$form{'grade_target'}='tex';
- $form{'textwidth'}=$LaTeXwidth;
+ $form{'textwidth'}=$LaTeXwidth;
+ $form{'problem_split'}=$parmhash{'problem_stream_switch'};
+ $form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
my $rndseed=time;
$form{'rndseed'}=$rndseed;
&Apache::lonnet::appenv(%moreenv);
+ &Apache::lonnet::delenv('form.counter');
+ &Apache::lonxml::init_counter();
my $texversion=&Apache::lonnet::ssi($currentURL,%form);
&Apache::lonnet::delenv('form.counter');
&Apache::lonnet::delenv('request.filename');
@@ -643,13 +651,15 @@ ENDPART
($result,$number_of_columns) = &page_cleanup($result);
}
} else {
-# $result='\documentclass[letterpaper]{article}\usepackage{calc}\begin{document}Printout of this type of document is currently not supported: ';
-# if ($ENV{'form.url'}=~/\/(aboutme|syllabus|bulletinboard|smppg)$/) {
-# $result.=$1;
-# } else {
-# $result.=$ENV{'form.url'};
-# }
-# $result.=' \end{document}'
+ $result='\documentclass[letterpaper]{article}\usepackage{calc}\begin{document}Printout of this type of document is currently not supported: ';
+ if ($currentURL=~/\/(aboutme|syllabus|bulletinboard|smppg)$/) {
+ $result.=$1;
+ } elsif ($currentURL=~/\/ext\//) {
+ $result.=' \strut \\\\ THIS IS EXTERNAL RESOURCE WITH URL \strut \\\\ '.$currentURL.' ';
+ } else {
+ $result.=$currentURL;
+ }
+ $result.=' \end{document}'
}
} elsif (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems') or
($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems_pages') or
@@ -659,10 +669,13 @@ ENDPART
$form{'grade_target'}='tex';
$form{'textwidth'}=$LaTeXwidth;
$form{'problem_split'}=$parmhash{'problem_stream_switch'};
+ $form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
my $flag_latex_header_remove = 'NO';
my $flag_page_in_sequence = 'NO';
my @master_seq=split /\|\|\|/, $helper->{'VARS'}->{'RESOURCES'};
my $prevassignment='';
+ &Apache::lonnet::delenv('form.counter');
+ &Apache::lonxml::init_counter();
for (my $i=0;$i<=$#master_seq;$i++) {
$master_seq[$i]=~/___\d+___(.*)$/;
my $urlp='/res/'.$1;
@@ -732,6 +745,8 @@ ENDPART
if ($parmhash{'anonymous_quiz'}=~/yes/) {$fullname=' ';} #put here something reasonable for anonymous exams or quiz
#goes through all resources, checks if they are available for current student, and produces output
+ &Apache::lonnet::delenv('form.counter');
+ &Apache::lonxml::init_counter();
foreach my $curresline (@master_seq) {
if ($curresline=~ m/\.(problem|exam|quiz|assess|survey|form|library)$/) {
my ($map,$id,$res_url) = split(/___/,$curresline);
@@ -746,6 +761,7 @@ ENDPART
if($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
my %form;
$form{'answer_output_mode'}='tex';
+ $form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
my $ansrendered = &Apache::loncommon::get_student_answers($curresline,$username,$userdomain,$ENV{'request.course.id'},%form);
$rendered=~s/(\\keephidden{ENDOFPROBLEM})/$ansrendered$1/;
}
@@ -795,6 +811,7 @@ ENDPART
my %form;
$form{'grade_target'}='answer';
$form{'answer_output_mode'}='tex';
+ $form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
$form{'rndseed'}=$rndseed;
my $answer=&Apache::lonnet::ssi($urlp,%form);
$texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
@@ -886,6 +903,11 @@ sub handler {
my %parmhash=&Apache::lonnet::coursedescription($ENV{'request.course.id'});
+# my $key;
+# foreach $key (keys %parmhash) {
+# $r->print(' '.$key.'->'.$parmhash{$key}.'<-<br />');
+# }
+# return OK;
&output_data($r,$helper,\%parmhash);
return OK;
@@ -936,8 +958,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:\/\// ) {
- $ENV{'form.postdata'} =~ /http:\/\/[^\/]+\/~([^\/]+)\/(.*)/;
+ if ($ENV{'form.postdata'}=~/^(?:http:\/\/[^\/]+\/|\/|)\~([^\/]+)\/(.*)$/) {
$helper->{VARS}->{'filename'} = "/home/$1/public_html/$2";
$helper->{VARS}->{'construction'} = 1;
} else {
@@ -1088,9 +1109,10 @@ HELPERFRAGMENT
</resource>
<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 (add a pagefeed after each assignment)</choice>
- <choice computer='1'>Add one empty page after each student\'s assignment</choice>
- <choice computer='2'>Add two empty pages after each student\'s assignment</choice>
+ <choice computer='0'>Start each student\'s assignment on a new page/column (add a pagefeed after each assignment)</choice>
+ <choice computer='1'>Add one empty page/column after each student\'s assignment</choice>
+ <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>
CHOOSE_STUDENTS
@@ -1111,7 +1133,7 @@ CHOOSE_FROM_SUBDIR
$xmlfrag .= <<'CHOOSE_FROM_SUBDIR';
<filefilter>return $filename =~
- m/^[^\.]+\.(problem|exam|quiz|assess|survey|form|library)$/;
+ m/\.(problem|exam|quiz|assess|survey|form|library)$/;
</filefilter>
</files>
</state>
@@ -1143,6 +1165,24 @@ CHOOSE_FROM_SUBDIR
['Print with answers', 'no'] ];
Apache::lonhelper::choices->new();
}
+ if ($ENV{'request.role.adv'}) {
+ $paramHash = Apache::lonhelper::getParamHash();
+ $paramHash->{MESSAGE_TEXT} = "<br /><big><b><i>Another option available only for advanced users:</i></b></big><br />";
+ Apache::lonhelper::message->new();
+ $paramHash = Apache::lonhelper::getParamHash();
+ $paramHash->{'variable'} = 'LATEX_TYPE';
+ $helper->declareVar('LATEX_TYPE');
+ if ($helper->{VARS}->{'construction'} eq '1') {
+ $paramHash->{CHOICES} = [
+ ['Print in standard LaTeX mode', 'standard'],
+ ['Print in LaTeX batchmode', 'batchmode'], ];
+ } else {
+ $paramHash->{CHOICES} = [
+ ['Print in LaTeX batchmode', 'batchmode'],
+ ['Print in standard LaTeX mode', 'standard'] ];
+ }
+ Apache::lonhelper::choices->new();
+ }
Apache::lonprintout::page_format_state->new("FORMAT");