Mirror 1.1.x changes.

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

diff --git a/pstoraster/README.pstoraster b/pstoraster/README.pstoraster
index 56ca09039460a67dd1fccc7e2e85e44ef762e2a5..9ce0a24154dab58cea2646b871d14073af76003e 100644 (file)
--- a/pstoraster/README.pstoraster
+++ b/pstoraster/README.pstoraster
@@ -1,4 +1,4 @@
-README.pstoraster - 04/23/2002
+README.pstoraster - 07/20/2003
 ------------------------------
 
 INTRODUCTION
@@ -6,11 +6,13 @@ INTRODUCTION
     This directory contains the CUPS "driver" for GNU
     Ghostscript, the pstoraster script that is used to run
     Ghostscript as a CUPS filter, the pstoraster.convs file that
-    defines the PostScript to raster filter for CUPS drivers,
-    and a makefile fragment that adds the CUPS driver.
+    defines the PostScript to raster filter for CUPS drivers, a
+    makefile fragment that adds the CUPS driver, and the wrapper
+    script (pstopxl) and PPD files (pxl*.ppd) to support PCL
+    XL/PCL 6 printers.
 
     This software is included with both the CUPS and ESP
-    Ghostscript 7.05.1 distributions.  While the files will also
+    Ghostscript 7.07.1 distributions.  While the files will also
     compile with earlier versions of Ghostscript, there are bugs
     in older versions of GNU Ghostscript which may cause
     problems.
@@ -32,18 +34,21 @@ COMPILING ESP GHOSTSCRIPT WITH THE CUPS DRIVER
     the cupsd process, either by sending the HUP signal to the
     process or using the init script supplied with CUPS.
 
+    To use the PCL XL/PCL 6 drivers, make sure that you also
+    configure Ghostscript with the pxlmono and pxlcolor drivers.
+
 
 COMPILING GNU GHOSTSCRIPT WITH THE CUPS DRIVER
 
     Before configuring GNU Ghostscript, first copy this directory
     to the GNU Ghostscript source directory, e.g.:
 
-        cp -r pstoraster /some/path/to/ghostscript-7.05
+        cp -r pstoraster /some/path/to/ghostscript-7.07
 
     Next apply the patch:
 
-        cd /some/path/to/ghostscript-7.05
-        patch -p1 pstoraster/ghostscript-705.patch
+        cd /some/path/to/ghostscript-7.07
+        patch -p1 pstoraster/ghostscript-707.patch
 
     Finally, run the configure script to use the new Ghostscript
     with CUPS:
@@ -61,3 +66,6 @@ COMPILING GNU GHOSTSCRIPT WITH THE CUPS DRIVER
     Once you have compiled and installed Ghostscript, restart
     the cupsd process, either by sending the HUP signal to the
     process or using the init script supplied with CUPS.
+
+    To use the PCL XL/PCL 6 drivers, make sure that you also
+    configure Ghostscript with the pxlmono and pxlcolor drivers.

diff --git a/pstoraster/cups.mak b/pstoraster/cups.mak
index 9d557e4ae3b5d841293c7b575ae2fba2c8f9661a..1dc193c1bce59aa931acaa2fe5e3868c7bccaf2c 100644 (file)
--- a/pstoraster/cups.mak
+++ b/pstoraster/cups.mak
@@ -1,9 +1,9 @@
 #
-# "$Id: cups.mak,v 1.1.2.3 2002/05/13 16:21:35 mike Exp $"
+# "$Id: cups.mak,v 1.1.2.4 2003/07/20 22:54:43 mike Exp $"
 #
 # CUPS driver makefile for Ghostscript.
 #
-# Copyright 2001-2002 by Easy Software Products.
+# Copyright 2001-2003 by Easy Software Products.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -26,6 +26,7 @@ cups_=        $(GLOBJ)gdevcups.$(OBJ)
 
 CUPSSERVER= $(install_prefix)`cups-config --serverbin`
 CUPSCONFIG= $(install_prefix)`cups-config --serverroot`
+CUPSDATA= $(install_prefix)`cups-config --datadir`
 
 $(DD)cups.dev: $(cups_) $(GLD)page.dev
        $(ADDMOD) $(DD)cups -lib cupsimage -lib cups
@@ -39,10 +40,14 @@ install:    install-cups
 install-cups:
        -mkdir -p $(CUPSSERVER)/filter
        $(INSTALL_PROGRAM) pstoraster/pstoraster $(CUPSSERVER)/filter
+       $(INSTALL_PROGRAM) pstoraster/pstopcl6 $(CUPSSERVER)/filter
        -mkdir -p $(CUPSCONFIG)
        $(INSTALL_DATA) pstoraster/pstoraster.convs $(CUPSCONFIG)
+       -mkdir -p $(CUPSDATA)/model
+       $(INSTALL_DATA) pstoraster/pxlcolor.ppd $(CUPSDATA)/model
+       $(INSTALL_DATA) pstoraster/pxlmono.ppd $(CUPSDATA)/model
 
 
 #
-# End of "$Id: cups.mak,v 1.1.2.3 2002/05/13 16:21:35 mike Exp $".
+# End of "$Id: cups.mak,v 1.1.2.4 2003/07/20 22:54:43 mike Exp $".
 #

diff --git a/pstoraster/gdevcups.c b/pstoraster/gdevcups.c
index 8ac5e97f55abe7b14dcb966764b1bccc0fab0c9e..38e9b3c30cfbe98d92f9ea3d79c84a54bede3dae 100644 (file)
--- a/pstoraster/gdevcups.c
+++ b/pstoraster/gdevcups.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: gdevcups.c,v 1.43.2.18 2003/07/13 13:07:39 mike Exp $"
+ * "$Id: gdevcups.c,v 1.43.2.19 2003/07/20 22:54:44 mike Exp $"
  *
  *   GNU Ghostscript raster output driver for the Common UNIX Printing
  *   System (CUPS).
@@ -3648,5 +3648,5 @@ cups_print_planar(gx_device_printer *pdev,        /* I - Printer device */
 
 
 /*
- * End of "$Id: gdevcups.c,v 1.43.2.18 2003/07/13 13:07:39 mike Exp $".
+ * End of "$Id: gdevcups.c,v 1.43.2.19 2003/07/20 22:54:44 mike Exp $".
  */

diff --git a/pstoraster/pstopxl.in b/pstoraster/pstopxl.in
index 4ec463e2cc3887948d066f573f34aab477eaa8f9..c06e48a70a3bb3f2f826ed4346d38a6d8607278f 100755 (executable)
--- a/pstoraster/pstopxl.in
+++ b/pstoraster/pstopxl.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# "$Id: pstopxl.in,v 1.1 2003/07/20 22:47:42 mike Exp $"
+# "$Id: pstopxl.in,v 1.1.2.1 2003/07/20 22:54:44 mike Exp $"
 #
 # CUPS PCL XL/PCL 6 filter script for Ghostscript.
 #
@@ -63,5 +63,5 @@ echo DEBUG: Running $bindir/@GS@ $gsopts -sOUTPUTFILE="%stdout" "$ifile" 1>&2
 $bindir/@GS@ $gsopts -sOUTPUTFILE="%stdout" "$ifile"
 
 #
-# End of "$Id: pstopxl.in,v 1.1 2003/07/20 22:47:42 mike Exp $".
+# End of "$Id: pstopxl.in,v 1.1.2.1 2003/07/20 22:54:44 mike Exp $".
 #

diff --git a/pstoraster/pstoraster b/pstoraster/pstoraster
index 7dc946ba26972b3a4906d5139298590c360e0a0f..bcf175566acf0ac6615d9d9146c8a9cc51149ba8 100755 (executable)
--- a/pstoraster/pstoraster
+++ b/pstoraster/pstoraster
@@ -1,10 +1,10 @@
 #!/bin/sh
 #
-# "$Id: pstoraster,v 1.1.2.3 2002/04/22 19:49:20 mike Exp $"
+# "$Id: pstoraster,v 1.1.2.4 2003/07/20 22:54:45 mike Exp $"
 #
 # CUPS filter script for Ghostscript.
 #
-# Copyright 2001-2002 by Easy Software Products.
+# Copyright 2001-2003 by Easy Software Products.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -48,5 +48,5 @@ done
 $bindir/gs $gsopts -sOUTPUTFILE="%stdout" $profile $6
 
 #
-# End of "$Id: pstoraster,v 1.1.2.3 2002/04/22 19:49:20 mike Exp $".
+# End of "$Id: pstoraster,v 1.1.2.4 2003/07/20 22:54:45 mike Exp $".
 #

diff --git a/pstoraster/pstoraster.convs b/pstoraster/pstoraster.convs
index e5b1fb4878c4bd986f19c5c541755b540ef71c14..1c3d6aba39593a644abcfb212be2acf92b68a828 100644 (file)
--- a/pstoraster/pstoraster.convs
+++ b/pstoraster/pstoraster.convs
@@ -1,9 +1,9 @@
 #
-# "$Id: pstoraster.convs,v 1.1.2.2 2002/04/21 16:11:29 mike Exp $"
+# "$Id: pstoraster.convs,v 1.1.2.3 2003/07/20 22:54:45 mike Exp $"
 #
 #   MIME converts file for Ghostscript.
 #
-#   Copyright 1997-2002 by Easy Software Products.
+#   Copyright 1997-2003 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
 #   property of Easy Software Products and are protected by Federal
@@ -25,5 +25,5 @@
 application/vnd.cups-postscript        application/vnd.cups-raster     100     pstoraster
 
 #
-# End of "$Id: pstoraster.convs,v 1.1.2.2 2002/04/21 16:11:29 mike Exp $".
+# End of "$Id: pstoraster.convs,v 1.1.2.3 2003/07/20 22:54:45 mike Exp $".
 #

diff --git a/pstoraster/pstoraster.in b/pstoraster/pstoraster.in
index d0ed60d3b9c1a1432ccf302032dec70a706395b0..5c7104eaa768c537b7a1a00d491f3a6e1191ced2 100755 (executable)
--- a/pstoraster/pstoraster.in
+++ b/pstoraster/pstoraster.in
@@ -1,8 +1,8 @@
 #!/bin/sh
 #
-# "$Id: pstoraster.in,v 1.3.2.2 2003/01/07 18:27:13 mike Exp $"
+# "$Id: pstoraster.in,v 1.3.2.3 2003/07/20 22:54:45 mike Exp $"
 #
-# CUPS filter script for Ghostscript.
+# CUPS raster filter script for Ghostscript.
 #
 # Copyright 2001-2003 by Easy Software Products.
 #
@@ -31,7 +31,7 @@ GS_LIB="${CUPS_FONTPATH:=/usr/share/cups/fonts}"
 export GS_LIB
 
 # Options we use with Ghostscript...
-gsopts="-dQUIET -dDEBUG -dPARANOIDSAFER -dNOPAUSE -dBATCH "
+gsopts="-dQUIET -dDEBUG -dPARANOIDSAFER -dNOPAUSE -dBATCH"
 gsopts="$gsopts -dNOMEDIAATTRS -sDEVICE=cups -sstdout=%stderr"
 
 # See if we have a profile=n,n,n,n,n,n,n,n,n,n,n option...
@@ -51,11 +51,12 @@ else
        ifile="$6"
 fi
 
-echo DEBUG: Running $bindir/@GS@ $gsopts -sOUTPUTFILE="%stdout" -c "$profile" $ifile 1>&2
+echo INFO: Starting ESP Ghostscript 7.07.1... 1>&2
+echo DEBUG: Running $bindir/@GS@ $gsopts -sOUTPUTFILE="%stdout" -c"$profile" "$ifile" 1>&2
 
 # Now run Ghostscript...
-$bindir/@GS@ $gsopts -sOUTPUTFILE="%stdout" -c "$profile" $ifile
+$bindir/@GS@ $gsopts -sOUTPUTFILE="%stdout" -c"$profile" "$ifile"
 
 #
-# End of "$Id: pstoraster.in,v 1.3.2.2 2003/01/07 18:27:13 mike Exp $".
+# End of "$Id: pstoraster.in,v 1.3.2.3 2003/07/20 22:54:45 mike Exp $".
 #

diff --git a/pstoraster/pxlcolor.ppd b/pstoraster/pxlcolor.ppd
index e4f24317b6f08ea8fb40460ac45070bb0a8c39d7..a86963308b40d190ec9bbc750b1f7698103098a8 100644 (file)
--- a/pstoraster/pxlcolor.ppd
+++ b/pstoraster/pxlcolor.ppd
@@ -1,6 +1,6 @@
 *PPD-Adobe: "4.3"
 *%
-*% "$Id: pxlcolor.ppd,v 1.1 2003/07/20 22:47:42 mike Exp $"
+*% "$Id: pxlcolor.ppd,v 1.1.2.1 2003/07/20 22:54:45 mike Exp $"
 *%
 *%   Sample color PCL XL/PCL 6 driver PPD file for the Common UNIX
 *%   Printing System (CUPS).
@@ -201,5 +201,5 @@
 *Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM
 *Font ZapfDingbats: Special "(001.004S)" Standard ROM
 *%
-*% End of "$Id: pxlcolor.ppd,v 1.1 2003/07/20 22:47:42 mike Exp $".
+*% End of "$Id: pxlcolor.ppd,v 1.1.2.1 2003/07/20 22:54:45 mike Exp $".
 *%

diff --git a/pstoraster/pxlmono.ppd b/pstoraster/pxlmono.ppd
index f5389ed16a4275a81751b92acbae3fbfd8a35c9d..c59d55ed63bd1d6987197beba2186924281b308c 100644 (file)
--- a/pstoraster/pxlmono.ppd
+++ b/pstoraster/pxlmono.ppd
@@ -1,6 +1,6 @@
 *PPD-Adobe: "4.3"
 *%
-*% "$Id: pxlmono.ppd,v 1.1 2003/07/20 22:47:42 mike Exp $"
+*% "$Id: pxlmono.ppd,v 1.1.2.1 2003/07/20 22:54:45 mike Exp $"
 *%
 *%   Sample monochrome PCL XL/PCL 6 driver PPD file for the Common UNIX
 *%   Printing System (CUPS).
@@ -195,5 +195,5 @@
 *Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM
 *Font ZapfDingbats: Special "(001.004S)" Standard ROM
 *%
-*% End of "$Id: pxlmono.ppd,v 1.1 2003/07/20 22:47:42 mike Exp $".
+*% End of "$Id: pxlmono.ppd,v 1.1.2.1 2003/07/20 22:54:45 mike Exp $".
 *%