--- loncom/interface/printout.pl	2005/11/15 20:53:06	1.93
+++ loncom/interface/printout.pl	2006/04/20 02:24:08	1.97
@@ -25,20 +25,17 @@
 # http://www.lon-capa.org/
 #
 
-BEGIN {
-    eval "use Apache2::compat();";
-};
 use lib '/home/httpd/lib/perl';
 use LONCAPA::loncgi;
 use File::Path;
 use File::Basename;
 use IO::File;
 use Image::Magick;
-use Apache::lonhtmlcommon;
+use Apache::lonhtmlcommon();
 use Apache::lonnet;
-use Apache::loncommon;
+use Apache::loncommon();
 use Apache::lonlocal;
-use Apache::lonmsg;
+use Apache::lonmsg();
 use LONCAPA::Enrollment;
 
 use strict;
@@ -164,8 +161,7 @@ END
 }
  &Apache::lonlocal::get_language_handle();
  &Apache::loncommon::content_type(undef,'text/html');
- my $bodytag=&Apache::loncommon::bodytag('Creating PDF','','');
- print $bodytag;
+ print(&Apache::loncommon::start_page('Creating PDF'));
 
   my $identifier = $ENV{'QUERY_STRING'};
   my $texfile = $env{'cgi.'.$identifier.'.file'};
@@ -186,6 +182,8 @@ END
       @names_pack=split(/_ENDPERSON_/,$student_names);
   }
 
+print "<a href=\"$backref\"><b>Return</b></a> to last resource.<br /><br />";
+
   my $figfile = $texfile;
   $figfile =~ s/^([^\.]+printout)[^t]+\.tex/$1\.dat/;
   my $duefile = $texfile;
@@ -201,6 +199,7 @@ END
       my $noteps;
       my %prog_state;
       if ($advanced_role) { %prog_state=&Apache::lonhtmlcommon::Create_PrgWin('','Coverting Images to EPS','Picture Conversion Status',$#content_of_file,'inline','80');  }
+      print('<br />');
       foreach my $not_eps (@content_of_file) {
 	  chomp($not_eps);
 	  if ($not_eps ne '') {
@@ -269,7 +268,6 @@ END
 
 my $ind=-1;
 my %prog_state;
-print "<a href=\"$backref\"><b>Return</b></a> to last resource.<br /><br />";
 if ($advanced_role) { %prog_state=&Apache::lonhtmlcommon::Create_PrgWin('','Print Status','Class Print Status',$number_of_files,'inline','80'); }
 print "<br />";
 my $num_files = @texfile;
@@ -335,7 +333,10 @@ foreach $texfile (@texfile) {
 			 \%prog_state,$dvi_file);
       if ($tableofcontents eq 'yes') {
       &busy_wait_command("latex $name_file 1>/dev/null 2>/dev/null",
-			 "for $status_statement now LaTeXing file for table of contents",
+			 "for $status_statement First LaTeX of file for table of contents",
+			 \%prog_state,$dvi_file);
+      &busy_wait_command("latex $name_file 1>/dev/null 2>/dev/null",
+			 "for $status_statement Second LaTeX of file for table of contents",
 			 \%prog_state,$dvi_file);
       } #to create table of contents
       my $idxname=$name_file;
@@ -605,7 +606,7 @@ if ($number_of_files>1) {
     print "<br /> A <a href=\"$zipfile\">ZIP file</a> of all the PDFs.";
 }
 if ($advanced_role) { &Apache::lonhtmlcommon::Close_PrgWin('',\%prog_state); }
-
+print(&Apache::loncommon::end_page());
 my $done;
 sub REAPER {
     $done=1;