--- loncom/interface/lonprintout.pm	2002/07/22 20:04:16	1.40
+++ loncom/interface/lonprintout.pm	2002/08/05 19:18:43	1.47
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.40 2002/07/22 20:04:16 sakharuk Exp $
+# $Id: lonprintout.pm,v 1.47 2002/08/05 19:18:43 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>
@@ -185,26 +195,47 @@ ENDPART
     }  elsif ($choice eq 'Standard LaTeX output for the top level sequence') {
 	my @master_seq = ();
 	my @add_file_seq = ();
-#-- where is the main sequence of the course?
+        # 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);
-#-- do we have any other sequence inside?
-	my $i=0;
+        # do we have any other sequence inside?
+#	$result.=$#file_seq.'   ';
+	my $i=1;
 	while ($i<=$#file_seq) {
-	    $_ = $file_seq[$i];
-	    if (/\.sequence$/) {
+#	    $result.='      '.$file_seq[$i].'    ';
+	    $file_seq[$i]=~s/^"//;
+	    $file_seq[$i]=~s/"$//;
+	    if ($file_seq[$i]=~m/\.sequence\s*$/) {
 		$file = &Apache::lonnet::filelocation("",$file_seq[$i]);
+#		$result.='  location    '.$file.'   ';
+#		$result .= 'FFFFFFFFF'.$file.'  ';
 		$filecontents=&Apache::lonnet::getfile($file);
 		@add_file_seq = &content_map($filecontents);
+
+#
+#	for (my $iu=0;$iu<=$#add_file_seq;$iu++) {
+#	    $result .= ' SDSD '.$add_file_seq[$iu].' FDFD   ';
+#	}
+#
+
+
 		splice(@file_seq,$i,1,@add_file_seq);
 		@add_file_seq = ();
 		$i = -1;
 	    }
 	    $i++;
+	    last; #do not forget to remove 
 	}
 	@master_seq = @file_seq;	
+
+#
+#	for (my $iu=0;$iu<=$#file_seq;$iu++) {
+#	    $result .= ' SSS '.$file_seq[$iu].' FFF   ';
+#	}
+#
+
 #-- produce an output string
 	for (my $i=0;$i<=$#master_seq;$i++) {
 	    $_ = $master_seq[$i];
@@ -225,22 +256,30 @@ ENDPART
 	my $subdirtoprint = &Apache::lonnet::filelocation("",$ENV{'form.url'});
 	$subdirtoprint =~ s/\/[^\/]+$//;
 	my @list_of_files = ();
-	my $localdirectory = $subdirtoprint;
-	$localdirectory =~ s/.*(\/res\/)/$1/;
-	my @content_directory = &Apache::lonnet::dirlist($localdirectory);
+	if ($ENV{'request.role'}=~m/^au\./) {
+	    $subdirtoprint =~ s/^[^~]*~(\w+)\//\/home\/$1\/public_html\//;
+	} else {
+	    $subdirtoprint =~ s/.*(\/res\/)/$1/;
+	}
+	my @content_directory = ();
+	if ($ENV{'request.role'}=~m/^au\./) {
+	    @content_directory = &Apache::lonnet::dirlist($subdirtoprint,$ENV{'user.domain'}, $ENV{'user.name'},'');
+	} else {
+	    @content_directory = &Apache::lonnet::dirlist($subdirtoprint);
+	}
 	for (my $iy=0;$iy<=$#content_directory;$iy++) {
 	    my @tempo_array = split(/&/,$content_directory[$iy]);
-	    $content_directory[$iy] = $tempo_array[0];
-	    if ($content_directory[$iy] =~ m/^[^\.]+\.problem$/) {
-		push @list_of_files,$content_directory[$iy];
+	    if ($tempo_array[0] =~ m/^[^\.]+\.(problem|exam|quiz|assess|survey|form|library)$/) {
+		push(@list_of_files,$tempo_array[0]);
 	    }
 	}
-	$localdirectory =~ s/\/$//;
+	$subdirtoprint =~ s/\/$//;
 	for (my $i=0;$i<=$#list_of_files;$i++) {
-	    my $urlp = $localdirectory.'/'.$list_of_files[$i];	     
+	    my $urlp = $subdirtoprint.'/'.$list_of_files[$i];
 	    my %moreenv;
 	    $moreenv{'form.grade_target'}='tex';
 	    &Apache::lonnet::appenv(%moreenv);
+	    if ($ENV{'request.role'}=~m/^au\./) { $urlp =~ s/\/home\/([^\/]*)\/public_html/\/~$1/; }
 	    my $texversion=&Apache::lonnet::ssi($urlp);
 	    &Apache::lonnet::delenv('form.grade_target');
 	    $texversion =~ s/(\\begin{document})/$1 {\\tiny\\begin{verbatim}$urlp\\end{verbatim}}/;
@@ -284,19 +323,21 @@ ENDPART
 	$first_comment = index($result,'<!--',$first_comment);
     }
     $result =~ s/^\s+$//gm; #remove empty lines
-    $result =~ s/%/\\%/g;   #corrects %
+    $result =~ s/\s%/\\%/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 >
+#    $result =~ s/ (<|>|) / \$$1\$ /g; #corrects < or >
     $result =~ s/\\\\\s*\\noindent\s*(\\\\)+/\\\\\\noindent /g;
     $result =~ s/{\\par }\s*\\\\/\\\\/gm;
 	$result =~ s/\\\\\s+\[/ \[/g;
     $result =~ s/&#952;/\$\\theta\$/g; #converts theta from html into tex
-    $result =~ s/\b_+\b/\\makebox\[1 cm\]\[b\]{\\hrulefill}/g;
+    $result =~ s/\b__+\b/\\makebox\[1 cm\]\[b\]{\\hrulefill}/g;
     #conversion of html characters to LaTeX equivalents
     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";
@@ -314,6 +355,7 @@ FINALEND
 
 sub character_chart {
     my $result = shift;	
+    $result =~ s/&#0?0?7;//g;
     $result =~ s/&#0?0?9;//g;
     $result =~ s/&#0?10;//g;
     $result =~ s/&#0?13;//g;
@@ -472,8 +514,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;
@@ -635,6 +677,9 @@ sub character_chart {
     return $result;
 }
 
+
+#'"`
+
 sub additional_cleanup {
     my $result = shift;	
     my $first_app = index($result,'\documentclass',0);
@@ -681,10 +726,10 @@ 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);
+    my $stalink = index($map_string,' to="'.$number_seq[0].'"',0);
     while ($stalink != -1) {
 	$startlink = rindex($map_string,'<link ',$stalink);
 	$endlink = index($map_string,'</link>',$startlink);