X-Git-Url: https://git.sesse.net/?p=webpdf;a=blobdiff_plain;f=createpdf.pl;h=3d9afce4281ebbb08d83435602f4b2e06651d694;hp=9ee7aa92985d66be94b0d7573ea709ef2b5390de;hb=130810b91098f85be3763e727bd420d2107b1f81;hpb=33885bda9f692a30c3b9783b7ade631b3d2040d4

diff --git a/createpdf.pl b/createpdf.pl
index 9ee7aa9..3d9afce 100755
--- a/createpdf.pl
+++ b/createpdf.pl
@@ -90,7 +90,7 @@ if ($filename =~ /(.*)\.(?:e?ps|pdf)$/i) {
 		print PIPE $buf;
 	}
 	close PIPE;
-} elsif ($filename =~ /(.*)\.(doc|xls|ppt|sxw|sxc|sxi)$/i) {
+} elsif ($filename =~ /(.*)\.(doc|xls|ppt)$/i) {
 	$outname = "$1.pdf";
 	my $ext = $2;
 
@@ -106,7 +106,15 @@ if ($filename =~ /(.*)\.(?:e?ps|pdf)$/i) {
 	# Create PostScript from OOo :-)
 	system("/usr/lib/openoffice/program/soffice -display $pdfweb::config::xserver -headless -pt pdf $pdfweb::config::outputdir/$pdf_filename.$ext");
 
-	system("gs $pdfopts -dCompatbilityLevel=1.4 -dNOPAUSE -dPATCH -sDEVICE=pdfwrite -dSAFER -sOutputFile=output/$pdf_filename -c '.setpdfwrite $psopts' -f - < output/$pdf_filename.$ext.pdf >&2");
+	# This is quite hideous -- it looks like OO.o calls the file something slightly
+	# different depending on the time format, phase of the moon or something... So
+	# we try both.
+	my $inp_ps = "output/$pdf_filename.$ext.pdf";
+	if (! -r $inp_ps) {
+		$inp_ps = "output/$pdf_filename.pdf";
+	}
+
+	system("gs $pdfopts -dCompatbilityLevel=1.4 -dNOPAUSE -dPATCH -sDEVICE=pdfwrite -dSAFER -sOutputFile=output/$pdf_filename -c '.setpdfwrite $psopts' -f - < $inp_ps >&2");
 } elsif ($filename =~ /(.*)\.(c|cc|cpp|cs|h|py|rb|pl|diff|patch|js|php[1-5]?|hs|f|f90|java|css|sql|l|y|s?ml|sh|awk|m|v)$/i) {
 	$outname = "$1.pdf";
 	my $ext = $2;