Mirror 1.1.x changes.

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

diff --git a/CHANGES-1.1.txt b/CHANGES-1.1.txt
index 671807a90a2a12539b77ff8c10590bed70b86f11..4411b672a38be5694b7fedd170b147c2a0402b6b 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.19
 
+       - The pstops filter didn't include the page-label and
+         classification boxes when printing EPS or non-
+         conformant PS files.
        - The imagetops filter didn't always correctly position
          the image on the page when printing in landscape
          orientation.

diff --git a/filter/pstops.c b/filter/pstops.c
index 384dda577a7b925c55b9ad9948bbda20e3cbf75c..9073d142b8118c19ba6f6086bd15ed6d22103c81 100644 (file)
--- a/filter/pstops.c
+++ b/filter/pstops.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: pstops.c,v 1.54.2.36 2003/01/31 20:09:52 mike Exp $"
+ * "$Id: pstops.c,v 1.54.2.37 2003/02/28 16:38:58 mike Exp $"
  *
  *   PostScript filter for the Common UNIX Printing System (CUPS).
  *
@@ -993,6 +993,7 @@ main(int  argc,                     /* I - Number of command-line arguments */
           "userdict/showpage{}put");
 
     puts("%%BeginProlog");
+    WriteLabelProlog(val, PageBottom, PageTop, PageWidth);
     do_prolog(ppd);
     puts("%%EndProlog");
 
@@ -1016,7 +1017,10 @@ main(int  argc,                  /* I - Number of command-line arguments */
     }
 
     if (UseESPsp)
+    {
+      WriteLabels(Orientation);
       puts("ESPshowpage");
+    }
 
     if (slowcollate)
     {
@@ -1031,7 +1035,10 @@ main(int  argc,                  /* I - Number of command-line arguments */
        Copies --;
 
         if (UseESPsp)
+       {
+         WriteLabels(Orientation);
           puts("ESPshowpage");
+       }
       }
     }
   }
@@ -1877,5 +1884,5 @@ start_nup(int number,                     /* I - Page number */
 
 
 /*
- * End of "$Id: pstops.c,v 1.54.2.36 2003/01/31 20:09:52 mike Exp $".
+ * End of "$Id: pstops.c,v 1.54.2.37 2003/02/28 16:38:58 mike Exp $".
  */