Fixed checking against multiple-document-handling for collation...

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@1416 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/CHANGES.txt b/CHANGES.txt
index 0b893cc682d34ad49504d18be10503deafddb216..6166816cc7531529c16290c72e5bdf5526e5958b 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -32,6 +32,9 @@ CHANGES IN CUPS V1.1.5
        - The PPD read functions incorrectly included trailing
          characters (usually whitespace) after quoted string
          attributes.
+       - The multiple-document-handling attribute handling code
+         did not check for the correct value for collated
+         copies (separate-documents-uncollated-copies).
 
 
 CHANGES IN CUPS v1.1.4

diff --git a/filter/imagetops.c b/filter/imagetops.c
index 7041b59f0ffcbc0515980aeda057d7210ed35302..f37e8ac9430e3e6e28d17f633367a3e54cba8892 100644 (file)
--- a/filter/imagetops.c
+++ b/filter/imagetops.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: imagetops.c,v 1.29 2000/10/13 01:04:38 mike Exp $"
+ * "$Id: imagetops.c,v 1.30 2000/10/19 02:12:26 mike Exp $"
  *
  *   Image file to PostScript filter for the Common UNIX Printing System (CUPS).
  *
@@ -171,10 +171,10 @@ main(int  argc,           /* I - Number of command-line arguments */
     *   single-document, separate-documents-collated-copies, and
     *   single-document-new-sheet all require collated copies.
     *
-    *   separate-documents-collated-copies allows for uncollated copies.
+    *   separate-documents-uncollated-copies allows for uncollated copies.
     */
 
-    Collate = strcasecmp(val, "separate-documents-collated-copies") != 0;
+    Collate = strcasecmp(val, "separate-documents-uncollated-copies") != 0;
   }
 
   if ((val = cupsGetOption("Collate", num_options, options)) != NULL &&
@@ -731,5 +731,5 @@ ps_ascii85(ib_t *data,              /* I - Data to print */
 
 
 /*
- * End of "$Id: imagetops.c,v 1.29 2000/10/13 01:04:38 mike Exp $".
+ * End of "$Id: imagetops.c,v 1.30 2000/10/19 02:12:26 mike Exp $".
  */

diff --git a/filter/pstops.c b/filter/pstops.c
index ff8e87f846d5d1707cec1c85ac0b50cf70708820..9a67139dd01b90b454b9be5ae019aadafc4925ad 100644 (file)
--- a/filter/pstops.c
+++ b/filter/pstops.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: pstops.c,v 1.44 2000/10/04 14:47:19 mike Exp $"
+ * "$Id: pstops.c,v 1.45 2000/10/19 02:12:26 mike Exp $"
  *
  *   PostScript filter for the Common UNIX Printing System (CUPS).
  *
@@ -162,10 +162,10 @@ main(int  argc,                   /* I - Number of command-line arguments */
     *   single-document, separate-documents-collated-copies, and
     *   single-document-new-sheet all require collated copies.
     *
-    *   separate-documents-collated-copies allows for uncollated copies.
+    *   separate-documents-uncollated-copies allows for uncollated copies.
     */
 
-    Collate = strcasecmp(val, "separate-documents-collated-copies") != 0;
+    Collate = strcasecmp(val, "separate-documents-uncollated-copies") != 0;
   }
 
   if ((val = cupsGetOption("Collate", num_options, options)) != NULL &&
@@ -906,5 +906,5 @@ start_nup(int number)       /* I - Page number */
 
 
 /*
- * End of "$Id: pstops.c,v 1.44 2000/10/04 14:47:19 mike Exp $".
+ * End of "$Id: pstops.c,v 1.45 2000/10/19 02:12:26 mike Exp $".
  */