--- loncom/interface/lonprintout.pm	2003/10/20 17:38:51	1.256
+++ loncom/interface/lonprintout.pm	2003/10/27 19:01:31	1.259
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.256 2003/10/20 17:38:51 sakharuk Exp $
+# $Id: lonprintout.pm,v 1.259 2003/10/27 19:01:31 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -815,6 +815,13 @@ ENDPART
 	    }
 	    if ($helper->{VARS}->{'construction'} eq '1') {$result=~s/(\\begin{document})/$1 \\fbox\{RANDOM SEED IS $rndseed\} /;}
 	    $result .= '\end{document}';   
+	} elsif ($currentURL=~/\/smppg$/) { 
+		my %form;
+		$form{'grade_target'}='tex';
+		$form{'textwidth'}=$LaTeXwidth;	
+		$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
+		my $texversion=&Apache::lonnet::ssi($currentURL,%form);
+		$result .= $texversion;
 	} else {
 	  $result.='\documentclass[letterpaper]{article}\usepackage{calc}\begin{document}Printout of this type of document is currently not supported: ';
 	  if ($currentURL=~/\/(aboutme|syllabus|bulletinboard|smppg)$/) {
@@ -840,7 +847,6 @@ 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++) {
 	    my (undef,undef,$urlp)=&Apache::lonnet::decode_symb($master_seq[$i]);
@@ -859,7 +865,8 @@ ENDPART
 	    my $assignment=&Apache::lonxml::latex_special_symbols(&Apache::lonnet::gettitle($sequence),'header'); #tittle of the assignment which contains this problem
 	    if ($i==0) {$prevassignment=$assignment;}
 	    #&Apache::lonnet::logthis("Trying to get $urlp with symb $master_seq[$i]");
-	    my $texversion=&Apache::lonnet::ssi($urlp,%form);
+	    $form{'freeze_counter'}='no';
+	    my $texversion.=&Apache::lonnet::ssi($urlp,%form);
 	    if ($urlp=~/\.page$/) {
 		($texversion,my $number_of_columns_page) = &page_cleanup($texversion);
 		if ($number_of_columns_page > $number_of_columns) {$number_of_columns=$number_of_columns_page;} 
@@ -871,6 +878,7 @@ ENDPART
 		my %form;
 		$form{'grade_target'}='answer';
 		$form{'answer_output_mode'}='tex';
+		$form{'freeze_counter'}='yes';
 		my $answer=&Apache::lonnet::ssi($urlp,%form);
 		if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
 		    $texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
@@ -1063,11 +1071,6 @@ 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;}
-    if ($helper->{'VARS'}->{'TABLE_INDEX'} eq 'yes') {
-	if ($selectionmade<10) {$selectionmade*=100;} else {$selectionmade*=10;}
-    }
-    if ($ENV{'request.role.adv'}) {$selectionmade*=10000;}
 #-- writing .tex file in prtspool 
     my $temp_file;
     my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout_".time."_".rand(10000000).".tex";
@@ -1076,15 +1079,14 @@ ENDPART
 	return SERVER_ERROR; 
     }
 
-########
     my $identifier = time.'_'.int(rand(1000));
-    &Apache::lonnet::appenv($identifier.'.file'   => $filename,
-                            $identifier.'.layout'  => $laystyle,
-                            $identifier.'.numcol'  => $numberofcolumns,
-                            $identifier.'.selection' => $selectionmade);
-
-##<meta http-equiv="Refresh" content="0; url=/cgi-bin/printout.pl?$filename&$laystyle&$numberofcolumns&$selectionmade">
-########
+    &Apache::lonnet::appenv('cgi.'.$identifier.'.file'   => $filename,
+                            'cgi.'.$identifier.'.layout'  => $laystyle,
+                            'cgi.'.$identifier.'.numcol'  => $numberofcolumns,
+                            'cgi.'.$identifier.'.selection' => $selectionmade,
+			    'cgi.'.$identifier.'tableofcontents' => $helper->{'VARS'}->{'TABLE_CONTENTS'},
+			    'cgi.'.$identifier.'tableofindex' => $helper->{'VARS'}->{'TABLE_INDEX'},
+			    'cgi.'.$identifier.'role' => $ENV{'request.role.adv'});
  
     print $temp_file $result;