--- loncom/interface/printout.pl	2009/07/03 16:13:13	1.143
+++ loncom/interface/printout.pl	2011/03/04 16:53:06	1.146.4.2
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # CGI-script to run LaTeX, dvips, ps2ps, ps2pdf etc.
 #
-# $Id: printout.pl,v 1.143 2009/07/03 16:13:13 bisitz Exp $
+# $Id: printout.pl,v 1.146.4.2 2011/03/04 16:53:06 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -171,7 +171,7 @@ Your cookie information is incorrect.
 </body>
 </html>
 END
-    return;
+    exit;
 }
 
 my %perlvar=%{&LONCAPA::Configuration::read_conf('loncapa.conf')};
@@ -478,16 +478,15 @@ foreach $texfile (@texfile) {
 	      my $pdf_file = $1.'.pdf';
 	      $papera=~s/t/p/;
 	      if ($laystyle eq 'album' and $numberofcolumns eq '2') {
-		  $comma = "fixps --force ".$new_name_file." | psnup $papera -2 -s1.0 ";
+		  $comma = "psnup $papera -2 -s1.0 $new_name_file";
 		  &debug("PSNUP command: $comma");
-		  &busy_wait_command("$comma 1>$tempo_file  2>/dev/null",
+		  &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 = 'fixps --force '.$new_name_file.' | pstops '.$papera.' "2:0+1(0.48w,0)"';
+		  $comma = 'pstops '.$papera.' "2:0+1(0.48w,0)" '.$new_name_file;
 		  &debug("PSTOPS command: $comma ");
-
-		  &busy_wait_command("$comma 1>$tempo_file  2>/dev/null",
+		  &busy_wait_command("$comma $tempo_file 1>/dev/null 2>/dev/null",
 				     "for $status_statement now Modifying PS layout",
 				     \%prog_state,$tempo_file); 
 	      } else {
@@ -905,8 +904,8 @@ sub convert_figure {
 	$not_eps =~ s/^\s+//;
 	$not_eps =~ s/\s+$//;
 	$not_eps =~ s/ /\\ /g;
+        my $prettyname=$not_eps;
 	if ($advanced_role) {
-	    my $prettyname=$not_eps;
 	    $prettyname=~s|/home/([^/]+)/public_html|/priv/$1|;
 	    $prettyname=~s|$perlvar{'lonDocRoot'}/|/|;
 	    &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,
@@ -929,6 +928,12 @@ sub convert_figure {
 	    system("pdftops $not_eps $eps_f");
 	} else {
 	    system("convert $not_eps $eps_f");
+            if ($? and $advanced_role) {
+                print '<p class="LC_warning">'
+                      .&mt('An error occured during the conversion of [_1].[_2]If possible try to save this image using different settings and republish it.',
+                      '<span class="LC_filename">'.$prettyname.'</span>','<br/>')
+                      .'</p>';
+            }
 	}
 
 	if (not -e $eps_f) {