--- loncom/interface/lonprintout.pm	2003/06/25 19:37:04	1.199
+++ loncom/interface/lonprintout.pm	2003/07/10 20:39:08	1.202
@@ -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.202 2003/07/10 20:39:08 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;
 }
 
 
@@ -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}/;
@@ -623,10 +626,13 @@ ENDPART
 	    $moreenv{'request.filename'}=$currentURL;
 	    my %form;
 	    $form{'grade_target'}='tex';
-	    $form{'textwidth'}=$LaTeXwidth;
+	    $form{'textwidth'}=$LaTeXwidth;	
+	    $form{'problem_split'}=$parmhash{'problem_stream_switch'}; 
 	    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');
@@ -663,6 +669,8 @@ ENDPART
 	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 +740,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);
@@ -886,6 +896,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;