--- loncom/interface/lonprintout.pm	2002/07/16 20:30:53	1.38
+++ loncom/interface/lonprintout.pm	2002/08/09 20:38:42	1.49
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.38 2002/07/16 20:30:53 www Exp $
+# $Id: lonprintout.pm,v 1.49 2002/08/09 20:38:42 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -71,19 +71,23 @@ sub menu_for_output {
 <input type="hidden" name="url" value="$ENV{'form.postdata'}">
 <input type="radio" name="choice" value="Standard LaTeX output for current document" checked>  Current document
 (you will print what you see on the screen)<br />
+ENDMENUOUT1
+    if ((not $ENV{'request.role'}=~m/^au\./) and (not $ENV{'request.role'}=~m/^ca\./)) {
+    $r->print(<<ENDMENUOUT2);
 <input type="radio" name="choice" value="Standard LaTeX output for the primary sequence">  All problems from the primary sequence<br />
 <input type="radio" name="choice" value="Standard LaTeX output for whole primary sequence">  The whole primary sequence (problems plus all html and xml files)<br />
 <input type="radio" name="choice" value="Standard LaTeX output for the top level sequence">  All problems from the top level sequence<br />
 <br />
-ENDMENUOUT1
-    my $subdirtoprint = &Apache::lonnet::filelocation("",$ENV{'form.url'});
-    $subdirtoprint =~ s/\/[^\/]+$//;
-    if (&Apache::lonnet::allowed('bre',$subdirtoprint) eq 'F') {
-	$r->print(<<ENDMENUOUT2);
-<input type="radio" name="choice" value="Subdirectory print">  All problems from current subdirectory (where this particular problem is)<br />
 ENDMENUOUT2
-}
-    $r->print(<<ENDMENUOUT3);
+    }
+      my $subdirtoprint = &Apache::lonnet::filelocation("",$ENV{'form.url'});
+      $subdirtoprint =~ s/\/[^\/]+$//;
+      if (&Apache::lonnet::allowed('bre',$subdirtoprint) eq 'F') {
+	  $r->print(<<ENDMENUOUT4);
+  <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>
 <table>
@@ -94,7 +98,17 @@ ENDMENUOUT2
    </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>
@@ -103,7 +117,7 @@ ENDMENUOUT2
 </form>
 </body>
 </html>
-ENDMENUOUT3
+ENDMENUOUT5
 }
 
 
@@ -126,19 +140,26 @@ ENDPART
     my $laystyle = 'book';
     my $result = '';
     my $number_of_columns = 1;
+#    my $number_of_columns = $ENV{'form.numberofcolumns'};    
  
     if ($choice eq 'Standard LaTeX output for current document') {
       #-- single document - problem, page, html, xml  
       my %moreenv;
       $moreenv{'form.grade_target'}='tex';
+      if ($ENV{'request.role'}=~m/^au\./ or $ENV{'request.role'}=~m/^ca\./) {
+	  $ENV{'form.url'}=~s/http:\/\/[^\/]+//;
+      }
       $moreenv{'request.filename'}=$ENV{'form.url'};
       &Apache::lonnet::appenv(%moreenv);
       my $texversion=&Apache::lonnet::ssi($ENV{'form.url'});
       &Apache::lonnet::delenv('form.grade_target');
       $result .= $texversion;
       $result = &additional_cleanup($result);
-      if ($ENV{'form.url'}=~m/\.page\s*$/) {($result,$number_of_columns) = &page_cleanup($result);}
-    } elsif ($choice eq 'Standard LaTeX output for the primary sequence' or $choice eq 'Standard LaTeX output for whole primary sequence') {
+      if ($ENV{'form.url'}=~m/\.page\s*$/) {
+	  ($result,$number_of_columns) = &page_cleanup($result);
+      }
+    } elsif ($choice eq 'Standard LaTeX output for the primary sequence' or 
+             $choice eq 'Standard LaTeX output for whole primary sequence') {
       #-- minimal sequence to which the current document belongs
         #-- where is the primary sequence containing file?
 	my $symbolic = &Apache::lonnet::symbread($ENV{'form.url'});
@@ -175,35 +196,58 @@ ENDPART
 	}	
 	$result = &additional_cleanup($result);
     }  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?
+	for (my $iu=0;$iu<=$#file_seq;$iu++) {
+	    $file_seq[$iu]=~s/^"//;
+	    $file_seq[$iu]=~s/"$//;
+	    if ($file_seq[$iu]=~m/\S+/) {
+		$file_seq[$iu]=&Apache::lonnet::filelocation("",$file_seq[$iu]);
+	    } else {
+		$file_seq[$iu]= 'REMOVE IT PLEASE';
+	    }
+	}
 	my $i=0;
-	while ($i<=$#file_seq) {
-	    $_ = $file_seq[$i];
-	    if (/\.sequence$/) {
-		$file = &Apache::lonnet::filelocation("",$file_seq[$i]);
-		$filecontents=&Apache::lonnet::getfile($file);
-		@add_file_seq = &content_map($filecontents);
-		splice(@file_seq,$i,1,@add_file_seq);
-		@add_file_seq = ();
-		$i = -1;
+        my $limit = $#file_seq;		    
+        while ($i<=$limit) {	
+	    unless ($file_seq[$i]=~m/\.(problem|page)/) {
+		if ($file_seq[$i]=~m/\.sequence/) {
+		    my $filecontents=&Apache::lonnet::getfile($file_seq[$i]);
+		    my @newfile_seq = &content_map($filecontents);
+		    for (my $iu=0;$iu<=$#newfile_seq;$iu++) {
+			$newfile_seq[$iu]=~s/^"//;
+	                $newfile_seq[$iu]=~s/"$//;
+			if ($newfile_seq[$iu]=~m/\S+/) {
+			    $newfile_seq[$iu]=&Apache::lonnet::filelocation("",$newfile_seq[$iu]);
+			} else {
+			    $newfile_seq[$iu]= 'REMOVE IT PLEASE';
+			}
+		    }
+		    splice @file_seq,$i,1,@newfile_seq;
+		    $i=0;
+		    $limit = $#file_seq;
+		} else {
+		    splice @file_seq,$i,1,'REMOVE IT PLEASE';
+		}
 	    }
 	    $i++;
 	}
-	@master_seq = @file_seq;	
+	for (my $iu=0;$iu<=$#file_seq;$iu++) {
+	    if ($file_seq[$iu]=~m/REMOVE IT PLEASE/) {
+		splice @file_seq,$iu,1;
+	    }
+	}
+	if ($file_seq[-1]=~m/REMOVE IT PLEASE/) {
+	    pop @file_seq;
+	}
 #-- produce an output string
-	for (my $i=0;$i<=$#master_seq;$i++) {
-	    $_ = $master_seq[$i];
-	    m/\"(.*)\"/;
-            $_ = $1;
-            my $urlp = $1;
-            if (/\.(problem|exam|quiz|assess|survey|form|library)/) {
+	for (my $i=0;$i<=$#file_seq;$i++) {
+            my $urlp = $file_seq[$i];
+	    $urlp=~s/\/home\/httpd\/html//;	    
+            if ($urlp=~m/\.(problem|exam|quiz|assess|survey|form|library)/) {
 		my %moreenv;
 		$moreenv{'form.grade_target'}='tex';
 		&Apache::lonnet::appenv(%moreenv);
@@ -217,22 +261,32 @@ 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\./ or $ENV{'request.role'}=~m/^ca\./) {
+	    $subdirtoprint =~ s/^[^~]*~(\w+)\//\/home\/$1\/public_html\//;
+	} else {
+	    $subdirtoprint =~ s/.*(\/res\/)/$1/;
+	}
+	my @content_directory = ();
+	if ($ENV{'request.role'}=~m/^au\./ or $ENV{'request.role'}=~m/^ca\./) {
+	    @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\./ or $ENV{'request.role'}=~m/^ca\./) { 
+		$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}}/;
@@ -276,19 +330,20 @@ 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/\\\\\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";
@@ -306,81 +361,82 @@ FINALEND
 
 sub character_chart {
     my $result = shift;	
-    $result =~ s/&#009;//g;
-    $result =~ s/&#010;//g;
-    $result =~ s/&#013;//g;
-    $result =~ s/&#032;/ /g;
-    $result =~ s/&#033;/!/g;
-    $result =~ s/&#034;/"/g;
-    $result =~ s/&quot;/"/g; #"
-    $result =~ s/&#035;/\\#/g;
-    $result =~ s/&#036;/\\\$/g;
-    $result =~ s/&#037;/\\%/g; 
-    $result =~ s/&#038;/\\&/g; 
+    $result =~ s/&#0?0?7;//g;
+    $result =~ s/&#0?0?9;//g;
+    $result =~ s/&#0?10;//g;
+    $result =~ s/&#0?13;//g;
+    $result =~ s/&#0?32;/ /g;
+    $result =~ s/&#0?33;/!/g;
+    $result =~ s/&#0?34;/"/g;
+    $result =~ s/&quot;/"/g; 
+    $result =~ s/&#0?35;/\\#/g;
+#    $result =~ s/&#0?36;/\\\$/g;
+    $result =~ s/&#0?37;/\\%/g; 
+    $result =~ s/&#0?38;/\\&/g; 
     $result =~ s/&amp;/\\&/g;
-    $result =~ s/&#039;/'/g;
-    $result =~ s/&#040;/(/g;
-    $result =~ s/&#041;/)/g;
-    $result =~ s/&#042;/\*/g;
-    $result =~ s/&#043;/\+/g;
-    $result =~ s/&#044;/,/g;
-    $result =~ s/&#045;/-/g;
-    $result =~ s/&#046;/\./g;
-    $result =~ s/&#047;/\//g;
-    $result =~ s/&#048;/0/g;
-    $result =~ s/&#049;/1/g;
-    $result =~ s/&#050;/2/g;
-    $result =~ s/&#051;/3/g;
-    $result =~ s/&#052;/4/g;
-    $result =~ s/&#053;/5/g;
-    $result =~ s/&#054;/6/g;
-    $result =~ s/&#055;/7/g;
-    $result =~ s/&#056;/8/g;
-    $result =~ s/&#057;/9/g;
-    $result =~ s/&#058;/:/g;
-    $result =~ s/&#059;/;/g;
-    $result =~ s/&#060;/\$<\$/g;
+    $result =~ s/&#0?39;/'/g;
+    $result =~ s/&#0?40;/(/g;
+    $result =~ s/&#0?41;/)/g;
+    $result =~ s/&#0?42;/\*/g;
+    $result =~ s/&#0?43;/\+/g;
+    $result =~ s/&#0?44;/,/g;
+    $result =~ s/&#0?45;/-/g;
+    $result =~ s/&#0?46;/\./g;
+    $result =~ s/&#0?47;/\//g;
+    $result =~ s/&#0?48;/0/g;
+    $result =~ s/&#0?49;/1/g;
+    $result =~ s/&#0?50;/2/g;
+    $result =~ s/&#0?51;/3/g;
+    $result =~ s/&#0?52;/4/g;
+    $result =~ s/&#0?53;/5/g;
+    $result =~ s/&#0?54;/6/g;
+    $result =~ s/&#0?55;/7/g;
+    $result =~ s/&#0?56;/8/g;
+    $result =~ s/&#0?57;/9/g;
+    $result =~ s/&#0?58;/:/g;
+    $result =~ s/&#0?59;/;/g;
+    $result =~ s/&#0?60;/\$<\$/g;
     $result =~ s/&lt;/\$<\$/g;
-    $result =~ s/&#061;/\$=\$/g;
-    $result =~ s/&#062;/\$>\$/g;
+    $result =~ s/&#0?61;/\$=\$/g;
+    $result =~ s/&#0?62;/\$>\$/g;
     $result =~ s/&gt;/\$>\$/g;
-    $result =~ s/&#063;/?/g;
-#    $result =~ s/&#064;//g;
-    $result =~ s/&#065;/A/g;
-    $result =~ s/&#066;/B/g;
-    $result =~ s/&#067;/C/g;
-    $result =~ s/&#068;/D/g;
-    $result =~ s/&#069;/E/g;
-    $result =~ s/&#070;/F/g;
-    $result =~ s/&#071;/G/g;
-    $result =~ s/&#072;/H/g;
-    $result =~ s/&#073;/I/g;
-    $result =~ s/&#074;/J/g;
-    $result =~ s/&#075;/K/g;
-    $result =~ s/&#076;/L/g;
-    $result =~ s/&#077;/M/g;
-    $result =~ s/&#078;/N/g;
-    $result =~ s/&#079;/O/g;
-    $result =~ s/&#080;/P/g;
-    $result =~ s/&#081;/Q/g;
-    $result =~ s/&#082;/R/g;
-    $result =~ s/&#083;/S/g;
-    $result =~ s/&#084;/T/g;
-    $result =~ s/&#085;/U/g;
-    $result =~ s/&#086;/V/g;
-    $result =~ s/&#087;/W/g;
-    $result =~ s/&#088;/X/g;
-    $result =~ s/&#089;/Y/g;
-    $result =~ s/&#090;/Z/g;
-    $result =~ s/&#091;/[/g;
-    $result =~ s/&#092;/\\/g;
-    $result =~ s/&#093;/]/g;
-#    $result =~ s/&#094;//g;
-#    $result =~ s/&#095;//g;
-    $result =~ s/&#096;/`/g;
-    $result =~ s/&#097;/a/g;
-    $result =~ s/&#098;/b/g;
-    $result =~ s/&#099;/c/g;
+    $result =~ s/&#0?63;/?/g;
+#    $result =~ s/&#0?64;//g;
+    $result =~ s/&#0?65;/A/g;
+    $result =~ s/&#0?66;/B/g;
+    $result =~ s/&#0?67;/C/g;
+    $result =~ s/&#0?68;/D/g;
+    $result =~ s/&#0?69;/E/g;
+    $result =~ s/&#0?70;/F/g;
+    $result =~ s/&#0?71;/G/g;
+    $result =~ s/&#0?72;/H/g;
+    $result =~ s/&#0?73;/I/g;
+    $result =~ s/&#0?74;/J/g;
+    $result =~ s/&#0?75;/K/g;
+    $result =~ s/&#0?76;/L/g;
+    $result =~ s/&#0?77;/M/g;
+    $result =~ s/&#0?78;/N/g;
+    $result =~ s/&#0?79;/O/g;
+    $result =~ s/&#0?80;/P/g;
+    $result =~ s/&#0?81;/Q/g;
+    $result =~ s/&#0?82;/R/g;
+    $result =~ s/&#0?83;/S/g;
+    $result =~ s/&#0?84;/T/g;
+    $result =~ s/&#0?85;/U/g;
+    $result =~ s/&#0?86;/V/g;
+    $result =~ s/&#0?87;/W/g;
+    $result =~ s/&#0?88;/X/g;
+    $result =~ s/&#0?89;/Y/g;
+    $result =~ s/&#0?90;/Z/g;
+    $result =~ s/&#0?91;/[/g;
+    $result =~ s/&#0?92;/\\/g;
+    $result =~ s/&#0?93;/]/g;
+#    $result =~ s/&#0?94;//g;
+#    $result =~ s/&#0?95;//g;
+    $result =~ s/&#0?96;/`/g;
+    $result =~ s/&#0?97;/a/g;
+    $result =~ s/&#0?98;/b/g;
+    $result =~ s/&#0?99;/c/g;
     $result =~ s/&#100;/d/g;
     $result =~ s/&#101;/e/g;
     $result =~ s/&#102;/f/g;
@@ -464,8 +520,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;
@@ -627,6 +683,9 @@ sub character_chart {
     return $result;
 }
 
+
+#'"`
+
 sub additional_cleanup {
     my $result = shift;	
     my $first_app = index($result,'\documentclass',0);
@@ -673,10 +732,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);