Binary PostScript support!

Use the application/postscript MIME type for the pictwps output format,
since we'll need to filter it on the receiving end...

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

diff --git a/CHANGES.txt b/CHANGES.txt
index e816870f71dc7f8d36eefd1d082a03df2df04bf7..76d8823bfe1cf464cab42563f9cf57e4c6e71052 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,6 +3,8 @@ CHANGES.txt - 01/28/2003
 
 CHANGES IN CUPS V1.1.19
 
+       - The PostScript filter now supports binary PostScript
+         files.
        - The PPD API now provides additional information from
          the PPD file.
        - The USB backend didn't compile on Solaris Intel.

diff --git a/backend/ipp.c b/backend/ipp.c
index a93d4e15231d2005a00c0bb1fb2f968799bc5b73..7cbcb23318262c1c465b23df5c9ec19b36b2e6f4 100644 (file)
--- a/backend/ipp.c
+++ b/backend/ipp.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: ipp.c,v 1.69 2003/01/23 20:16:08 mike Exp $"
+ * "$Id: ipp.c,v 1.70 2003/01/28 19:26:43 mike Exp $"
  *
  *   IPP backend for the Common UNIX Printing System (CUPS).
  *
@@ -217,7 +217,7 @@ main(int  argc,             /* I - Number of command-line arguments (6 or 7) */
     * Change the MIME type to application/vnd.cups-postscript...
     */
 
-    content_type = "application/vnd.cups-postscript";
+    content_type = "application/postscript";
   }
 #endif /* __APPLE__ */
   else
@@ -1081,5 +1081,5 @@ run_pictwps_filter(char **argv,                   /* I - Command-line arguments */
 
 
 /*
- * End of "$Id: ipp.c,v 1.69 2003/01/23 20:16:08 mike Exp $".
+ * End of "$Id: ipp.c,v 1.70 2003/01/28 19:26:43 mike Exp $".
  */

diff --git a/filter/pstops.c b/filter/pstops.c
index eb6ba921b6368d44aad354f612b9535fbebd2f20..ca5fd63117690bb9d2ed7269d58f22772636fc5c 100644 (file)
--- a/filter/pstops.c
+++ b/filter/pstops.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: pstops.c,v 1.96 2003/01/28 16:23:32 mike Exp $"
+ * "$Id: pstops.c,v 1.97 2003/01/28 19:26:44 mike Exp $"
  *
  *   PostScript filter for the Common UNIX Printing System (CUPS).
  *
@@ -31,8 +31,8 @@
  *   do_prolog()   - Send the necessary document prolog commands...
  *   do_setup()    - Send the necessary document setup commands...
  *   end_nup()     - End processing for N-up printing...
+ *   psbcp()       - Enable the binary communications protocol on the printer.
  *   psgets()      - Get a line from a file.
- *   psprotocol()  - Enable the binary transmission protocol on the printer.
  *   pswrite()     - Write data from a file.
  *   start_nup()   - Start processing for N-up printing...
  */
@@ -111,8 +111,8 @@ static void end_nup(int number);
 #define                is_first_page(p)        (NUp == 1 || (((p)+1) % NUp) == 1)
 #define                is_last_page(p)         (NUp > 1 && (((p)+1) % NUp) == 0)
 #define        is_not_last_page(p)     (NUp > 1 && ((p) % NUp) != 0)
+static void    psbcp(ppd_file_t *ppd);
 static char    *psgets(char *buf, size_t *bytes, FILE *fp);
-static void    psprotocol(ppd_file_t *ppd);
 static size_t  pswrite(const char *buf, size_t bytes, FILE *fp);
 static void    start_nup(int number, int show_border);
 
@@ -339,12 +339,6 @@ main(int  argc,                    /* I - Number of command-line arguments */
   else
     temp = NULL;
 
- /*
-  * Write any "exit server" options that have been selected...
-  */
-
-  ppdEmit(ppd, stdout, PPD_ORDER_EXIT);
-
  /*
   * See if we support a binary transmission protocol...
   */
@@ -354,12 +348,19 @@ main(int  argc,                   /* I - Number of command-line arguments */
     if (strstr(ppd->protocols, "TBCP"))
       Protocol = PROT_TBCP;
     else if (strstr(ppd->protocols, "BCP"))
+    {
       Protocol = PROT_BCP;
 
-    if (Protocol)
-      psprotocol(ppd);
+      psbcp(ppd);
+    }
   }
 
+ /*
+  * Write any "exit server" options that have been selected...
+  */
+
+  ppdEmit(ppd, stdout, PPD_ORDER_EXIT);
+
  /*
   * Write any JCL commands that are needed to print PostScript code...
   */
@@ -378,6 +379,13 @@ main(int  argc,                    /* I - Number of command-line arguments */
     return (1);
   }
 
+ /*
+  * Switch to TBCP mode as needed...
+  */
+
+  if (Protocol == PROT_TBCP)
+    fputs("\001M", stdout);
+
  /*
   * Start sending the document with any commands needed...
   */
@@ -1274,6 +1282,61 @@ end_nup(int number)      /* I - Page number */
 }
 
 
+/*
+ * 'psbcp()' - Enable the binary communications protocol on the printer.
+ */
+
+static void
+psbcp(ppd_file_t *ppd)         /* I - PPD file */
+{
+  if (ppd->jcl_begin)
+    fputs(ppd->jcl_begin, stdout);
+  if (ppd->jcl_ps)
+    fputs(ppd->jcl_ps, stdout);
+
+  if (ppd->language_level == 1)
+  {
+   /*
+    * Use setsoftwareiomode for BCP mode...
+    */
+
+    fputs("%!PS-Adobe-3.0 ExitServer\n", stdout);
+    fputs("%%Title: (BCP - Level 1)\n", stdout);
+    fputs("%%EndComments\n", stdout);
+    fputs("%%BeginExitServer: 0\n", stdout);
+    fputs("serverdict begin 0 exitserver\n", stdout);
+    fputs("%%EndExitServer\n", stdout);
+    fputs("statusdict begin\n", stdout);
+    fputs("/setsoftwareiomode known {100 setsoftwareiomode}\n", stdout);
+    fputs("end\n", stdout);
+    fputs("%EOF\n", stdout);
+  }
+  else
+  {
+   /*
+    * Use setdevparams for BCP mode...
+    */
+
+    fputs("%!PS-Adobe-3.0\n", stdout);
+    fputs("%%Title: (BCP - Level 2)\n", stdout);
+    fputs("%%EndComments\n", stdout);
+    fputs("currentsysparams\n", stdout);
+    fputs("/CurInputDevice 2 copy known {\n", stdout);
+    fputs("get\n", stdout);
+    fputs("<</Protocol /Binary>> setdevparams\n", stdout);
+    fputs("}{\n", stdout);
+    fputs("pop pop\n", stdout);
+    fputs("} ifelse\n", stdout);
+    fputs("%EOF\n", stdout);
+  }
+
+  if (ppd->jcl_end)
+    fputs(ppd->jcl_end, stdout);
+  else if (ppd->num_filters == 0)
+    putchar(0x04);
+}
+
+
 /*
  * 'psgets()' - Get a line from a file.
  *
@@ -1352,26 +1415,6 @@ psgets(char   *buf,                      /* I  - Buffer to read into */
 }
 
 
-/*
- * 'psprotocol()' - Enable the binary transmission protocol on the printer.
- */
-
-static void
-psprotocol(ppd_file_t *ppd)            /* I - PPD file */
-{
-#if 0
-  if (ppd->jcl_begin)
-    fputs(ppd->jcl_begin, stdout);
-  if (ppd->jcl_ps)
-    fputs(ppd->jcl_ps, stdout);
-
-
-  if (ppd->jcl_end)
-    fputs(ppd->jcl_end, stdout);
-#endif /* 0 */
-}
-
-
 /*
  * 'pswrite()' - Write data from a file.
  */
@@ -1381,21 +1424,61 @@ pswrite(const char *buf,                /* I - Buffer to write */
         size_t     bytes,              /* I - Bytes to write */
        FILE       *fp)                 /* I - File to write to */
 {
-#if 0
+  size_t       count;                  /* Remaining bytes */
+
+
   switch (Protocol)
   {
     case PROT_STANDARD :
         return (fwrite(buf, 1, bytes, fp));
 
     case PROT_BCP :
+        for (count = bytes; count > 0; count --, buf ++)
+         switch (*buf)
+         {
+           case 0x01 : /* CTRL-A */
+           case 0x03 : /* CTRL-C */
+           case 0x04 : /* CTRL-D */
+           case 0x05 : /* CTRL-E */
+           case 0x11 : /* CTRL-Q */
+           case 0x13 : /* CTRL-S */
+           case 0x14 : /* CTRL-T */
+           case 0x1c : /* CTRL-\ */
+               putchar(0x01);
+               putchar(*buf ^ 0x40);
+               break;
+
+           default :
+               putchar(*buf);
+               break;
+         }
         return (bytes);
 
     case PROT_TBCP :
+        for (count = bytes; count > 0; count --, buf ++)
+         switch (*buf)
+         {
+           case 0x01 : /* CTRL-A */
+           case 0x03 : /* CTRL-C */
+           case 0x04 : /* CTRL-D */
+           case 0x05 : /* CTRL-E */
+           case 0x11 : /* CTRL-Q */
+           case 0x13 : /* CTRL-S */
+           case 0x14 : /* CTRL-T */
+           case 0x1b : /* CTRL-[ (aka ESC) */
+           case 0x1c : /* CTRL-\ */
+               putchar(0x01);
+               putchar(*buf ^ 0x40);
+               break;
+
+           default :
+               putchar(*buf);
+               break;
+         }
         return (bytes);
   }
-#else
+
   return (fwrite(buf, 1, bytes, fp));
-#endif /* 0 */
 }
 
 
@@ -1767,5 +1850,5 @@ start_nup(int number,                     /* I - Page number */
 
 
 /*
- * End of "$Id: pstops.c,v 1.96 2003/01/28 16:23:32 mike Exp $".
+ * End of "$Id: pstops.c,v 1.97 2003/01/28 19:26:44 mike Exp $".
  */