--- loncom/interface/lonprintout.pm 2002/03/21 16:15:34 1.18
+++ loncom/interface/lonprintout.pm 2002/04/25 21:38:42 1.23
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Printout
#
-# $Id: lonprintout.pm,v 1.18 2002/03/21 16:15:34 sakharuk Exp $
+# $Id: lonprintout.pm,v 1.23 2002/04/25 21:38:42 sakharuk Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -70,8 +70,9 @@ sub menu_for_output {
Current document
(you will print what you see on the screen)
- Standard LaTeX output for the primary sequence
- All documents from the top level sequence
+ All problems from the primary sequence
+ The whole primary sequence (problems plus all html and xml files)
+ All problems from the top level sequence
And what page format do you prefer?
CBI
@@ -117,7 +118,7 @@ ENDPART
&Apache::lonnet::appenv(%moreenv);
$result .= $texversion;
- } elsif ($choice eq 'Standard LaTeX output for the primary sequence') {
+ } elsif ($choice eq 'Standard LaTeX output for the primary sequence' or $choice eq 'Standard LaTeX output for whole primary sequence') {
#-- where is the primary sequence containing file?
my %moreenv;
my $symbolic = &Apache::lonnet::symbread($ENV{'form.url'});
@@ -134,14 +135,21 @@ ENDPART
m/\"(.*)\"/;
$_ = $1;
my $urlp = $1;
- if (/\.problem/) {
- my %moreenv;
+ if ($choice eq 'Standard LaTeX output for the primary sequence') {
+ if (/\.(problem|exam|quiz|assess|survey|form|library)/) {
+ my %moreenv;
+ $moreenv{'form.grade_target'}='tex';
+ &Apache::lonnet::appenv(%moreenv);
+ my $texversion=&Apache::lonnet::ssi($urlp);
+ &Apache::lonnet::delenv('form.grade_target');
+ $result .= $texversion;
+ }
+ } else {
$moreenv{'form.grade_target'}='tex';
&Apache::lonnet::appenv(%moreenv);
my $texversion=&Apache::lonnet::ssi($urlp);
&Apache::lonnet::delenv('form.grade_target');
- $texversion =~ s!\.gif!\.eps!;
- $result .= $texversion;
+ $result .= $texversion;
}
}
#-- additional cleanup for output
@@ -150,63 +158,44 @@ ENDPART
while ($first_app != -1) {
my $second_app = index($result,'begin{document}',$first_app);
$first_app = rindex($result,'\end{document}',$first_app);
- substr($result,$first_app,$second_app-$first_app+15) = '\vskip 7 mm';
+ substr($result,$first_app,$second_app-$first_app+15) = '\vskip 3 mm';
$first_app = index($result,'\documentclass',$first_app+5);
}
} elsif ($choice eq 'Standard LaTeX output for the top level sequence') {
my @master_seq = ();
- my $keyword = 0;
- my $output_seq = '';
+ my @add_file_seq = ();
#-- where is the main sequence of the course?
my $main_seq = '/res/'.$ENV{'request.course.uri'};
my $file=&Apache::lonnet::filelocation("",$main_seq);
my $filecontents=&Apache::lonnet::getfile($file);
my @file_seq = &content_map($filecontents);
-#-- temporary solution (without sequence inside sequence) - have to be generalized
-
-
-
-
-# if (defined @master_seq) {
-# my $old_value = $#master_seq;
-# my $total_value = $#master_seq + $#file_seq +2;
-# for (my $j=0; $j<=$old_value-$keyword+1; $j++) {
-# $master_seq[$total_value-$j] = $master_seq[$old_value-$j];
-# }
-# for (my $j=0; $j<=$#file_seq; $j++){
-# $master_seq[$keyword+$j] = $file_seq[$j];
-# }
-# @file_seq = ();
-# $keyword = 0;
-# } else {
- @master_seq = @file_seq;
-# @file_seq = ();
-# }
-
-#-- checking wether .sequence file is among the set of files
-# my $current_file = '';
-# for (my $i=0; $i<=$#file_seq; $i++) {
-# $_ = $file_seq[$i];
-# if (m/(.*)\.sequence/) {
-# $current_file = $_;
-# $keyword = $i;
-# last;
-# }
-# }
-
+#-- do we have any other sequence inside?
+ my $i=0;
+ while ($i<=$#file_seq) {
+ $_ = $file_seq[$i];
+ if (/\.sequence$/) {
+ $file = &Apache::lonnet::filelocation("",$file_seq[$i]);
+ $filecontents=&Apache::lonnet::getfile($file);
+ @add_file_seq = &content_map($filecontents);
+ splice(@file_seq,$i,1,@add_file_seq);
+ @add_file_seq = ();
+ $i = -1;
+ }
+ $i++;
+ }
+ @master_seq = @file_seq;
#-- produce an output string
for (my $i=0;$i<=$#master_seq;$i++) {
$_ = $master_seq[$i];
m/\"(.*)\"/;
$_ = $1;
my $urlp = $1;
- if (/\.problem/) {
+ if (/\.(problem|exam|quiz|assess|survey|form|library)/) {
my %moreenv;
$moreenv{'form.grade_target'}='tex';
&Apache::lonnet::appenv(%moreenv);
my $texversion=&Apache::lonnet::ssi($urlp);
&Apache::lonnet::delenv('form.grade_target');
- $texversion =~ s!\.gif!\.eps!;
$result .= $texversion;
}
}
@@ -216,7 +205,7 @@ ENDPART
while ($first_app != -1) {
my $second_app = index($result,'begin{document}',$first_app);
$first_app = rindex($result,'\end{document}',$first_app);
- substr($result,$first_app,$second_app-$first_app+15) = '\vskip 7 mm';
+ substr($result,$first_app,$second_app-$first_app+15) = '\vskip 3 mm';
$first_app = index($result,'\documentclass',$first_app+5);
}
}
@@ -232,20 +221,36 @@ ENDPART
$result =~ s/\\documentclass\[letterpaper\]{article}/\\documentclass\[twocolumn\]{article}/;
$result =~ s/\\begin{document}/\\textheight 25\.9cm\\oddsidemargin = -0\.57in\\evensidemargin = -0\.57in\\textwidth= 7\.7in\\begin{document}\\voffset=-1\.8cm\\setcounter{page}{1}\\noindent\\fbox{\\textbf{$ENV{'environment.firstname'} $ENV{'environment.lastname'}}}\\hskip 1\.4in $courseidinfo \\vskip 5 mm /;
$result =~ s/\\includegraphics/\\includegraphics\[width=9\.0 cm\]/g;
+ $result =~ s/(\\end{document})/\\newline\\noindent\\makebox\[9.0cm\]\[b\]{\\hrulefill}\\newline\\noindent\\tiny Dept\. of Physics and Astronomy, MSU\\makebox\[1.5cm\]\[b\]{\\hfill}LON-CAPA\\copyright MSU GNU\/GPS $1/;
+ }
+#-- LaTeX corrections
+ my $first_comment = index($result,'',$first_comment);
+ substr($result,$first_comment,$end_comment-$first_comment+3) = '';
+ $first_comment = index($result,'