X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=createpdf.pl;h=9ee7aa92985d66be94b0d7573ea709ef2b5390de;hb=33885bda9f692a30c3b9783b7ade631b3d2040d4;hp=34cd9f425ccddc682e2bd77c904a8d1deb884f27;hpb=54684462f793d5b2e76052ab3ff5246972bdc204;p=webpdf

diff --git a/createpdf.pl b/createpdf.pl
index 34cd9f4..9ee7aa9 100755
--- a/createpdf.pl
+++ b/createpdf.pl
@@ -70,7 +70,7 @@ if ($filename =~ /(.*)\.(?:e?ps|pdf)$/i) {
 	$outname = "$1.pdf";
 
 	# Run through ImageMagick first of all, then gs
-	open PIPE, "| convert $2:- ps:- | gs $pdfopts -dCompatbilityLevel=1.4 -dNOPAUSE -dPATCH -sDEVICE=pdfwrite -dSAFER -sOutputFile=output/$pdf_filename -c '.setpdfwrite $psopts' -f - >&2"
+	open PIPE, "| convert $2:- pdf:- | gs $pdfopts -dCompatbilityLevel=1.4 -dNOPAUSE -dPATCH -sDEVICE=pdfwrite -dSAFER -sOutputFile=output/$pdf_filename -c '.setpdfwrite $psopts' -f - >&2"
                 or die "convert: $!";
 
 	my ($buf, $ret);
@@ -90,7 +90,7 @@ if ($filename =~ /(.*)\.(?:e?ps|pdf)$/i) {
 		print PIPE $buf;
 	}
 	close PIPE;
-} elsif ($filename =~ /(.*)\.(doc|xls|ppt)$/i) {
+} elsif ($filename =~ /(.*)\.(doc|xls|ppt|sxw|sxc|sxi)$/i) {
 	$outname = "$1.pdf";
 	my $ext = $2;
 
@@ -106,7 +106,7 @@ 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.pdf >&2");
+	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");
 } 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;