version 1.179, 2003/05/15 20:11:47
|
version 1.187, 2003/05/28 21:25:33
|
Line 469 sub latex_corrections {
|
Line 469 sub latex_corrections {
|
|
|
my ($number_of_columns,$result) = @_; |
my ($number_of_columns,$result) = @_; |
|
|
$result =~ s/\\includegraphics{/\\includegraphics\[width=\\minipagewidth\]{/g; |
# $result =~ s/\\includegraphics{/\\includegraphics\[width=\\minipagewidth\]{/g; |
$result =~ s/\$number_of_columns/$number_of_columns/g; |
$result =~ s/\$number_of_columns/$number_of_columns/g; |
$result =~ s/(\\end{document})/\\strut\\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\\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{longtable}\s*)(\\strut\\newline\\noindent\\makebox\[\\textwidth\/$number_of_columns\]\[b\]{\\hrulefill})/$2$1/g; |
$result =~ s/(\\end{longtable}\s*)(\\strut\\newline\\noindent\\makebox\[\\textwidth\/$number_of_columns\]\[b\]{\\hrulefill})/$2$1/g; |
Line 500 sub latex_corrections {
|
Line 500 sub latex_corrections {
|
|
|
|
|
sub output_data { |
sub output_data { |
my ($r,$helper) = @_; |
my ($r,$helper,$rparmhash) = @_; |
|
my %parmhash = %$rparmhash; |
|
my $bodytag=&Apache::loncommon::bodytag('Preparing Printout'); |
$r->print(<<ENDPART); |
$r->print(<<ENDPART); |
<html> |
<html> |
<head> |
<head> |
<title>LON-CAPA output for printing</title> |
<title>LON-CAPA output for printing</title> |
</head> |
</head> |
<body bgcolor="FFFFFF"> |
$bodytag |
<hr> |
Please stand by while processing your print request, this may take some time ... |
ENDPART |
ENDPART |
|
|
my $format_from_helper = $helper->{'VARS'}->{'FORMAT'}; |
my $format_from_helper = $helper->{'VARS'}->{'FORMAT'}; |
Line 536 ENDPART
|
Line 538 ENDPART
|
#-- single document - problem, page, html, xml, ... |
#-- single document - problem, page, html, xml, ... |
my $currentURL; |
my $currentURL; |
if ($helper->{'VARS'}->{'construction'} ne '1') { |
if ($helper->{'VARS'}->{'construction'} ne '1') { |
#prins published resource |
#prints published resource |
$currentURL=$helper->{'VARS'}->{'postdata'}; |
$currentURL=$helper->{'VARS'}->{'postdata'}; |
} else { |
} else { |
#prins resource from the construction space |
#prints resource from the construction space |
$currentURL=$helper->{'VARS'}->{'filename'}; |
$currentURL=$helper->{'VARS'}->{'filename'}; |
$currentURL=~s/\/home\//\/~/; |
$currentURL=~s/\/home\//\/~/; |
$currentURL=~s/public_html\///; |
$currentURL=~s/public_html\///; |
Line 599 ENDPART
|
Line 601 ENDPART
|
$form{'grade_target'}='tex'; |
$form{'grade_target'}='tex'; |
$form{'textwidth'}=$LaTeXwidth; |
$form{'textwidth'}=$LaTeXwidth; |
$form{'symb'}=$master_seq[$i]; |
$form{'symb'}=$master_seq[$i]; |
|
$form{'problem_split'}=$parmhash{'problem_stream_switch'}; |
#&Apache::lonnet::logthis("Trying to get $urlp with symb $master_seq[$i]"); |
#&Apache::lonnet::logthis("Trying to get $urlp with symb $master_seq[$i]"); |
my $texversion=&Apache::lonnet::ssi($urlp,%form); |
my $texversion=&Apache::lonnet::ssi($urlp,%form); |
if ($urlp=~/\.page$/) { |
if ($urlp=~/\.page$/) { |
Line 667 ENDPART
|
Line 670 ENDPART
|
} |
} |
my $courseidinfo = $ENV{'course.'.$ENV{'request.course.id'}.'.description'}; |
my $courseidinfo = $ENV{'course.'.$ENV{'request.course.id'}.'.description'}; |
if ($current_output=~/\\documentclass/) { |
if ($current_output=~/\\documentclass/) { |
$current_output =~ s/\\begin{document}/\\setlength{\\topmargin}{1cm}\\usepackage{fancyhdr}\\pagestyle{fancy}\\rhead{}\\chead{} \\begin{document}\\noindent\\lhead{\\textit{\\textbf{$fullname}} - $courseidinfo \\hfill \\thepage \\\\ \\textit{$helper->{VARS}->{'assignment'}}}\\vskip 3 mm /; |
$current_output =~ s/\\begin{document}/\\setlength{\\topmargin}{1cm} \\begin{document}\\noindent\\lhead{\\textit{\\textbf{$fullname}} - $courseidinfo \\hfill \\thepage \\\\ \\textit{$helper->{VARS}->{'assignment'}}}\\vskip 3 mm /; |
} else { |
} else { |
my $blanspages = ''; |
my $blanspages = ''; |
for (my $j=0;$j<$helper->{'VARS'}->{'EMPTY_PAGES'};$j++) {$blanspages.='\clearpage\strut\clearpage';} |
for (my $j=0;$j<$helper->{'VARS'}->{'EMPTY_PAGES'};$j++) {$blanspages.='\clearpage\strut\clearpage';} |
$current_output = '\strut\\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 }\\newpage \\vskip 3mm'.$blanspages.'\setcounter{page}{1}\noindent\parbox{\minipagewidth}{\noindent\\lhead{\\textit{\\textbf{'.$fullname.'}} - '.$courseidinfo.' \\hfill \\thepage \\\\ \\textit{'.$helper->{VARS}->{'assignment'}.'}}\hskip 1.4in } \vskip 5 mm '.$current_output; |
$current_output = '\strut\\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 }\\newpage '.$blanspages.'\setcounter{page}{1}\noindent\parbox{\minipagewidth}{\noindent\\lhead{\\textit{\\textbf{'.$fullname.'}} - '.$courseidinfo.' \\hfill \\thepage \\\\ \\textit{'.$helper->{VARS}->{'assignment'}.'}}} \vskip -5 mm '.$current_output; |
} |
} |
$result .= $current_output; |
$result .= $current_output; |
&Apache::lonnet::delenv('form.counter'); |
&Apache::lonnet::delenv('form.counter'); |
Line 744 ENDPART
|
Line 747 ENDPART
|
} |
} |
#-------------------------------------------------------- corrections for the different page formats |
#-------------------------------------------------------- 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'}); |
# if ($layout eq 'CBI') { |
|
# $laystyle = 'album'; |
|
# } |
|
$result = &latex_corrections($number_of_columns,$result); |
$result = &latex_corrections($number_of_columns,$result); |
# #changes page's parameters for the one column output |
# #changes page's parameters for the one column output |
# if ($ENV{'form.numberofcolumns'} == 1) { |
# if ($ENV{'form.numberofcolumns'} == 1) { |
Line 797 sub handler {
|
Line 797 sub handler {
|
# $r->print(' '.$key.'->'.$helper->{'VARS'}->{$key}.'<-<br />'); |
# $r->print(' '.$key.'->'.$helper->{'VARS'}->{$key}.'<-<br />'); |
# } |
# } |
# return OK; |
# return OK; |
|
|
&output_data($r,$helper); |
my %parmhash=&Apache::lonnet::coursedescription($ENV{'request.course.id'}); |
|
# $r->print('<br /> START '.$ENV{'request.course.fn'}.' FINISH <br />'); |
|
# my $key; |
|
# foreach $key (keys %parmhash) { |
|
# $r->print(' '.$key.'->'.$parmhash{$key}.'<-<br />'); |
|
# } |
|
# return OK; |
|
|
|
|
|
&output_data($r,$helper,\%parmhash); |
return OK; |
return OK; |
} |
} |
|
|
Line 923 sub printHelper {
|
Line 932 sub printHelper {
|
push @{$printChoices}, ["<b>$resourceTitle</b> (prints what you just saw on the screen)", 'current_document', 'PAGESIZE']; |
push @{$printChoices}, ["<b>$resourceTitle</b> (prints what you just saw on the screen)", 'current_document', 'PAGESIZE']; |
} |
} |
|
|
$r->print($helper->{VARS}->{'postdata'}); |
# $r->print($helper->{VARS}->{'postdata'}); |
|
|
# If we're in a sequence... |
# If we're in a sequence... |
if ($helper->{'VARS'}->{'construction'} ne '1') { |
if ($helper->{'VARS'}->{'construction'} ne '1') { |
Line 992 HELPERFRAGMENT
|
Line 1001 HELPERFRAGMENT
|
</resource> |
</resource> |
<message><br /><big><i><b>How should the results be printed?</b></i></big><br /></message> |
<message><br /><big><i><b>How should the results be printed?</b></i></big><br /></message> |
<choices variable="EMPTY_PAGES"> |
<choices variable="EMPTY_PAGES"> |
<choice computer='0'>Print students assignments without separations (as uniform flow)</choice> |
<choice computer='0'>Start each student's assignment on a new page (add a pagefeed after each assignment)</choice> |
<choice computer='1'>Start student assignment from new page (add pagefeed after each student)</choice> |
<choice computer='1'>Add one empty page after each student's assignment</choice> |
<choice computer='2'>Add one emty page after each student assignment</choice> |
<choice computer='2'>Add two empty pages after each student's assignment</choice> |
<choice computer='3'>Add two emty page after each student assignment</choice> |
|
</choices> |
</choices> |
</state> |
</state> |
CHOOSE_STUDENTS |
CHOOSE_STUDENTS |
Line 1281 sub render {
|
Line 1289 sub render {
|
<td align='right'><b>Left margin</b>:</td> |
<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='-1.5' size='4'></td> |
<td align='left'> |
<td align='left'> |
<select name='$var.heightunit'> |
<select name='$var.lmarginunit'> |
<option>cm</option><option>in</option> |
<option>cm</option><option>in</option> |
</select> |
</select> |
</td> |
</td> |