--- loncom/interface/lonprintout.pm 2003/05/15 21:51:00 1.183 +++ loncom/interface/lonprintout.pm 2003/05/28 20:27:40 1.186 @@ -1,7 +1,7 @@ # The LearningOnline Network # Printout # -# $Id: lonprintout.pm,v 1.183 2003/05/15 21:51:00 albertel Exp $ +# $Id: lonprintout.pm,v 1.186 2003/05/28 20:27:40 bowersj2 Exp $ # # Copyright Michigan State University Board of Trustees # @@ -469,7 +469,7 @@ sub latex_corrections { 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/(\\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; @@ -500,7 +500,8 @@ sub latex_corrections { sub output_data { - my ($r,$helper) = @_; + my ($r,$helper,$rparmhash) = @_; + my %parmhash = %$rparmhash; $r->print(< @@ -536,10 +537,10 @@ ENDPART #-- single document - problem, page, html, xml, ... my $currentURL; if ($helper->{'VARS'}->{'construction'} ne '1') { - #prins published resource + #prints published resource $currentURL=$helper->{'VARS'}->{'postdata'}; } else { - #prins resource from the construction space + #prints resource from the construction space $currentURL=$helper->{'VARS'}->{'filename'}; $currentURL=~s/\/home\//\/~/; $currentURL=~s/public_html\///; @@ -599,6 +600,7 @@ ENDPART $form{'grade_target'}='tex'; $form{'textwidth'}=$LaTeXwidth; $form{'symb'}=$master_seq[$i]; + $form{'problem_split'}=$parmhash{'problem_stream_switch'}; #&Apache::lonnet::logthis("Trying to get $urlp with symb $master_seq[$i]"); my $texversion=&Apache::lonnet::ssi($urlp,%form); if ($urlp=~/\.page$/) { @@ -744,9 +746,6 @@ ENDPART } #-------------------------------------------------------- corrections for the different page formats $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); # #changes page's parameters for the one column output # if ($ENV{'form.numberofcolumns'} == 1) { @@ -797,8 +796,17 @@ sub handler { # $r->print(' '.$key.'->'.$helper->{'VARS'}->{$key}.'<-
'); # } # return OK; - - &output_data($r,$helper); + + my %parmhash=&Apache::lonnet::coursedescription($ENV{'request.course.id'}); +# $r->print('
START '.$ENV{'request.course.fn'}.' FINISH
'); +# my $key; +# foreach $key (keys %parmhash) { +# $r->print(' '.$key.'->'.$parmhash{$key}.'<-
'); +# } +# return OK; + + + &output_data($r,$helper,\%parmhash); return OK; } @@ -1280,7 +1288,7 @@ sub render { Left margin: -