Imported Upstream version 4.0.11upstream/4.0.11

7 files changed, 37 insertions, 18 deletions

diff --git a/ChangeLog b/ChangeLog
index 3ceebe4..42eeb30 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,21 @@
 2012-02-10  Till Kamppeter <till.kamppeter@gmail.com>
 
+	* Tagged branch for release 4.0.11.
+
+	* VERSION, README, USAGE, configure.ac: Updated for release 4.0.11.
+
+2012-02-10  Till Kamppeter <till.kamppeter@gmail.com>
+
+	* foomaticrip.c: If incoming PDF needs to be converted to PostScript
+	  due to the filter command line not being a standard Ghostscript
+	  command line, no separate PDF command line being supplied, or
+	  options in the PPD being implemented by PostScript code, use
+	  preferrably Ghostscript (with the "ps2write" device) for this
+	  conversion as Ghostscript is better optimized for printing and
+	  has a more sophisticated color management compared to Poppler.
+
+2012-02-10  Till Kamppeter <till.kamppeter@gmail.com>
+
 	* Tagged branch for release 4.0.10.
 
 	* VERSION, README, USAGE, configure.ac: Updated for release 4.0.10.
diff --git a/README b/README
index 7642763..1d692f3 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 
-Foomatic 4.0.10
+Foomatic 4.0.11
 ===============
 
 
diff --git a/USAGE b/USAGE
index d75a50c..9f86abb 100644
--- a/USAGE
+++ b/USAGE
@@ -1,5 +1,5 @@
 
-Foomatic 4.0.10
+Foomatic 4.0.11
 ===============
 
 foomatic-filters
diff --git a/VERSION b/VERSION
index 2d2d681..30b26df 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-4.0.10
+4.0.11
diff --git a/configure b/configure
index 8bee569..86515e0 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for foomatic-rip 4.0.10.
+# Generated by GNU Autoconf 2.65 for foomatic-rip 4.0.11.
 #
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -549,8 +549,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='foomatic-rip'
 PACKAGE_TARNAME='foomatic-rip'
-PACKAGE_VERSION='4.0.10'
-PACKAGE_STRING='foomatic-rip 4.0.10'
+PACKAGE_VERSION='4.0.11'
+PACKAGE_STRING='foomatic-rip 4.0.11'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1270,7 +1270,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures foomatic-rip 4.0.10 to adapt to many kinds of systems.
+\`configure' configures foomatic-rip 4.0.11 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1336,7 +1336,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of foomatic-rip 4.0.10:";;
+     short | recursive ) echo "Configuration of foomatic-rip 4.0.11:";;
    esac
   cat <<\_ACEOF
 
@@ -1440,7 +1440,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-foomatic-rip configure 4.0.10
+foomatic-rip configure 4.0.11
 generated by GNU Autoconf 2.65
 
 Copyright (C) 2009 Free Software Foundation, Inc.
@@ -1897,7 +1897,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by foomatic-rip $as_me 4.0.10, which was
+It was created by foomatic-rip $as_me 4.0.11, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   $ $0 $@
@@ -2705,7 +2705,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='foomatic-rip'
- VERSION='4.0.10'
+ VERSION='4.0.11'
 
 
 # Some tools Automake needs.
@@ -6871,7 +6871,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by foomatic-rip $as_me 4.0.10, which was
+This file was extended by foomatic-rip $as_me 4.0.11, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6937,7 +6937,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-foomatic-rip config.status 4.0.10
+foomatic-rip config.status 4.0.11
 configured by $0, generated by GNU Autoconf 2.65,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 95b1ac7..d0d2957 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.61])
-AC_INIT(foomatic-rip, [4.0.10])
+AC_INIT(foomatic-rip, [4.0.11])
 AM_INIT_AUTOMAKE([no-define])
 AC_CONFIG_SRCDIR([options.c])
 
diff --git a/foomaticrip.c b/foomaticrip.c
index 7d7d9ae..799a259 100644
--- a/foomaticrip.c
+++ b/foomaticrip.c
@@ -1054,14 +1054,17 @@ int print_file(const char *filename, int convert)
 		   Note that Ghostscript's "pswrite" output device turns text
 		   into bitmaps and therefore produces huge PostScript files.
 		   In addition, this output device is deprecated. Therefore
-		   we use "ps2write". */
+		   we use "ps2write".
+		   We give priority to Ghostscript here and use Poppler if
+		   Ghostscript is not available. */
                 snprintf(pdf2ps_cmd, PATH_MAX,
-			 "%spdftops -level2 -origpagesizes %s - 2>/dev/null || "
 			 "gs -q -sstdout=%%stderr -sDEVICE=ps2write -sOutputFile=- "
-			 "-dBATCH -dNOPAUSE -dPARANOIDSAFER -dNOINTERPOLATE %s 2>/dev/null",
+			 "-dBATCH -dNOPAUSE -dPARANOIDSAFER -dNOINTERPOLATE %s 2>/dev/null || "
+			 "%spdftops -level2 -origpagesizes %s - 2>/dev/null",
+			 filename,
 			 (spooler == SPOOLER_CUPS ?
 			  "PATH=${PATH#*/cups/filter:} " : ""),
-			 filename, filename);
+			 filename);
 
                 renderer_pid = start_system_process("pdf-to-ps", pdf2ps_cmd, &in, &out);