Mirror 1.1.x changes.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/branches/branch-1.2@3861 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/CHANGES-1.1.txt b/CHANGES-1.1.txt
index e1dc807c6322a55ef35990cd3db7ca9ec5a74efd..c17854ea110642a1691e732851bac6f1c431f327 100644 (file)
--- a/CHANGES-1.1.txt
+++ b/CHANGES-1.1.txt
@@ -3,6 +3,9 @@ CHANGES-1.1.txt
 
 CHANGES IN CUPS V1.1.20rc1
 
+       - The pstops filter only sent the TBCP exit sequence if
+         it was defined in the JCLEnd attribute in the PPD file
+         (STR #224)
        - Support for more than 1024 files was broken on Solaris
          9 (STR #217)
        - The setgroups() calls now pass in 1 group (the

diff --git a/filter/pstops.c b/filter/pstops.c
index 3f930c5b4269984730d04e939279698150200737..ae339e3da616cfe7379a74df822e283fe881dbe9 100644 (file)
--- a/filter/pstops.c
+++ b/filter/pstops.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: pstops.c,v 1.54.2.42 2003/08/01 18:57:54 mike Exp $"
+ * "$Id: pstops.c,v 1.54.2.43 2003/08/07 14:56:00 mike Exp $"
  *
  *   PostScript filter for the Common UNIX Printing System (CUPS).
  *
@@ -1058,8 +1058,14 @@ main(int  argc,                  /* I - Number of command-line arguments */
   {
     if (ppd->jcl_end)
       fputs(ppd->jcl_end, stdout);
-    else if (ppd->num_filters == 0)
-      putchar(0x04);
+    else
+    {
+      if (ppd->num_filters == 0)
+        putchar(0x04);
+
+      if (Protocol == PROT_TBCP)
+        fputs("\033%-12345X", stdout);
+    }
   }
 
  /*
@@ -1884,5 +1890,5 @@ start_nup(int number,                     /* I - Page number */
 
 
 /*
- * End of "$Id: pstops.c,v 1.54.2.42 2003/08/01 18:57:54 mike Exp $".
+ * End of "$Id: pstops.c,v 1.54.2.43 2003/08/07 14:56:00 mike Exp $".
  */