--- loncom/interface/printout.pl	2008/03/26 09:50:21	1.135
+++ loncom/interface/printout.pl	2010/08/26 08:32:58	1.146.4.1
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # CGI-script to run LaTeX, dvips, ps2ps, ps2pdf etc.
 #
-# $Id: printout.pl,v 1.135 2008/03/26 09:50:21 foxr Exp $
+# $Id: printout.pl,v 1.146.4.1 2010/08/26 08:32:58 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -45,9 +45,14 @@ use strict;
 
 my $busy_wait_timeout = 30; 
 
+
+my $debugging = 0;
+
 sub debug {
-    my ($text) = @_;
-    print "$text <br />\n";
+    if ($debugging) {
+	my ($text) = @_;
+	print "$text <br />\n";
+    }
 }
 
 #   Determine if a user is operating as a student for this course/domain.
@@ -118,7 +123,7 @@ sub send_error_mail {
 	
 	if (&is_student()) {
 	    # build the subject and message body:
-	    # print "sending message to course coordinators.<br />";
+	    &debug("sending message to course coordinators.");
 
 	    # Todo: Convert badurl into a url from file path:
 
@@ -137,9 +142,9 @@ sub send_error_mail {
 	    }
 	    my (undef, %receivers) = &Apache::lonmsg::decide_receiver(undef, 0,
 								      1,1,1);
-	    # print "<br /> sending...section:  $env{'request.course.sec'}";
+	    &debug("sending...section:  $env{'request.course.sec'}");
 	    foreach my $dest (keys %receivers) {
-		# print "<br /> dest is $dest";
+		&debug("dest is $dest");
 		my @destinfo = split(/:/,$dest);
 		my $user = $destinfo[0];
 		my $dom  = $destinfo[1];
@@ -166,14 +171,24 @@ Your cookie information is incorrect.
 </body>
 </html>
 END
-    return;
+    exit;
 }
 
 my %perlvar=%{&LONCAPA::Configuration::read_conf('loncapa.conf')};
 &Apache::lonlocal::get_language_handle();
 &Apache::loncommon::content_type(undef,'text/html');
 $env{'request.noversionuri'} = '/cgi-bin/printout.pl';
-print(&Apache::loncommon::start_page('Creating PDF'));
+# Breadcrumbs
+#FIXME: Choose better/different breadcrumbs?!? Links?
+my $brcrum = [{'href' => '',
+               'text' => 'Helper'}, #FIXME: Different origin possible than print out helper?
+              {'href' => '',
+               'text' => 'Preparing Printout'},
+              {'href' => '',
+               'text' => 'Creating PDF'}];
+print(&Apache::loncommon::start_page('Creating PDF',
+                                     undef,
+                                     {'bread_crumbs' => $brcrum,}));
 
 my $identifier = $ENV{'QUERY_STRING'};
 my $texfile = $env{'cgi.'.$identifier.'.file'};
@@ -211,8 +226,11 @@ $duefile =~ s/^(.*_printout)_\d+_\d+_\d+
 #   it contains the names of the files that need to be converted, one per line.
 #
 
+&debug("Figure file is $figfile");
+
 if (-e $figfile) {
-    # print "$figfile exists\n";
+    &debug( "Figure file exists");
+    &debug("$figfile exists");
     my %done_conversion;
     my $temporary_file=IO::File->new($figfile) || die "Couldn't open fig file $figfile for reading: $!\n";
     my @content_of_file = <$temporary_file>;
@@ -223,6 +241,7 @@ if (-e $figfile) {
     print('<br />');
     foreach my $not_eps (@content_of_file) {
 	chomp($not_eps);
+	&debug( "Being asked to convert $not_eps");
 	if ($not_eps ne '') {
 	    $not_eps=~s|\/\.\/|\/|g;
 	    if (!$done_conversion{$not_eps}) { #  Only convert multiple includes once.
@@ -264,7 +283,7 @@ my $ind=-1;
 
 my %prog_state;
 if ($advanced_role) { 
-    %prog_state=&Apache::lonhtmlcommon::Create_PrgWin('','Print Status','Class Print Status',$number_of_files,'inline','80'); 
+    %prog_state=&Apache::lonhtmlcommon::Create_PrgWin('','Print Status',&mt('Class Print Status'),$number_of_files,'inline','80'); 
 }
 print "<br />";
 my $num_files = @texfile;	# How does this differ from $number_of_files , can that be 0?
@@ -403,7 +422,8 @@ foreach $texfile (@texfile) {
 	  my $papera=$paper;
 	  if ($papera eq 'letter') {$papera='';}
 	  if ($papera ne '') {$papera='-t'.$papera;}
-	  my $comma = "dvips $papera -Ppdf -G0 -o $new_name_file";
+	  my $extra_ps_header = $perlvar{'lonLib'} .'/includepsheader.ps';
+	  my $comma = "dvips $papera -h $extra_ps_header -Ppdf -G0 -o  $new_name_file";
 	  &busy_wait_command("$comma $name_file 1>/dev/null 2>/dev/null",
 			     "for $status_statement now Converting to PS",
 			     \%prog_state,$new_name_file);
@@ -459,12 +479,14 @@ foreach $texfile (@texfile) {
 	      $papera=~s/t/p/;
 	      if ($laystyle eq 'album' and $numberofcolumns eq '2') {
 		  $comma = "psnup $papera -2 -s1.0 $new_name_file";
+		  &debug("PSNUP command: $comma");
 		  &busy_wait_command("$comma $tempo_file 1>/dev/null 2>/dev/null",
 				     "for $status_statement now Modifying PS layout",
 				     \%prog_state,$tempo_file);
 	      } elsif ($laystyle eq 'book' and $numberofcolumns eq '2') {
-		  $comma = 'pstops '.$papera.' "2:0+1(0.48w,0)"';
-		  &busy_wait_command("$comma $new_name_file $tempo_file 1>/dev/null 2>/dev/null",
+		  $comma = 'pstops '.$papera.' "2:0+1(0.48w,0)" '.$new_name_file;
+		  &debug("PSTOPS command: $comma ");
+		  &busy_wait_command("$comma $tempo_file 1>/dev/null 2>/dev/null",
 				     "for $status_statement now Modifying PS layout",
 				     \%prog_state,$tempo_file); 
 	      } else {
@@ -491,7 +513,7 @@ foreach $texfile (@texfile) {
 		  close(FFHS);
 		  $ps_file=$new_ps_file;	  
 	      }
-	      &busy_wait_command("ps2pdf $ps_file $pdf_file 1>/dev/null 2>/dev/null",
+	      &busy_wait_command("ps2pdf13 $ps_file $pdf_file 1>/dev/null 2>/dev/null",
 				 "for $status_statement now Converting PS to PDF",
 				 \%prog_state,$pdf_file);
 	    
@@ -594,7 +616,7 @@ sub busy_wait_command {
 # various bits and pieces that control how the latex file is processed:
 # LaTeX is run as many times a needed to make this all happen... this may
 # result in several runs of LaTeX that just are errors if the LaTeX is
-# bad, butthe printing subsystem is _supposed_ to not do that.
+# bad, but the printing subsystem is _supposed_ to not do that.
 #
 # Parameters:
 #   name_file        - Name of the LaTeX file to process.
@@ -845,6 +867,7 @@ sub create_missing_fonts {
 #
 sub convert_figure {
     my ($not_eps) = @_;
+    &debug("in convert_figure");
 
     my $status_statement='EPS picture for '.$not_eps;
     my $eps_f = $not_eps;
@@ -888,7 +911,24 @@ sub convert_figure {
 	    &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,
 						  'Converting to EPS '.$prettyname);
 	}
-	system("convert $not_eps $eps_f");
+	#
+	#  If the file is a PDF, need to use pdftops to convert it to a ps file.
+	#  otherwise use imagemagik:
+	#
+	if($not_eps =~/\.(pdf|PDF)$/) {
+
+	    #
+	    # For whatever reason, pure postscript conversions have to be
+	    # in the same dir as the base file:
+	    #
+	    $eps_f = &basename($eps_f);
+	    $eps_f = $perlvar{'lonPrtDir'}.'/'.$eps_f;
+
+	    &debug("Converting pdf $not_eps to postscript: $eps_f");
+	    system("pdftops $not_eps $eps_f");
+	} else {
+	    system("convert $not_eps $eps_f");
+	}
 
 	if (not -e $eps_f) {
 	    # converting an animated gif creates either:
@@ -966,16 +1006,20 @@ sub analyze_logfile {
 				      length($badtext) - $whereitbegins - 48);
 		# print "<br />failing resourcename: $badresource<br />";
 	    }
-	}
+        }
 
 	# Guys with privileged roles get a more detailed error output:
 
 	if ($advanced_role) {  
 	    #LaTeX failed to parse tex file 
-	    print "<h2>LaTeX could not successfully parse your tex file.</h2>";
-	    print "It probably has errors in it.<br />";
-	    print "With very high probability this error occured in ".$badtext."<br /><br />";
-	    print "Here are the error messages in the LaTeX log file<br /><pre>";
+	    print "<h2>".&mt('LaTeX could not successfully parse your TeX file.')."</h2>";
+	    print &mt('It probably has errors in it.')."<br />";
+	    if ($badtext) {
+                print &mt('With very high probability this error occured in [_1].',$badtext)
+                     ."<br /><br />";
+            }
+	    print &mt('Here are the error messages in the LaTeX log file:')
+                 ."<br /><pre>";
 	    
 	    my $sygnal = 0;
 	    for (my $i=0;$i<=$#content_of_file;$i++) {
@@ -991,10 +1035,10 @@ sub analyze_logfile {
 	    }
 	    print "</pre>\n";
 	    # print "<br /> Advanced role <br />";
-	    print "<b><big>The link to ";
 	    $logfilename=~s{^\Q$perlvar{'lonPrtDir'}\E}{/prtspool};
-	    print "<a href=\"$logfilename\">Your log file </a></big></b>";
-	    print "\n";
+	    print "<b><big>"
+                 .&mt('The link to [_1]Your log file[_2]','<a href="'.$logfilename.'">','</a>')
+	         ."</big></b>\n";
 	    #link to original LaTeX file
 	    my $tex_temporary_file=IO::File->new($texfile) || die "Couldn't open tex file $texfile for reading: $!\n";
 	    my @tex_content_of_file = <$tex_temporary_file>;
@@ -1004,11 +1048,11 @@ sub analyze_logfile {
 	    $tex_temporary_file = IO::File->new('>'.$texfile); 
 	    print $tex_temporary_file '<html><head><title>LOGFILE</title></head><body><pre>'.$body_tex_file.'</pre></body></html>'."\n";
 	    print "<br /><br />";
-	    print "<b><big>The link to ";
 	    $texfile=~s{^\Q$perlvar{'lonPrtDir'}\E}{/prtspool};
-	    print "<a href=\"$texfile\">Your original LaTeX file </a></big></b>";
-	    print "\n";
-	    my $help_text = &Apache::loncommon::help_open_topic("Print_Resource", "Help on printing");
+	    print "<b><big>"
+                 .&mt('The link to [_1]Your original LaTeX file[_2]','<a href="'.$texfile.'">','</a>')
+	         ."</big></b><br /><br />\n";
+	    my $help_text = &Apache::loncommon::help_open_topic("Print_Resource", &mt('Help on printing'));
 	    print ("$help_text");
 
 	    # Students on the other hand get a minimal error message, since they won't
@@ -1021,13 +1065,22 @@ sub analyze_logfile {
 	    #    $name_file     - is the name of the LaTeX file.
 	    #    $identifier    - is the unique LaTeX identifier.l
 	    
-	    print "<br />There are errors in $badtext";
-	    print "<br />These errors prevent this resource from printing correctly";
+            print '<p class="LC_error">';
+	    if ($badtext) {
+                print &mt('There are errors in [_1].',$badtext);
+            } else {
+                print &mt('There are errors.');
+            }
+            print '</p>'
+                 .&mt('These errors prevent this resource from printing correctly.');
+
 	    my $tex_handle = IO::File->new($texfile);
 	    my @tex_contents = <$tex_handle>;
 	    &send_error_mail($identifier, $badresource, $body_log_file, \@tex_contents);
-	    print "<br />A message has been sent to the instructor describing this failure<br />";
-	    my $help_text = &Apache::loncommon::help_open_topic("Print_Resource", "Help on printing");
+	    print "<p>"
+                 .&mt('A message has been sent to the instructor describing this failure.')
+                 ."</p>";
+	    my $help_text = &Apache::loncommon::help_open_topic("Print_Resource", &mt('Help on printing'));
 	    print  ("$help_text");
 	    
 	  }
@@ -1044,22 +1097,24 @@ sub analyze_logfile {
 
     } elsif ($body_log_file=~m/<inserted text>/) {
 	my $whereitbegins = index $body_log_file,'<inserted text>';
-	print "You are running LaTeX in <b>batch mode</b>.";
+	print &mt('You are running LaTeX in [_1]batch mode[_2].','<b>','</b>');
 	while ($whereitbegins != -1) {
 	    my $tempobegin=$whereitbegins;
 	    $whereitbegins = rindex $body_log_file,'STAMPOFPASSEDRESOURCESTART',$whereitbegins;
 	    my $whereitends = index $body_log_file,'STAMPOFPASSEDRESOURCEEND',$whereitbegins;
-	    print "<br />It has found an error in".substr($body_log_file,$whereitbegins+26,$whereitends-$whereitbegins-26)." <br /> and corrected it.\n";
-	    print "Usually this correction is valid but you probably need to check the indicated resource one more time and implement neccessary corrections by yourself.\n";
+	    print "<br />"
+                 .&mt('It has found an error in [_1][_2]and corrected it.',substr($body_log_file,$whereitbegins+26,$whereitends-$whereitbegins-26),"<br />")."\n";
+	    print &mt('Usually this correction is valid but you probably need to check the indicated resource one more time and implement neccessary corrections by yourself.')."\n";
 	    $whereitbegins = index $body_log_file,'<inserted text>',$tempobegin+10;
 	}
 
 	if ($advanced_role) {  
 	    print "<br /><br />";
-	    print "<b><big>The link to ";
 	    $logfilename=~s{^\Q$perlvar{'lonPrtDir'}\E}{/prtspool};
-	    print "<a href=\"$logfilename\">Your log file </a></big></b>";
-	    print "\n";
+	    print "<b><big>"
+                 .&mt('The link to [_1]Your log file[_2]'
+                     ,'<a href="'.$logfilename.'">','</a>')
+	         ."</big></b>\n";
 	    #link to original LaTeX file
 	    my $tex_temporary_file=IO::File->new($texfile) || die "Couldn't open tex file $texfile for reading: $!\n";
 	    my @tex_content_of_file = <$tex_temporary_file>;
@@ -1069,10 +1124,10 @@ sub analyze_logfile {
 	    $tex_temporary_file = IO::File->new('>'.$texfile); 
 	    print $tex_temporary_file '<html><head><title>LOGFILE</title></head><body><pre>'.$body_tex_file.'</pre></body></html>'."\n";
 	    print "<br /><br />";
-	    print "<b><big>The link to ";
 	    $texfile=~s{^\Q$perlvar{'lonPrtDir'}\E}{/prtspool};
-	    print "<a href=\"$texfile\">Your original LaTeX file </a></big></b>";
-	    print "\n";
+	    print "<b><big>"
+                  .&mt('The link to [_1]Your original LaTeX file[_2]','<a href="'.$texfile.'">','</a>');
+	    print "</big></b>\n";
 	}
 	return 1;
     }