--- loncom/interface/printout.pl	2007/04/20 20:54:24	1.123
+++ loncom/interface/printout.pl	2007/09/21 21:11:20	1.127
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # CGI-script to run LaTeX, dvips, ps2ps, ps2pdf etc.
 #
-# $Id: printout.pl,v 1.123 2007/04/20 20:54:24 albertel Exp $
+# $Id: printout.pl,v 1.127 2007/09/21 21:11:20 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -217,13 +217,13 @@ print "<a href=\"$backref\"><b>Return</b
 	      # $eps_f =~ s/\.[^.]*$/\.eps/i;
 	      if ($eps_f=~/\/home\/([^\/]+)\/public_html\//) {
                   $eps_f=~s/\/home\/([^\/]+)\/public_html/$1/;
-		  $eps_f = $perlvar{'lonPrtDir'}.$eps_f;
+		  $eps_f = $perlvar{'lonPrtDir'}.'/'.$eps_f;
 	      } elsif ($eps_f=~/$perlvar{'lonDocRoot'}\/res\//) {
 		  $eps_f=~m/$perlvar{'lonDocRoot'}\/res\/(.+)/;
-		  $eps_f = $perlvar{'lonPrtDir'}.$1;
+		  $eps_f = $perlvar{'lonPrtDir'}.'/'.$1;
 	      } elsif ($eps_f=~/$perlvar{'lonUsersDir'}\//) {
 		  $eps_f=~/$perlvar{'lonUsersDir'}\/([^\/]+)\/\w\/\w\/\w\/(.+)/;
-		  $eps_f = $perlvar{'lonPrtDir'}.$1.'/'.$2;
+		  $eps_f = $perlvar{'lonPrtDir'}.'/'.$1.'/'.$2;
 	      }
 	      $eps_f  =~ s/ /\_/g; # Spaces are problematic for system commands and LaTeX.
 	      # 
@@ -523,7 +523,7 @@ foreach $texfile (@texfile) {
 	      if ($tableofindex eq 'yes') {
 		  my $idxname = $latex_file;
 		  $idxname =~ s/\.tex$/\.idx/;
-		  &busy_wait_command("makindex $idxname",
+		  &busy_wait_command("makeindex $idxname",
 				     "Re-creating index file",
 				     \%prog_state, $idxname);
 		  &busy_wait_command("latex $latex_file 1>/dev/null 2>/dev/null",
@@ -562,7 +562,7 @@ foreach $texfile (@texfile) {
 	      #print("<br /> Missing fonts file is: $missfonts_file");
 	      if (-e $missfonts_file) {
 		  #print("<br />Missing fonts file exists\n");
-		  &create_missing_fonts($missfonts_file);
+		  &create_missing_fonts($missfonts_file,\%prog_state);
 		  &busy_wait_command("$comma $name_file 1>/dev/null 2>/dev/null",
 				     "for $status_statement dvips generated missing fonts",
 				     \%prog_state, $new_name_file);
@@ -673,7 +673,7 @@ foreach $texfile (@texfile) {
 	  #print("<br /> Missing fonts file is: $missfonts_file");
 	  if (-e $missfonts_file) {
 	      #print("<br />Missing fonts file exists\n");
-	      &create_missing_fonts($missfonts_file);
+	      &create_missing_fonts($missfonts_file,\%prog_state);
 	      &busy_wait_command("$comma $name_file 1>/dev/null 2>/dev/null",
 				 "for $status_statement dvips generated missing fonts",
 				 \%prog_state, $new_name_file);
@@ -868,7 +868,7 @@ sub repaginate {
 	#  bottom of the page, m the page number within the document.
 	#
 
-	if ($line =~ /^%%Page:/) {
+	if ($line =~ /^%%Page:\s+\d+\s+\d+/) {
 	    my @pageinfo = split(/\s+/, $line);
 	    if ($page_number < $pageinfo[1]) {
 		$page_number = $pageinfo[1];
@@ -1000,7 +1000,7 @@ sub create_missing_fonts {
 	#print("<br />Creating fonts via command: $command");
 	&busy_wait_command("$command 1>/dev/null 2>/dev/null",
 			   "Creating missing font",
-			   $state, $command);
+			   $state);
 			   
     }