--- loncom/interface/lonprintout.pm	2006/04/14 19:42:19	1.436
+++ loncom/interface/lonprintout.pm	2006/05/30 12:46:09	1.439
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.436 2006/04/14 19:42:19 albertel Exp $
+# $Id: lonprintout.pm,v 1.439 2006/05/30 12:46:09 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -42,6 +42,8 @@ use Apache::lonratedt;
 use POSIX qw(strftime);
 use Apache::lonlocal;
 use Carp;
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
 
 my %perm;
 
@@ -707,7 +709,7 @@ sub get_name {
 sub get_course {
     my $courseidinfo;
     if (defined($env{'request.course.id'})) {
-	$courseidinfo = &Apache::lonxml::latex_special_symbols(&Apache::lonnet::unescape($env{'course.'.$env{'request.course.id'}.'.description'}),'header');
+	$courseidinfo = &Apache::lonxml::latex_special_symbols(&unescape($env{'course.'.$env{'request.course.id'}.'.description'}),'header');
     }
     return $courseidinfo;
 }
@@ -1322,7 +1324,6 @@ ENDPART
 		$resources_printed .= $urlp.':';
 
 		&Apache::lonxml::remember_problem_counter();
-
 		$texversion.=&Apache::lonnet::ssi($urlp,%form);
 		if ($urlp=~/\.page$/) {
 		    ($texversion,my $number_of_columns_page) = &page_cleanup($texversion);
@@ -1671,13 +1672,14 @@ ENDPART
 			       $selectionmade, 
 			       $helper->{'VARS'}->{'ANSWER_TYPE'});
     }
-    #changes page's parameters for the one column output 
-    if ($numberofcolumns == 1) {
-	$result =~ s/\\textwidth\s*=\s*-?\d*\.?\d*\s*(cm|mm|in)/\\textwidth= $helper->{'VARS'}->{'pagesize.width'} $helper->{'VARS'}->{'pagesize.widthunit'} /;
-	$result =~ s/\\textheight\s*=\s*-?\d*\.?\d*\s*(cm|mm|in)/\\textheight $helper->{'VARS'}->{'pagesize.height'} $helper->{'VARS'}->{'pagesize.heightunit'} /;
-	$result =~ s/\\evensidemargin\s*=\s*-?\d*\.?\d*\s*(cm|mm|in)/\\evensidemargin= $helper->{'VARS'}->{'pagesize.lmargin'} $helper->{'VARS'}->{'pagesize.lmarginunit'} /;
-	$result =~ s/\\oddsidemargin\s*=\s*-?\d*\.?\d*\s*(cm|mm|in)/\\oddsidemargin= $helper->{'VARS'}->{'pagesize.lmargin'} $helper->{'VARS'}->{'pagesize.lmarginunit'} /;
-    }
+    &Apache::lonnet::logthis("Resetting page e.g. height -> $helper->{'VARS'}->{'pagesize.height'}");
+    &Apache::lonnet::logthis("Before: $result \n--------------------------\n");
+    $result =~ s/\\textwidth\s*=\s*-?\d*\.?\d*\s*(cm|mm|in)/\\textwidth= $helper->{'VARS'}->{'pagesize.width'} $helper->{'VARS'}->{'pagesize.widthunit'} /;
+    $result =~ s/\\textheight\s*=?\s*-?\d*\.?\d*\s*(cm|mm|in)/\\textheight $helper->{'VARS'}->{'pagesize.height'} $helper->{'VARS'}->{'pagesize.heightunit'} /;
+    $result =~ s/\\evensidemargin\s*=\s*-?\d*\.?\d*\s*(cm|mm|in)/\\evensidemargin= $helper->{'VARS'}->{'pagesize.lmargin'} $helper->{'VARS'}->{'pagesize.lmarginunit'} /;
+    $result =~ s/\\oddsidemargin\s*=\s*-?\d*\.?\d*\s*(cm|mm|in)/\\oddsidemargin= $helper->{'VARS'}->{'pagesize.lmargin'} $helper->{'VARS'}->{'pagesize.lmarginunit'} /;
+
+    &Apache::lonnet::logthis("After: $result \n----------------------------------\n");
 
 #-- writing .tex file in prtspool 
     my $temp_file;
@@ -1733,7 +1735,7 @@ ENDPART
     my $URLback=''; #link to original document
     if ($helper->{'VARS'}->{'construction'} ne '1') {
 	#prints published resource
-	$URLback=&Apache::lonnet::escape('/adm/flip?postdata=return:');
+	$URLback=&escape('/adm/flip?postdata=return:');
     } else {
 	#prints resource from the construction space
 	$URLback='/'.$helper->{'VARS'}->{'filename'};
@@ -2260,6 +2262,7 @@ RESOURCE_SELECTOR
       <choice computer='0'>Sort by section then student</choice>
       <choice computer='1'>Sort by students across sections.</choice>
     </choices>
+      <message><br /><hr /><br /> </message>
       <student multichoice='1' variable="STUDENTS" nextstate="SELECT_PROBLEMS" coursepersonnel="1"/>
   </state>
     $resource_selector
@@ -2419,6 +2422,7 @@ RESOURCE_SELECTOR
       <choice computer='0'>Sort by section then student</choice>
       <choice computer='1'>Sort by students across sections.</choice>
     </choices>
+    <message><br /><hr /><br /></message>
     <student multichoice='1' variable="STUDENTS" nextstate="SELECT_RESOURCES" coursepersonnel="1" />
 
     </state>
@@ -2880,6 +2884,12 @@ sub render {
         $result .= '<br /><font color="#FF0000">' . $self->{ERROR_MSG} . '</font><br />';
     }
 
+    my $width = 18;
+    my $format = $helper->{VARS}->{$self->{'formatvar'}};
+    if (substr($format, 2, 1) ne '1') {
+	$width = 9;
+    }
+
     $result .= <<ELEMENTHTML;
 
 <p>How should the column be formatted?</p>
@@ -2887,7 +2897,7 @@ sub render {
 <table cellpadding='3'>
   <tr>
     <td align='right'><b>Width</b>:</td>
-    <td align='left'><input type='text' name='$var.width' value='18' size='4'></td>
+    <td align='left'><input type='text' name='$var.width' value='$width' size='4'></td>
     <td align='left'>
       <select name='$var.widthunit'>
         <option>cm</option><option>in</option>
@@ -2928,9 +2938,9 @@ sub preprocess {
     my $helper = Apache::lonhelper::getHelper();
 
     my $format = $helper->{VARS}->{$self->{'formatvar'}};
-    if (substr($format, 2, 1) ne '1') {
-        $helper->changeState($self->{NEXTSTATE});
-    }
+#    if (substr($format, 2, 1) ne '1') {
+#        $helper->changeState($self->{NEXTSTATE});
+#    }
    
     return 1;
 }