--- loncom/interface/lonprintout.pm	2002/07/23 14:09:45	1.41
+++ loncom/interface/lonprintout.pm	2002/08/01 19:48:18	1.44
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.41 2002/07/23 14:09:45 sakharuk Exp $
+# $Id: lonprintout.pm,v 1.44 2002/08/01 19:48:18 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -79,6 +79,7 @@ ENDMENUOUT1
 <input type="radio" name="choice" value="Standard LaTeX output for the top level sequence">  All problems from the top level sequence<br />
 <br />
 ENDMENUOUT2
+    }
       my $subdirtoprint = &Apache::lonnet::filelocation("",$ENV{'form.url'});
       $subdirtoprint =~ s/\/[^\/]+$//;
       if (&Apache::lonnet::allowed('bre',$subdirtoprint) eq 'F') {
@@ -86,7 +87,6 @@ ENDMENUOUT2
   <input type="radio" name="choice" value="Subdirectory print">  All problems from current subdirectory (where this particular problem is)<br />
 ENDMENUOUT4
       }
-    }
     $r->print(<<ENDMENUOUT5);
 <br /><hr /><br />
 <h1>And what page format do you prefer?</h1>
@@ -98,7 +98,17 @@ ENDMENUOUT4
    </td>
    <td>&nbsp;</td>
    <td rawspan="2">
-     Number of columns: <input type="text" size="2" name="numberofcolumns" value="2"> 
+     Number of columns: <select name="numberofcolumns">
+                         <option selected> 1 </option>
+                         <option> 2 </option>
+                         <option> 3 </option>
+                         <option> 4 </option>
+                         <option> 5 </option>
+                         <option> 6 </option>
+                         <option> 7 </option>
+                         <option> 8 </option>
+                         <option> 9 </option>
+                        </select> 
    </td>
  </tr>
 </table>
@@ -157,6 +167,11 @@ ENDPART
 	my $sequence_file=&Apache::lonnet::filelocation("",$primary_sequence);
 	my $sequencefilecontents=&Apache::lonnet::getfile($sequence_file);
 	my @master_seq = &content_map($sequencefilecontents);
+#
+#	for (my $iu=0;$iu<=$#master_seq;$iu++) {
+#	    $result .= ' '.$master_seq[$iu].'    ';
+#	}
+#
         #-- produce an output string
 	for (my $i=0;$i<=$#master_seq;$i++) {
 	    $_ = $master_seq[$i];
@@ -284,7 +299,7 @@ ENDPART
 	$first_comment = index($result,'<!--',$first_comment);
     }
     $result =~ s/^\s+$//gm; #remove empty lines
-    $result =~ s/%/\\%/g;   #corrects %
+    $result =~ s/([^\\])%/\$1\%/g;   #corrects %
     $result =~ s/(\s)+/$1/g; #removes more than one empty space
     $result =~ s/\\\\\s*\\vskip/\\vskip/gm;
     $result =~ s/ (<|>|) / \$$1\$ /g; #corrects < or >
@@ -297,6 +312,8 @@ ENDPART
     if ($result =~ m/&(\w+|#\d+);/) {
 	$result = &character_chart($result);
     }
+    $result =~ s/(\\end{tabular})\s*\\vskip 0 mm/$1/g;
+    $result =~ s/(\\begin{enumerate})\s*\\noindent/$1/g;
 #-- writing .tex file in prtspool 
     my $temp_file;
     my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout_".time."_".rand(10000000).".tex";
@@ -473,8 +490,8 @@ sub character_chart {
 #    $result =~ s/&reg;//g;
 #    $result =~ s/&#175;//g;
 #    $result =~ s/&macr;//g;
-    $result =~ s/&#176;/\$^\\{\\circ\\}\$/g;
-    $result =~ s/&deg;/\$^\\{\\circ\\}\$/g;
+    $result =~ s/&#176;/\$^{\\circ}\$/g;
+    $result =~ s/&deg;/\$^{\\circ}\$/g;
     $result =~ s/&#177;/\$\\pm\$/g;
     $result =~ s/&plusmn;/\$\\pm\$/g;
     $result =~ s/&#178;/\$^2\$/g;
@@ -685,7 +702,7 @@ sub content_map {
 	$_ = $chunk;
         m/to=\"(\d+)\"/;
 	push @number_seq,$1;
-	$startlink = index($map_string,'from="'.$1.'"',$startlink);
+	$startlink = index($map_string,'from="'.$1.'"',0);
 	$startlink = rindex($map_string,'<link ',$startlink);
     }
     my $stalink = index($map_string,' to="'.$number_seq[0].'"',$startlink);