--- loncom/interface/lonprintout.pm 2003/07/01 20:15:06 1.201 +++ loncom/interface/lonprintout.pm 2003/08/13 15:28:57 1.209 @@ -1,7 +1,7 @@ # The LearningOnline Network # Printout # -# $Id: lonprintout.pm,v 1.201 2003/07/01 20:15:06 sakharuk Exp $ +# $Id: lonprintout.pm,v 1.209 2003/08/13 15:28:57 sakharuk 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; } @@ -473,11 +474,11 @@ sub get_name { sub page_format_transformation { - my ($papersize,$layout,$numberofcolumns,$choice,$text,$assignment) = @_; - my ($textwidth,$textheight,$oddoffset,$evenoffset); + my ($papersize,$layout,$numberofcolumns,$choice,$text,$assignment,$tableofcontents) = @_; + 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}/; @@ -496,6 +499,7 @@ sub page_format_transformation { $text =~ s/\\pagestyle{fancy}\\rhead{}\\chead{}\s*\\begin{document}/\\textheight = $textheight\\oddsidemargin = $evenoffset\\evensidemargin = $evenoffset\\textwidth= $textwidth\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\renewcommand{\\ref}{\\keephidden\}\\pagestyle{fancy}\\rhead{}\\chead{}\\begin{document}\\voffset=-0\.8cm\\setcounter{page}{1} \\vskip 5 mm /; } } + if ($tableofcontents eq 'yes') {$text=~s/(\\begin{document})/$1 \\tableofcontents \\vskip 0\.5mm\\noindent\\makebox\[\\textwidth\/1\]\[b\]{\\hrulefill}/;} return $text; } @@ -616,6 +620,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)$/) { @@ -624,7 +629,8 @@ ENDPART my %form; $form{'grade_target'}='tex'; $form{'textwidth'}=$LaTeXwidth; - $form{'problem_split'}=$parmhash{'problem_stream_switch'}; + $form{'problem_split'}=$parmhash{'problem_stream_switch'}; + $form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'}; my $rndseed=time; $form{'rndseed'}=$rndseed; &Apache::lonnet::appenv(%moreenv); @@ -646,13 +652,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 @@ -662,6 +670,7 @@ 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'}; @@ -753,6 +762,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/; } @@ -802,6 +812,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/; @@ -839,7 +850,7 @@ ENDPART $result .= '\end{document}'; } #-------------------------------------------------------- corrections for the different page formats - $result = &page_format_transformation($papersize,$laystyle,$numberofcolumns,$helper->{'VARS'}->{'PRINT_TYPE'},$result,$helper->{VARS}->{'assignment'}); + $result = &page_format_transformation($papersize,$laystyle,$numberofcolumns,$helper->{'VARS'}->{'PRINT_TYPE'},$result,$helper->{VARS}->{'assignment'},$helper->{'VARS'}->{'TABLE_CONTENTS'}); $result = &latex_corrections($number_of_columns,$result); #changes page's parameters for the one column output if ($numberofcolumns == 1) { @@ -848,6 +859,7 @@ ENDPART $result =~ s/\\evensidemargin = -0\.57in/\\evensidemargin= $helper->{'VARS'}->{'pagesize.lmargin'} $helper->{'VARS'}->{'pagesize.lmarginunit'} /; $result =~ s/\\oddsidemargin = -0\.57in/\\oddsidemargin= $helper->{'VARS'}->{'pagesize.lmargin'} $helper->{'VARS'}->{'pagesize.lmarginunit'} /; } + if ($helper->{'VARS'}->{'TABLE_CONTENTS'} eq 'yes') {$selectionmade+=10;} #-- writing .tex file in prtspool my $temp_file; my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout_".time."_".rand(10000000).".tex"; @@ -857,7 +869,6 @@ ENDPART } print $temp_file $result; -# $r->print(< @@ -893,7 +904,7 @@ sub handler { my %parmhash=&Apache::lonnet::coursedescription($ENV{'request.course.id'}); - my $key; +# my $key; # foreach $key (keys %parmhash) { # $r->print(' '.$key.'->'.$parmhash{$key}.'<-
'); # } @@ -948,8 +959,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 { @@ -1100,9 +1110,10 @@ HELPERFRAGMENT
How should the results be printed?
 - Start each student\'s assignment on a new page (add a pagefeed after each assignment) - Add one empty page after each student\'s assignment - Add two empty pages after each student\'s assignment + Start each student\'s assignment on a new page/column (add a pagefeed after each assignment) + Add one empty page/column after each student\'s assignment + Add two empty pages/column after each student\'s assignment + Add three empty pages/column after each student\'s assignment CHOOSE_STUDENTS @@ -1123,7 +1134,7 @@ CHOOSE_FROM_SUBDIR $xmlfrag .= <<'CHOOSE_FROM_SUBDIR'; return $filename =~ - m/^[^\.]+\.(problem|exam|quiz|assess|survey|form|library)$/; + m/\.(problem|exam|quiz|assess|survey|form|library)$/; @@ -1156,6 +1167,38 @@ CHOOSE_FROM_SUBDIR Apache::lonhelper::choices->new(); } + if ($ENV{'request.role.adv'}) { + $paramHash = Apache::lonhelper::getParamHash(); + $paramHash->{MESSAGE_TEXT} = "
Another option available only for advanced users:
"; + 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(); + } + + + $paramHash = Apache::lonhelper::getParamHash(); + $paramHash->{MESSAGE_TEXT} = "
Print with Table of Contents:"; + Apache::lonhelper::message->new(); + $paramHash = Apache::lonhelper::getParamHash(); + $paramHash->{'variable'} = 'TABLE_CONTENTS'; + $helper->declareVar('TABLE_CONTENTS'); + $paramHash->{CHOICES} = [ + ['No', 'no'], + ['Yes', 'yes'] ]; + Apache::lonhelper::choices->new(); + + Apache::lonprintout::page_format_state->new("FORMAT"); # Generate the PAGESIZE state which will offer the user the margin