Load cups into easysw/current.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@342 a1ca3aef-8c08-0410-bb20-df032aa958be

9 files changed, 189 insertions, 939 deletions

diff --git a/data/HPGLprolog b/data/HPGLprolog
index eed0a0487..2ebf98574 100644
--- a/data/HPGLprolog
+++ b/data/HPGLprolog
@@ -1,6 +1,6 @@
 %%BeginResource: procset hpgltops 1.1 0
 %
-% "$Id: HPGLprolog 4494 2005-02-18 02:18:11Z mike $"
+% "$Id: HPGLprolog 6649 2007-07-11 21:46:42Z mike $"
 %
 %   HP-GL/2 filter procset for the Common UNIX Printing System (CUPS).
 %
@@ -9,23 +9,13 @@
 %   should be called 'NP' (newpath), but GhostScript uses the 'NP' name
 %   for 'noaccess put' in some of its font files...
 %
-%   Copyright 1993-2005 Easy Software Products
+%   Copyright 2007 by Apple Inc.
+%   Copyright 1993-2005 by Easy Software Products
 %
 %   These coded instructions, statements, and computer programs are the
-%   property of Easy Software Products and are protected by Federal
-%   copyright law.  Distribution and use rights are outlined in the file
-%   "LICENSE.txt" which should have been included with this file.  If this
-%   file is missing or damaged please contact Easy Software Products
-%   at:
-%
-%       Attn: CUPS Licensing Information
-%       Easy Software Products
-%       44141 Airport View Drive, Suite 204
-%       Hollywood, Maryland 20636 USA
-%
-%       Voice: (301) 373-9600
-%       EMail: cups-info@cups.org
-%         WWW: http://www.cups.org
+%   property of Apple Inc. and are protected by Federal copyright law.
+%   Distribution and use rights are outlined in the file "LICENSE.txt"
+%   which is included with the CUPS source distribution.
 %
 /MO { moveto } bind def
 /LI { lineto } bind def
diff --git a/data/Makefile b/data/Makefile
index 29a7aa0e7..9b37aed52 100644
--- a/data/Makefile
+++ b/data/Makefile
@@ -1,25 +1,16 @@
 #
-# "$Id: Makefile 5310 2006-03-19 03:23:34Z mike $"
+# "$Id: Makefile 6649 2007-07-11 21:46:42Z mike $"
 #
 #   Datafile makefile for the Common UNIX Printing System (CUPS).
 #
+#   Copyright 2007 by Apple Inc.
 #   Copyright 1993-2006 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products and are protected by Federal
-#   copyright law.  Distribution and use rights are outlined in the file
-#   "LICENSE.txt" which should have been included with this file.  If this
-#   file is missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636 USA
-#
-#       Voice: (301) 373-9600
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
+#   property of Apple Inc. and are protected by Federal copyright
+#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+#   which should have been included with this file.  If this file is
+#   file is missing or damaged, see the license at "http://www.cups.org/".
 #
 
 include ../Makedefs
@@ -180,5 +171,5 @@ uninstall:
 
 
 #
-# End of "$Id: Makefile 5310 2006-03-19 03:23:34Z mike $".
+# End of "$Id: Makefile 6649 2007-07-11 21:46:42Z mike $".
 #
diff --git a/data/classified b/data/classified
index 3f8a1ab82..8776b7b1a 100644
--- a/data/classified
+++ b/data/classified
@@ -5,32 +5,22 @@
 %%DocumentData: Clean7Bit
 %%DocumentSuppliedResources: procset bannerprint/1.0
 %%DocumentNeededResources: font Helvetica Helvetica-Bold Times-Roman
-%%Creator: Michael Sweet, Easy Software Products
-%%CreationDate: May 10, 2000
+%%Creator: Michael Sweet, Apple Inc.
+%%CreationDate: D:20070620123000+0700
 %%Title: Test Page
 %%EndComments
 %%BeginProlog
-%%BeginResource procset bannerprint 1.1 0
+%%BeginResource procset bannerprint 1.3 0
 %
 %   PostScript banner page for the Common UNIX Printing System ("CUPS").
 %
+%   Copyright 2007 Apple Inc.
 %   Copyright 1993-2005 Easy Software Products
 %
 %   These coded instructions, statements, and computer programs are the
-%   property of Easy Software Products and are protected by Federal
-%   copyright law.  Distribution and use rights are outlined in the file
-%   "LICENSE.txt" which should have been included with this file.  If this
-%   file is missing or damaged please contact Easy Software Products
-%   at:
-%
-%       Attn: CUPS Licensing Information
-%       Easy Software Products
-%       44141 Airport View Drive, Suite 204
-%       Hollywood, Maryland 20636 USA
-%
-%       Voice: (301) 373-9600
-%       EMail: cups-info@cups.org
-%         WWW: http://www.cups.org
+%   property of Apple Inc. and are protected by Federal copyright law.
+%   Distribution and use rights are outlined in the file "LICENSE.txt"
+%   which is included with the CUPS source distribution.
 %
 /CENTER {			% Draw centered text
 				% (name) CENTER -
@@ -53,99 +43,6 @@
   } ifelse
   100 string cvs show		% Convert to a string and show it...
 } bind def
-/CUPSLOGO {			% Draw the CUPS logo
-				% height CUPSLOGO
-  % Start with a big C...
-  /Helvetica findfont 1 index scalefont setfont
-  0 setgray
-  0 0 moveto
-  (C) show
-
-  % Then "UNIX Printing System" much smaller...
-  /Helvetica-Bold findfont 1 index 9 div scalefont setfont
-  0.25 mul
-  dup dup 2.0 mul moveto
-  (UNIX) show
-  dup dup 1.6 mul moveto
-  (Printing) show
-  dup 1.2 mul moveto
-  (System) show
-} bind def
-/ESPLOGO {			% Draw the ESP logo
-				% height ESPLOGO
-  % Compute the size of the logo...
-  0 0
-  2 index 1.5 mul 3 index
-
-  % Do the "metallic" fill from 10% black to 40% black...
-  1 -0.001 0 {
-    dup			% loopval
-    -0.15 mul		% loopval * -0.15
-    0.9 add		% 0.9 - loopval * 0.15
-    setgray		% set gray shade
-
-    0			% x
-    1 index neg		% loopval
-    1 add		% 1 - loopval
-    3 index		% height
-    mul			% height * (1 - loopval)
-    moveto		% starting point
-
-    dup			% loopval
-    3 index		% width
-    mul			% loopval * width
-    2 index		% height
-    lineto		% Next point
-
-    0			% x
-    2 index		% height
-    lineto		% Next point
-
-    closepath
-    fill
-
-    dup			% loopval
-    0.15 mul		% loopval * 0.15
-    0.6 add		% 0.6 + loopval * 0.15
-    setgray
-
-    dup			% loopval
-    neg 1 add		% 1 - loopval
-    3 index		% width
-    mul			% (1 - loopval) * width
-    0			% y
-    moveto		% Starting point
-
-    2 index		% width
-    exch		% loopval
-    2 index		% height
-    mul			% loopval * height
-    lineto		% Next point
-
-    1 index		% width
-    0			% y
-    lineto		% Next point
-
-    closepath
-    fill
-  } for
-
-  0 setgray rectstroke
-
-  /Helvetica-BoldOblique findfont 1 index 3 div scalefont setfont
-  dup 40 div
-
-  dup 4 mul 1 index 25 mul moveto (E) show
-  dup 10 mul 1 index 15 mul moveto (S) show
-  dup 16 mul 1 index 5 mul moveto (P) show
-
-  /Helvetica-BoldOblique findfont 2 index 5 div scalefont setfont
-  dup 14 mul 1 index 29 mul moveto (asy) show
-  dup 20 mul 1 index 19 mul moveto (oftware) show
-  dup 26 mul 1 index 9 mul moveto (roducts) show
-
-  pop
-} bind def
 %%EndResource
 %%EndProlog
 %%Page: 1 1
@@ -186,7 +83,7 @@ gsave
 
   pageWidth 36 mul			% Center of page
   pageHeight 72 mul			% Top of page
-  pageWidth -7 mul add			% - 2 lines
+  pageWidth 9 mul sub			% - 3 lines
   moveto				% Position text
   bigFont setfont			% Font
   (Classified) CENTER			% Show text centered
@@ -219,59 +116,44 @@ gsave
 
   pageWidth 36 mul			% x = pageWidth * 1/2 * 72
   pageHeight 36 mul			% y = pageHeight * 1/2 * 72
-  pageHeight 5 mul add			% y += 2 lines
+  pageHeight 5 mul add			% y += 3.333 lines
   2 copy				% Copy X & Y
   moveto
   (Job ID: ) RIGHT
+  2 copy				% Copy X & Y
   moveto
   ({printer-name}-{job-id}) show
 
-  pageWidth 36 mul			% x = pageWidth * 1/2 * 72
-  pageHeight 36 mul			% y = pageHeight * 1/2 * 72
-  pageHeight 2 mul add			% y += 1 line
+  pageHeight 3 mul sub			% y -= 2 lines
   2 copy				% Copy X & Y
   moveto
   (Title: ) RIGHT
+  2 copy				% Copy X & Y
   moveto
   ({job-name}) show
 
-  pageWidth 36 mul			% x = pageWidth * 1/2 * 72
-  pageHeight 36 mul			% y = pageHeight * 1/2 * 72
-  pageHeight -1 mul add			% y -= 1 line
+  pageHeight 3 mul sub			% y -= 2 lines
   2 copy				% Copy X & Y
   moveto
   (Requesting User: ) RIGHT
-  moveto
-  ({job-originating-user-name}) show
-
-  pageWidth 36 mul			% x = pageWidth * 1/2 * 72
-  pageHeight 36 mul			% y = pageHeight * 1/2 * 72
-  pageHeight -4 mul add			% y -= 2 lines
   2 copy				% Copy X & Y
   moveto
-  (Billing Info: ) RIGHT
-  moveto
-  ({job-billing}) show
+  ({job-originating-user-name}) show
 
-  % Then the CUPS logo....
-  gsave
-    pageWidth 4 mul
-    pageWidth 6 mul
-    translate
-    pageWidth 9 mul CUPSLOGO
-  grestore
+  ({?job-billing}) () ne {
+    pageHeight 3 mul sub		% y -= 2 lines
+    2 copy				% Copy X & Y
+    moveto
+    (Billing Info: ) RIGHT
+    2 copy				% Copy X & Y
+    moveto
+    ({job-billing}) show
+  } if
 
-  % And the ESP logo....
-  gsave
-    pageWidth 59 mul
-    pageWidth 6 mul
-    translate
-    pageWidth 6 mul ESPLOGO
-  grestore
 % Show the page...
 grestore
 showpage
 %
-% End of "$Id: classified 4494 2005-02-18 02:18:11Z mike $".
+% End of "$Id: classified 6649 2007-07-11 21:46:42Z mike $".
 %
 %%EOF
diff --git a/data/confidential b/data/confidential
index 27d29fbcc..9e4d9eadb 100644
--- a/data/confidential
+++ b/data/confidential
@@ -5,32 +5,22 @@
 %%DocumentData: Clean7Bit
 %%DocumentSuppliedResources: procset bannerprint/1.0
 %%DocumentNeededResources: font Helvetica Helvetica-Bold Times-Roman
-%%Creator: Michael Sweet, Easy Software Products
-%%CreationDate: May 10, 2000
+%%Creator: Michael Sweet, Apple Inc.
+%%CreationDate: D:20070620123000+0700
 %%Title: Test Page
 %%EndComments
 %%BeginProlog
-%%BeginResource procset bannerprint 1.1 0
+%%BeginResource procset bannerprint 1.3 0
 %
 %   PostScript banner page for the Common UNIX Printing System ("CUPS").
 %
+%   Copyright 2007 Apple Inc.
 %   Copyright 1993-2005 Easy Software Products
 %
 %   These coded instructions, statements, and computer programs are the
-%   property of Easy Software Products and are protected by Federal
-%   copyright law.  Distribution and use rights are outlined in the file
-%   "LICENSE.txt" which should have been included with this file.  If this
-%   file is missing or damaged please contact Easy Software Products
-%   at:
-%
-%       Attn: CUPS Licensing Information
-%       Easy Software Products
-%       44141 Airport View Drive, Suite 204
-%       Hollywood, Maryland 20636 USA
-%
-%       Voice: (301) 373-9600
-%       EMail: cups-info@cups.org
-%         WWW: http://www.cups.org
+%   property of Apple Inc. and are protected by Federal copyright law.
+%   Distribution and use rights are outlined in the file "LICENSE.txt"
+%   which is included with the CUPS source distribution.
 %
 /CENTER {			% Draw centered text
 				% (name) CENTER -
@@ -53,99 +43,6 @@
   } ifelse
   100 string cvs show		% Convert to a string and show it...
 } bind def
-/CUPSLOGO {			% Draw the CUPS logo
-				% height CUPSLOGO
-  % Start with a big C...
-  /Helvetica findfont 1 index scalefont setfont
-  0 setgray
-  0 0 moveto
-  (C) show
-
-  % Then "UNIX Printing System" much smaller...
-  /Helvetica-Bold findfont 1 index 9 div scalefont setfont
-  0.25 mul
-  dup dup 2.0 mul moveto
-  (UNIX) show
-  dup dup 1.6 mul moveto
-  (Printing) show
-  dup 1.2 mul moveto
-  (System) show
-} bind def
-/ESPLOGO {			% Draw the ESP logo
-				% height ESPLOGO
-  % Compute the size of the logo...
-  0 0
-  2 index 1.5 mul 3 index
-
-  % Do the "metallic" fill from 10% black to 40% black...
-  1 -0.001 0 {
-    dup			% loopval
-    -0.15 mul		% loopval * -0.15
-    0.9 add		% 0.9 - loopval * 0.15
-    setgray		% set gray shade
-
-    0			% x
-    1 index neg		% loopval
-    1 add		% 1 - loopval
-    3 index		% height
-    mul			% height * (1 - loopval)
-    moveto		% starting point
-
-    dup			% loopval
-    3 index		% width
-    mul			% loopval * width
-    2 index		% height
-    lineto		% Next point
-
-    0			% x
-    2 index		% height
-    lineto		% Next point
-
-    closepath
-    fill
-
-    dup			% loopval
-    0.15 mul		% loopval * 0.15
-    0.6 add		% 0.6 + loopval * 0.15
-    setgray
-
-    dup			% loopval
-    neg 1 add		% 1 - loopval
-    3 index		% width
-    mul			% (1 - loopval) * width
-    0			% y
-    moveto		% Starting point
-
-    2 index		% width
-    exch		% loopval
-    2 index		% height
-    mul			% loopval * height
-    lineto		% Next point
-
-    1 index		% width
-    0			% y
-    lineto		% Next point
-
-    closepath
-    fill
-  } for
-
-  0 setgray rectstroke
-
-  /Helvetica-BoldOblique findfont 1 index 3 div scalefont setfont
-  dup 40 div
-
-  dup 4 mul 1 index 25 mul moveto (E) show
-  dup 10 mul 1 index 15 mul moveto (S) show
-  dup 16 mul 1 index 5 mul moveto (P) show
-
-  /Helvetica-BoldOblique findfont 2 index 5 div scalefont setfont
-  dup 14 mul 1 index 29 mul moveto (asy) show
-  dup 20 mul 1 index 19 mul moveto (oftware) show
-  dup 26 mul 1 index 9 mul moveto (roducts) show
-
-  pop
-} bind def
 %%EndResource
 %%EndProlog
 %%Page: 1 1
@@ -186,7 +83,7 @@ gsave
 
   pageWidth 36 mul			% Center of page
   pageHeight 72 mul			% Top of page
-  pageWidth -7 mul add			% - 2 lines
+  pageWidth 9 mul sub			% - 3 lines
   moveto				% Position text
   bigFont setfont			% Font
   (Confidential) CENTER			% Show text centered
@@ -219,59 +116,44 @@ gsave
 
   pageWidth 36 mul			% x = pageWidth * 1/2 * 72
   pageHeight 36 mul			% y = pageHeight * 1/2 * 72
-  pageHeight 5 mul add			% y += 2 lines
+  pageHeight 5 mul add			% y += 3.333 lines
   2 copy				% Copy X & Y
   moveto
   (Job ID: ) RIGHT
+  2 copy				% Copy X & Y
   moveto
   ({printer-name}-{job-id}) show
 
-  pageWidth 36 mul			% x = pageWidth * 1/2 * 72
-  pageHeight 36 mul			% y = pageHeight * 1/2 * 72
-  pageHeight 2 mul add			% y += 1 line
+  pageHeight 3 mul sub			% y -= 2 lines
   2 copy				% Copy X & Y
   moveto
   (Title: ) RIGHT
+  2 copy				% Copy X & Y
   moveto
   ({job-name}) show
 
-  pageWidth 36 mul			% x = pageWidth * 1/2 * 72
-  pageHeight 36 mul			% y = pageHeight * 1/2 * 72
-  pageHeight -1 mul add			% y -= 1 line
+  pageHeight 3 mul sub			% y -= 2 lines
   2 copy				% Copy X & Y
   moveto
   (Requesting User: ) RIGHT
-  moveto
-  ({job-originating-user-name}) show
-
-  pageWidth 36 mul			% x = pageWidth * 1/2 * 72
-  pageHeight 36 mul			% y = pageHeight * 1/2 * 72
-  pageHeight -4 mul add			% y -= 2 lines
   2 copy				% Copy X & Y
   moveto
-  (Billing Info: ) RIGHT
-  moveto
-  ({job-billing}) show
+  ({job-originating-user-name}) show
 
-  % Then the CUPS logo....
-  gsave
-    pageWidth 4 mul
-    pageWidth 6 mul
-    translate
-    pageWidth 9 mul CUPSLOGO
-  grestore
+  ({?job-billing}) () ne {
+    pageHeight 3 mul sub		% y -= 2 lines
+    2 copy				% Copy X & Y
+    moveto
+    (Billing Info: ) RIGHT
+    2 copy				% Copy X & Y
+    moveto
+    ({job-billing}) show
+  } if
 
-  % And the ESP logo....
-  gsave
-    pageWidth 59 mul
-    pageWidth 6 mul
-    translate
-    pageWidth 6 mul ESPLOGO
-  grestore
 % Show the page...
 grestore
 showpage
 %
-% End of "$Id: confidential 4494 2005-02-18 02:18:11Z mike $".
+% End of "$Id: confidential 6649 2007-07-11 21:46:42Z mike $".
 %
 %%EOF
diff --git a/data/secret b/data/secret
index 998f59a92..cb2619e76 100644
--- a/data/secret
+++ b/data/secret
@@ -5,32 +5,22 @@
 %%DocumentData: Clean7Bit
 %%DocumentSuppliedResources: procset bannerprint/1.0
 %%DocumentNeededResources: font Helvetica Helvetica-Bold Times-Roman
-%%Creator: Michael Sweet, Easy Software Products
-%%CreationDate: May 10, 2000
+%%Creator: Michael Sweet, Apple Inc.
+%%CreationDate: D:20070620123000+0700
 %%Title: Test Page
 %%EndComments
 %%BeginProlog
-%%BeginResource procset bannerprint 1.1 0
+%%BeginResource procset bannerprint 1.3 0
 %
 %   PostScript banner page for the Common UNIX Printing System ("CUPS").
 %
+%   Copyright 2007 Apple Inc.
 %   Copyright 1993-2005 Easy Software Products
 %
 %   These coded instructions, statements, and computer programs are the
-%   property of Easy Software Products and are protected by Federal
-%   copyright law.  Distribution and use rights are outlined in the file
-%   "LICENSE.txt" which should have been included with this file.  If this
-%   file is missing or damaged please contact Easy Software Products
-%   at:
-%
-%       Attn: CUPS Licensing Information
-%       Easy Software Products
-%       44141 Airport View Drive, Suite 204
-%       Hollywood, Maryland 20636 USA
-%
-%       Voice: (301) 373-9600
-%       EMail: cups-info@cups.org
-%         WWW: http://www.cups.org
+%   property of Apple Inc. and are protected by Federal copyright law.
+%   Distribution and use rights are outlined in the file "LICENSE.txt"
+%   which is included with the CUPS source distribution.
 %
 /CENTER {			% Draw centered text
 				% (name) CENTER -
@@ -53,99 +43,6 @@
   } ifelse
   100 string cvs show		% Convert to a string and show it...
 } bind def
-/CUPSLOGO {			% Draw the CUPS logo
-				% height CUPSLOGO
-  % Start with a big C...
-  /Helvetica findfont 1 index scalefont setfont
-  0 setgray
-  0 0 moveto
-  (C) show
-
-  % Then "UNIX Printing System" much smaller...
-  /Helvetica-Bold findfont 1 index 9 div scalefont setfont
-  0.25 mul
-  dup dup 2.0 mul moveto
-  (UNIX) show
-  dup dup 1.6 mul moveto
-  (Printing) show
-  dup 1.2 mul moveto
-  (System) show
-} bind def
-/ESPLOGO {			% Draw the ESP logo
-				% height ESPLOGO
-  % Compute the size of the logo...
-  0 0
-  2 index 1.5 mul 3 index
-
-  % Do the "metallic" fill from 10% black to 40% black...
-  1 -0.001 0 {
-    dup			% loopval
-    -0.15 mul		% loopval * -0.15
-    0.9 add		% 0.9 - loopval * 0.15
-    setgray		% set gray shade
-
-    0			% x
-    1 index neg		% loopval
-    1 add		% 1 - loopval
-    3 index		% height
-    mul			% height * (1 - loopval)
-    moveto		% starting point
-
-    dup			% loopval
-    3 index		% width
-    mul			% loopval * width
-    2 index		% height
-    lineto		% Next point
-
-    0			% x
-    2 index		% height
-    lineto		% Next point
-
-    closepath
-    fill
-
-    dup			% loopval
-    0.15 mul		% loopval * 0.15
-    0.6 add		% 0.6 + loopval * 0.15
-    setgray
-
-    dup			% loopval
-    neg 1 add		% 1 - loopval
-    3 index		% width
-    mul			% (1 - loopval) * width
-    0			% y
-    moveto		% Starting point
-
-    2 index		% width
-    exch		% loopval
-    2 index		% height
-    mul			% loopval * height
-    lineto		% Next point
-
-    1 index		% width
-    0			% y
-    lineto		% Next point
-
-    closepath
-    fill
-  } for
-
-  0 setgray rectstroke
-
-  /Helvetica-BoldOblique findfont 1 index 3 div scalefont setfont
-  dup 40 div
-
-  dup 4 mul 1 index 25 mul moveto (E) show
-  dup 10 mul 1 index 15 mul moveto (S) show
-  dup 16 mul 1 index 5 mul moveto (P) show
-
-  /Helvetica-BoldOblique findfont 2 index 5 div scalefont setfont
-  dup 14 mul 1 index 29 mul moveto (asy) show
-  dup 20 mul 1 index 19 mul moveto (oftware) show
-  dup 26 mul 1 index 9 mul moveto (roducts) show
-
-  pop
-} bind def
 %%EndResource
 %%EndProlog
 %%Page: 1 1
@@ -186,7 +83,7 @@ gsave
 
   pageWidth 36 mul			% Center of page
   pageHeight 72 mul			% Top of page
-  pageWidth -7 mul add			% - 2 lines
+  pageWidth 9 mul sub			% - 3 lines
   moveto				% Position text
   bigFont setfont			% Font
   (Secret) CENTER			% Show text centered
@@ -219,59 +116,44 @@ gsave
 
   pageWidth 36 mul			% x = pageWidth * 1/2 * 72
   pageHeight 36 mul			% y = pageHeight * 1/2 * 72
-  pageHeight 5 mul add			% y += 2 lines
+  pageHeight 5 mul add			% y += 3.333 lines
   2 copy				% Copy X & Y
   moveto
   (Job ID: ) RIGHT
+  2 copy				% Copy X & Y
   moveto
   ({printer-name}-{job-id}) show
 
-  pageWidth 36 mul			% x = pageWidth * 1/2 * 72
-  pageHeight 36 mul			% y = pageHeight * 1/2 * 72
-  pageHeight 2 mul add			% y += 1 line
+  pageHeight 3 mul sub			% y -= 2 lines
   2 copy				% Copy X & Y
   moveto
   (Title: ) RIGHT
+  2 copy				% Copy X & Y
   moveto
   ({job-name}) show
 
-  pageWidth 36 mul			% x = pageWidth * 1/2 * 72
-  pageHeight 36 mul			% y = pageHeight * 1/2 * 72
-  pageHeight -1 mul add			% y -= 1 line
+  pageHeight 3 mul sub			% y -= 2 lines
   2 copy				% Copy X & Y
   moveto
   (Requesting User: ) RIGHT
-  moveto
-  ({job-originating-user-name}) show
-
-  pageWidth 36 mul			% x = pageWidth * 1/2 * 72
-  pageHeight 36 mul			% y = pageHeight * 1/2 * 72
-  pageHeight -4 mul add			% y -= 2 lines
   2 copy				% Copy X & Y
   moveto
-  (Billing Info: ) RIGHT
-  moveto
-  ({job-billing}) show
+  ({job-originating-user-name}) show
 
-  % Then the CUPS logo....
-  gsave
-    pageWidth 4 mul
-    pageWidth 6 mul
-    translate
-    pageWidth 9 mul CUPSLOGO
-  grestore
+  ({?job-billing}) () ne {
+    pageHeight 3 mul sub		% y -= 2 lines
+    2 copy				% Copy X & Y
+    moveto
+    (Billing Info: ) RIGHT
+    2 copy				% Copy X & Y
+    moveto
+    ({job-billing}) show
+  } if
 
-  % And the ESP logo....
-  gsave
-    pageWidth 59 mul
-    pageWidth 6 mul
-    translate
-    pageWidth 6 mul ESPLOGO
-  grestore
 % Show the page...
 grestore
 showpage
 %
-% End of "$Id: secret 4494 2005-02-18 02:18:11Z mike $".
+% End of "$Id: secret 6649 2007-07-11 21:46:42Z mike $".
 %
 %%EOF
diff --git a/data/standard b/data/standard
index 8fac59e5f..6f03745d0 100644
--- a/data/standard
+++ b/data/standard
@@ -5,32 +5,22 @@
 %%DocumentData: Clean7Bit
 %%DocumentSuppliedResources: procset bannerprint/1.0
 %%DocumentNeededResources: font Helvetica Helvetica-Bold Times-Roman
-%%Creator: Michael Sweet, Easy Software Products
-%%CreationDate: May 10, 2000
+%%Creator: Michael Sweet, Apple Inc.
+%%CreationDate: D:20070620123000+0700
 %%Title: Test Page
 %%EndComments
 %%BeginProlog
-%%BeginResource procset bannerprint 1.1 0
+%%BeginResource procset bannerprint 1.3 0
 %
 %   PostScript banner page for the Common UNIX Printing System ("CUPS").
 %
+%   Copyright 2007 Apple Inc.
 %   Copyright 1993-2005 Easy Software Products
 %
 %   These coded instructions, statements, and computer programs are the
-%   property of Easy Software Products and are protected by Federal
-%   copyright law.  Distribution and use rights are outlined in the file
-%   "LICENSE.txt" which should have been included with this file.  If this
-%   file is missing or damaged please contact Easy Software Products
-%   at:
-%
-%       Attn: CUPS Licensing Information
-%       Easy Software Products
-%       44141 Airport View Drive, Suite 204
-%       Hollywood, Maryland 20636 USA
-%
-%       Voice: (301) 373-9600
-%       EMail: cups-info@cups.org
-%         WWW: http://www.cups.org
+%   property of Apple Inc. and are protected by Federal copyright law.
+%   Distribution and use rights are outlined in the file "LICENSE.txt"
+%   which is included with the CUPS source distribution.
 %
 /CENTER {			% Draw centered text
 				% (name) CENTER -
@@ -53,99 +43,6 @@
   } ifelse
   100 string cvs show		% Convert to a string and show it...
 } bind def
-/CUPSLOGO {			% Draw the CUPS logo
-				% height CUPSLOGO
-  % Start with a big C...
-  /Helvetica findfont 1 index scalefont setfont
-  0 setgray
-  0 0 moveto
-  (C) show
-
-  % Then "UNIX Printing System" much smaller...
-  /Helvetica-Bold findfont 1 index 9 div scalefont setfont
-  0.25 mul
-  dup dup 2.0 mul moveto
-  (UNIX) show
-  dup dup 1.6 mul moveto
-  (Printing) show
-  dup 1.2 mul moveto
-  (System) show
-} bind def
-/ESPLOGO {			% Draw the ESP logo
-				% height ESPLOGO
-  % Compute the size of the logo...
-  0 0
-  2 index 1.5 mul 3 index
-
-  % Do the "metallic" fill from 10% black to 40% black...
-  1 -0.001 0 {
-    dup			% loopval
-    -0.15 mul		% loopval * -0.15
-    0.9 add		% 0.9 - loopval * 0.15
-    setgray		% set gray shade
-
-    0			% x
-    1 index neg		% loopval
-    1 add		% 1 - loopval
-    3 index		% height
-    mul			% height * (1 - loopval)
-    moveto		% starting point
-
-    dup			% loopval
-    3 index		% width
-    mul			% loopval * width
-    2 index		% height
-    lineto		% Next point
-
-    0			% x
-    2 index		% height
-    lineto		% Next point
-
-    closepath
-    fill
-
-    dup			% loopval
-    0.15 mul		% loopval * 0.15
-    0.6 add		% 0.6 + loopval * 0.15
-    setgray
-
-    dup			% loopval
-    neg 1 add		% 1 - loopval
-    3 index		% width
-    mul			% (1 - loopval) * width
-    0			% y
-    moveto		% Starting point
-
-    2 index		% width
-    exch		% loopval
-    2 index		% height
-    mul			% loopval * height
-    lineto		% Next point
-
-    1 index		% width
-    0			% y
-    lineto		% Next point
-
-    closepath
-    fill
-  } for
-
-  0 setgray rectstroke
-
-  /Helvetica-BoldOblique findfont 1 index 3 div scalefont setfont
-  dup 40 div
-
-  dup 4 mul 1 index 25 mul moveto (E) show
-  dup 10 mul 1 index 15 mul moveto (S) show
-  dup 16 mul 1 index 5 mul moveto (P) show
-
-  /Helvetica-BoldOblique findfont 2 index 5 div scalefont setfont
-  dup 14 mul 1 index 29 mul moveto (asy) show
-  dup 20 mul 1 index 19 mul moveto (oftware) show
-  dup 26 mul 1 index 9 mul moveto (roducts) show
-
-  pop
-} bind def
 %%EndResource
 %%EndProlog
 %%Page: 1 1
@@ -181,6 +78,22 @@ gsave
   pageBottom 72 mul
   translate
 
+  % Draw the label at the top and bottom...
+  0 setgray				% Color
+
+  pageWidth 36 mul			% Center of page
+  pageHeight 72 mul			% Top of page
+  pageWidth 9 mul sub			% - 3 lines
+  moveto				% Position text
+  bigFont setfont			% Font
+  (Cover Page) CENTER			% Show text centered
+
+  pageWidth 36 mul			% Center of page
+  pageHeight 6 mul			% Bottom of page
+  moveto				% Position text
+  bigFont setfont			% Font
+  (Cover Page) CENTER			% Show text centered
+
   % Job information box...
   pageWidth 36 mul 9 add		% x = pageWidth * 1/2 * 72 + 9
   boxWidth 0.5 mul sub			% x-= 1/2 box width
@@ -203,59 +116,44 @@ gsave
 
   pageWidth 36 mul			% x = pageWidth * 1/2 * 72
   pageHeight 36 mul			% y = pageHeight * 1/2 * 72
-  pageHeight 5 mul add			% y += 2 lines
+  pageHeight 5 mul add			% y += 3.333 lines
   2 copy				% Copy X & Y
   moveto
   (Job ID: ) RIGHT
+  2 copy				% Copy X & Y
   moveto
   ({printer-name}-{job-id}) show
 
-  pageWidth 36 mul			% x = pageWidth * 1/2 * 72
-  pageHeight 36 mul			% y = pageHeight * 1/2 * 72
-  pageHeight 2 mul add			% y += 1 line
+  pageHeight 3 mul sub			% y -= 2 lines
   2 copy				% Copy X & Y
   moveto
   (Title: ) RIGHT
+  2 copy				% Copy X & Y
   moveto
   ({job-name}) show
 
-  pageWidth 36 mul			% x = pageWidth * 1/2 * 72
-  pageHeight 36 mul			% y = pageHeight * 1/2 * 72
-  pageHeight -1 mul add			% y -= 1 line
+  pageHeight 3 mul sub			% y -= 2 lines
   2 copy				% Copy X & Y
   moveto
   (Requesting User: ) RIGHT
-  moveto
-  ({job-originating-user-name}) show
-
-  pageWidth 36 mul			% x = pageWidth * 1/2 * 72
-  pageHeight 36 mul			% y = pageHeight * 1/2 * 72
-  pageHeight -4 mul add			% y -= 2 lines
   2 copy				% Copy X & Y
   moveto
-  (Billing Info: ) RIGHT
-  moveto
-  ({job-billing}) show
+  ({job-originating-user-name}) show
 
-  % Then the CUPS logo....
-  gsave
-    pageWidth 4 mul
-    pageWidth 6 mul
-    translate
-    pageWidth 9 mul CUPSLOGO
-  grestore
+  ({?job-billing}) () ne {
+    pageHeight 3 mul sub		% y -= 2 lines
+    2 copy				% Copy X & Y
+    moveto
+    (Billing Info: ) RIGHT
+    2 copy				% Copy X & Y
+    moveto
+    ({job-billing}) show
+  } if
 
-  % And the ESP logo....
-  gsave
-    pageWidth 59 mul
-    pageWidth 6 mul
-    translate
-    pageWidth 6 mul ESPLOGO
-  grestore
 % Show the page...
 grestore
 showpage
 %
-% End of "$Id: standard 4494 2005-02-18 02:18:11Z mike $".
+% End of "$Id: standard 6649 2007-07-11 21:46:42Z mike $".
 %
 %%EOF
diff --git a/data/testprint.ps b/data/testprint.ps
index eca6cee91..ead73978a 100644
--- a/data/testprint.ps
+++ b/data/testprint.ps
@@ -5,8 +5,8 @@
 %%DocumentData: Clean7Bit
 %%DocumentSuppliedResources: procset testprint/1.3
 %%DocumentNeededResources: font Helvetica Helvetica-Bold Times-Roman
-%%Creator: Michael Sweet, Easy Software Products
-%%CreationDate: D:20070220113000+0500
+%%Creator: Michael Sweet, Apple Inc.
+%%CreationDate: D:20070606214000+0500
 %%Title: Test Page
 %%EndComments
 %%BeginProlog
@@ -14,23 +14,13 @@
 %
 %   PostScript test page for the Common UNIX Printing System ("CUPS").
 %
+%   Copyright 2007 Apple Inc.
 %   Copyright 1993-2007 Easy Software Products
 %
 %   These coded instructions, statements, and computer programs are the
-%   property of Easy Software Products and are protected by Federal
-%   copyright law.  Distribution and use rights are outlined in the file
-%   "LICENSE.txt" which should have been included with this file.  If this
-%   file is missing or damaged please contact Easy Software Products
-%   at:
-%
-%       Attn: CUPS Licensing Information
-%       Easy Software Products
-%       44141 Airport View Drive, Suite 204
-%       Hollywood, Maryland 20636 USA
-%
-%       Voice: (301) 373-9600
-%       EMail: cups-info@cups.org
-%         WWW: http://www.cups.org
+%   property of Apple Inc. and are protected by Federal copyright law.
+%   Distribution and use rights are outlined in the file "LICENSE.txt"
+%   which is included with the CUPS source distribution.
 %
 /SEXTANT {			% Draw a color wheel sextant...
 				% (name) white radius r g b SEXTANT -
@@ -137,24 +127,6 @@
   dup 1.2 mul moveto
   (System) show
 } bind def
-/ESPLOGO {			% Draw the ESP logo
-				% height ESPLOGO
-  gsave
-    48 div dup scale
-
-    /Helvetica-Bold findfont 38.2 scalefont setfont
-    0 setgray
-    -3 19.5 moveto (ESP) show
-
-    /Helvetica-Narrow-Oblique findfont 8.2 scalefont setfont
-    0 2 moveto (Easy Software Products) show
-
-    1 -0.01 0 { dup neg 1.0 add setgray 0 11 3 -1 roll 68 mul 4.5 rectfill } for
-
-    1 0 0 setrgbcolor
-    67.5 11 4.5 4.5 rectfill
-  grestore
-} bind def
 %%EndResource
 %%EndProlog
 %%Page: 1 1
@@ -592,46 +564,35 @@ gsave
   (Printer Test Page) CENTER		% Show text centered
 
   % Draw the copyright notice at the bottom...
-  pageWidth 36 mul			% Center of page
-  pageHeight 12 mul			% Bottom of page
+  pageWidth 17 mul			% Center of page
+  pageHeight 10 mul			% Bottom of page
   moveto				% Position text
-  (Printed Using CUPS v1.3.x) CENTER	% Show text centered
+  (Printed Using CUPS v1.3.x) show
 
-  pageWidth 34 mul			% Left-center of page
+  pageWidth 17 mul			% Left side of page
   pageHeight 8 mul			% Move down...
   2 copy moveto				% Position text
   smallFont setfont			% Font
-  (Copyright 1993-2006 Easy Software Products, All Rights Reserved.) CENTER
-  pageHeight sub			% Move down...
-  2 copy moveto				% Position text
-  (CUPS, and the CUPS logo are the trademark property of Easy Software Products,) CENTER
-  pageHeight sub			% Move down...
+  (Copyright 2007 Apple Inc., All Rights Reserved. CUPS and the CUPS logo are the trademark) show
+  pageHeight 2 add sub			% Move down...
   2 copy moveto				% Position text
-  (44141 Airport View Drive, Suite 204, Hollywood, Maryland, 20636, USA.) CENTER
-  pageHeight sub			% Move down...
-  pageHeight sub			% Move down...
+  (property of Apple Inc., 1 Infinite Loop, Cupertino, CA 95014, USA.) show
+  pageHeight 2 mul 4 add sub		% Move down...
   moveto				% Position text
-  (Need help? Contact your operating system vendor or visit "http://www.cups.org/".) CENTER
+  (Need help? Contact your operating system vendor or visit "http://www.cups.org/".) show
 
   % Then the CUPS logo....
   gsave
     pageWidth 4 mul
     pageHeight 4 mul
     translate
-    pageWidth 9 mul CUPSLOGO
+    pageWidth 15 mul CUPSLOGO
   grestore
 
-  % And the ESP logo....
-  gsave
-    pageWidth 58 mul
-    pageHeight 4 mul
-    translate
-    pageWidth 6 mul ESPLOGO
-  grestore
 % Show the page...
 grestore
 showpage
 %
-% End of "$Id: testprint.ps 6295 2007-02-20 16:31:58Z mike $".
+% End of "$Id: testprint.ps 6649 2007-07-11 21:46:42Z mike $".
 %
 %%EOF
diff --git a/data/topsecret b/data/topsecret
index 389cbf105..7ac9b5b63 100644
--- a/data/topsecret
+++ b/data/topsecret
@@ -5,32 +5,22 @@
 %%DocumentData: Clean7Bit
 %%DocumentSuppliedResources: procset bannerprint/1.0
 %%DocumentNeededResources: font Helvetica Helvetica-Bold Times-Roman
-%%Creator: Michael Sweet, Easy Software Products
-%%CreationDate: May 10, 2000
+%%Creator: Michael Sweet, Apple Inc.
+%%CreationDate: D:20070620123000+0700
 %%Title: Test Page
 %%EndComments
 %%BeginProlog
-%%BeginResource procset bannerprint 1.1 0
+%%BeginResource procset bannerprint 1.3 0
 %
 %   PostScript banner page for the Common UNIX Printing System ("CUPS").
 %
+%   Copyright 2007 Apple Inc.
 %   Copyright 1993-2005 Easy Software Products
 %
 %   These coded instructions, statements, and computer programs are the
-%   property of Easy Software Products and are protected by Federal
-%   copyright law.  Distribution and use rights are outlined in the file
-%   "LICENSE.txt" which should have been included with this file.  If this
-%   file is missing or damaged please contact Easy Software Products
-%   at:
-%
-%       Attn: CUPS Licensing Information
-%       Easy Software Products
-%       44141 Airport View Drive, Suite 204
-%       Hollywood, Maryland 20636 USA
-%
-%       Voice: (301) 373-9600
-%       EMail: cups-info@cups.org
-%         WWW: http://www.cups.org
+%   property of Apple Inc. and are protected by Federal copyright law.
+%   Distribution and use rights are outlined in the file "LICENSE.txt"
+%   which is included with the CUPS source distribution.
 %
 /CENTER {			% Draw centered text
 				% (name) CENTER -
@@ -53,99 +43,6 @@
   } ifelse
   100 string cvs show		% Convert to a string and show it...
 } bind def
-/CUPSLOGO {			% Draw the CUPS logo
-				% height CUPSLOGO
-  % Start with a big C...
-  /Helvetica findfont 1 index scalefont setfont
-  0 setgray
-  0 0 moveto
-  (C) show
-
-  % Then "UNIX Printing System" much smaller...
-  /Helvetica-Bold findfont 1 index 9 div scalefont setfont
-  0.25 mul
-  dup dup 2.0 mul moveto
-  (UNIX) show
-  dup dup 1.6 mul moveto
-  (Printing) show
-  dup 1.2 mul moveto
-  (System) show
-} bind def
-/ESPLOGO {			% Draw the ESP logo
-				% height ESPLOGO
-  % Compute the size of the logo...
-  0 0
-  2 index 1.5 mul 3 index
-
-  % Do the "metallic" fill from 10% black to 40% black...
-  1 -0.001 0 {
-    dup			% loopval
-    -0.15 mul		% loopval * -0.15
-    0.9 add		% 0.9 - loopval * 0.15
-    setgray		% set gray shade
-
-    0			% x
-    1 index neg		% loopval
-    1 add		% 1 - loopval
-    3 index		% height
-    mul			% height * (1 - loopval)
-    moveto		% starting point
-
-    dup			% loopval
-    3 index		% width
-    mul			% loopval * width
-    2 index		% height
-    lineto		% Next point
-
-    0			% x
-    2 index		% height
-    lineto		% Next point
-
-    closepath
-    fill
-
-    dup			% loopval
-    0.15 mul		% loopval * 0.15
-    0.6 add		% 0.6 + loopval * 0.15
-    setgray
-
-    dup			% loopval
-    neg 1 add		% 1 - loopval
-    3 index		% width
-    mul			% (1 - loopval) * width
-    0			% y
-    moveto		% Starting point
-
-    2 index		% width
-    exch		% loopval
-    2 index		% height
-    mul			% loopval * height
-    lineto		% Next point
-
-    1 index		% width
-    0			% y
-    lineto		% Next point
-
-    closepath
-    fill
-  } for
-
-  0 setgray rectstroke
-
-  /Helvetica-BoldOblique findfont 1 index 3 div scalefont setfont
-  dup 40 div
-
-  dup 4 mul 1 index 25 mul moveto (E) show
-  dup 10 mul 1 index 15 mul moveto (S) show
-  dup 16 mul 1 index 5 mul moveto (P) show
-
-  /Helvetica-BoldOblique findfont 2 index 5 div scalefont setfont
-  dup 14 mul 1 index 29 mul moveto (asy) show
-  dup 20 mul 1 index 19 mul moveto (oftware) show
-  dup 26 mul 1 index 9 mul moveto (roducts) show
-
-  pop
-} bind def
 %%EndResource
 %%EndProlog
 %%Page: 1 1
@@ -186,7 +83,7 @@ gsave
 
   pageWidth 36 mul			% Center of page
   pageHeight 72 mul			% Top of page
-  pageWidth -7 mul add			% - 2 lines
+  pageWidth 9 mul sub			% - 3 lines
   moveto				% Position text
   bigFont setfont			% Font
   (Top Secret) CENTER			% Show text centered
@@ -219,59 +116,44 @@ gsave
 
   pageWidth 36 mul			% x = pageWidth * 1/2 * 72
   pageHeight 36 mul			% y = pageHeight * 1/2 * 72
-  pageHeight 5 mul add			% y += 2 lines
+  pageHeight 5 mul add			% y += 3.333 lines
   2 copy				% Copy X & Y
   moveto
   (Job ID: ) RIGHT
+  2 copy				% Copy X & Y
   moveto
   ({printer-name}-{job-id}) show
 
-  pageWidth 36 mul			% x = pageWidth * 1/2 * 72
-  pageHeight 36 mul			% y = pageHeight * 1/2 * 72
-  pageHeight 2 mul add			% y += 1 line
+  pageHeight 3 mul sub			% y -= 2 lines
   2 copy				% Copy X & Y
   moveto
   (Title: ) RIGHT
+  2 copy				% Copy X & Y
   moveto
   ({job-name}) show
 
-  pageWidth 36 mul			% x = pageWidth * 1/2 * 72
-  pageHeight 36 mul			% y = pageHeight * 1/2 * 72
-  pageHeight -1 mul add			% y -= 1 line
+  pageHeight 3 mul sub			% y -= 2 lines
   2 copy				% Copy X & Y
   moveto
   (Requesting User: ) RIGHT
-  moveto
-  ({job-originating-user-name}) show
-
-  pageWidth 36 mul			% x = pageWidth * 1/2 * 72
-  pageHeight 36 mul			% y = pageHeight * 1/2 * 72
-  pageHeight -4 mul add			% y -= 2 lines
   2 copy				% Copy X & Y
   moveto
-  (Billing Info: ) RIGHT
-  moveto
-  ({job-billing}) show
+  ({job-originating-user-name}) show
 
-  % Then the CUPS logo....
-  gsave
-    pageWidth 4 mul
-    pageWidth 6 mul
-    translate
-    pageWidth 9 mul CUPSLOGO
-  grestore
+  ({?job-billing}) () ne {
+    pageHeight 3 mul sub		% y -= 2 lines
+    2 copy				% Copy X & Y
+    moveto
+    (Billing Info: ) RIGHT
+    2 copy				% Copy X & Y
+    moveto
+    ({job-billing}) show
+  } if
 
-  % And the ESP logo....
-  gsave
-    pageWidth 59 mul
-    pageWidth 6 mul
-    translate
-    pageWidth 6 mul ESPLOGO
-  grestore
 % Show the page...
 grestore
 showpage
 %
-% End of "$Id: topsecret 4494 2005-02-18 02:18:11Z mike $".
+% End of "$Id: topsecret 6649 2007-07-11 21:46:42Z mike $".
 %
 %%EOF
diff --git a/data/unclassified b/data/unclassified
index 804773e6e..385f903a9 100644
--- a/data/unclassified
+++ b/data/unclassified
@@ -5,32 +5,22 @@
 %%DocumentData: Clean7Bit
 %%DocumentSuppliedResources: procset bannerprint/1.0
 %%DocumentNeededResources: font Helvetica Helvetica-Bold Times-Roman
-%%Creator: Michael Sweet, Easy Software Products
-%%CreationDate: May 10, 2000
+%%Creator: Michael Sweet, Apple Inc.
+%%CreationDate: D:20070620123000+0700
 %%Title: Test Page
 %%EndComments
 %%BeginProlog
-%%BeginResource procset bannerprint 1.1 0
+%%BeginResource procset bannerprint 1.3 0
 %
 %   PostScript banner page for the Common UNIX Printing System ("CUPS").
 %
+%   Copyright 2007 Apple Inc.
 %   Copyright 1993-2005 Easy Software Products
 %
 %   These coded instructions, statements, and computer programs are the
-%   property of Easy Software Products and are protected by Federal
-%   copyright law.  Distribution and use rights are outlined in the file
-%   "LICENSE.txt" which should have been included with this file.  If this
-%   file is missing or damaged please contact Easy Software Products
-%   at:
-%
-%       Attn: CUPS Licensing Information
-%       Easy Software Products
-%       44141 Airport View Drive, Suite 204
-%       Hollywood, Maryland 20636 USA
-%
-%       Voice: (301) 373-9600
-%       EMail: cups-info@cups.org
-%         WWW: http://www.cups.org
+%   property of Apple Inc. and are protected by Federal copyright law.
+%   Distribution and use rights are outlined in the file "LICENSE.txt"
+%   which is included with the CUPS source distribution.
 %
 /CENTER {			% Draw centered text
 				% (name) CENTER -
@@ -53,99 +43,6 @@
   } ifelse
   100 string cvs show		% Convert to a string and show it...
 } bind def
-/CUPSLOGO {			% Draw the CUPS logo
-				% height CUPSLOGO
-  % Start with a big C...
-  /Helvetica findfont 1 index scalefont setfont
-  0 setgray
-  0 0 moveto
-  (C) show
-
-  % Then "UNIX Printing System" much smaller...
-  /Helvetica-Bold findfont 1 index 9 div scalefont setfont
-  0.25 mul
-  dup dup 2.0 mul moveto
-  (UNIX) show
-  dup dup 1.6 mul moveto
-  (Printing) show
-  dup 1.2 mul moveto
-  (System) show
-} bind def
-/ESPLOGO {			% Draw the ESP logo
-				% height ESPLOGO
-  % Compute the size of the logo...
-  0 0
-  2 index 1.5 mul 3 index
-
-  % Do the "metallic" fill from 10% black to 40% black...
-  1 -0.001 0 {
-    dup			% loopval
-    -0.15 mul		% loopval * -0.15
-    0.9 add		% 0.9 - loopval * 0.15
-    setgray		% set gray shade
-
-    0			% x
-    1 index neg		% loopval
-    1 add		% 1 - loopval
-    3 index		% height
-    mul			% height * (1 - loopval)
-    moveto		% starting point
-
-    dup			% loopval
-    3 index		% width
-    mul			% loopval * width
-    2 index		% height
-    lineto		% Next point
-
-    0			% x
-    2 index		% height
-    lineto		% Next point
-
-    closepath
-    fill
-
-    dup			% loopval
-    0.15 mul		% loopval * 0.15
-    0.6 add		% 0.6 + loopval * 0.15
-    setgray
-
-    dup			% loopval
-    neg 1 add		% 1 - loopval
-    3 index		% width
-    mul			% (1 - loopval) * width
-    0			% y
-    moveto		% Starting point
-
-    2 index		% width
-    exch		% loopval
-    2 index		% height
-    mul			% loopval * height
-    lineto		% Next point
-
-    1 index		% width
-    0			% y
-    lineto		% Next point
-
-    closepath
-    fill
-  } for
-
-  0 setgray rectstroke
-
-  /Helvetica-BoldOblique findfont 1 index 3 div scalefont setfont
-  dup 40 div
-
-  dup 4 mul 1 index 25 mul moveto (E) show
-  dup 10 mul 1 index 15 mul moveto (S) show
-  dup 16 mul 1 index 5 mul moveto (P) show
-
-  /Helvetica-BoldOblique findfont 2 index 5 div scalefont setfont
-  dup 14 mul 1 index 29 mul moveto (asy) show
-  dup 20 mul 1 index 19 mul moveto (oftware) show
-  dup 26 mul 1 index 9 mul moveto (roducts) show
-
-  pop
-} bind def
 %%EndResource
 %%EndProlog
 %%Page: 1 1
@@ -186,7 +83,7 @@ gsave
 
   pageWidth 36 mul			% Center of page
   pageHeight 72 mul			% Top of page
-  pageWidth -7 mul add			% - 2 lines
+  pageWidth 9 mul sub			% - 3 lines
   moveto				% Position text
   bigFont setfont			% Font
   (Unclassified) CENTER			% Show text centered
@@ -219,59 +116,44 @@ gsave
 
   pageWidth 36 mul			% x = pageWidth * 1/2 * 72
   pageHeight 36 mul			% y = pageHeight * 1/2 * 72
-  pageHeight 5 mul add			% y += 2 lines
+  pageHeight 5 mul add			% y += 3.333 lines
   2 copy				% Copy X & Y
   moveto
   (Job ID: ) RIGHT
+  2 copy				% Copy X & Y
   moveto
   ({printer-name}-{job-id}) show
 
-  pageWidth 36 mul			% x = pageWidth * 1/2 * 72
-  pageHeight 36 mul			% y = pageHeight * 1/2 * 72
-  pageHeight 2 mul add			% y += 1 line
+  pageHeight 3 mul sub			% y -= 2 lines
   2 copy				% Copy X & Y
   moveto
   (Title: ) RIGHT
+  2 copy				% Copy X & Y
   moveto
   ({job-name}) show
 
-  pageWidth 36 mul			% x = pageWidth * 1/2 * 72
-  pageHeight 36 mul			% y = pageHeight * 1/2 * 72
-  pageHeight -1 mul add			% y -= 1 line
+  pageHeight 3 mul sub			% y -= 2 lines
   2 copy				% Copy X & Y
   moveto
   (Requesting User: ) RIGHT
-  moveto
-  ({job-originating-user-name}) show
-
-  pageWidth 36 mul			% x = pageWidth * 1/2 * 72
-  pageHeight 36 mul			% y = pageHeight * 1/2 * 72
-  pageHeight -4 mul add			% y -= 2 lines
   2 copy				% Copy X & Y
   moveto
-  (Billing Info: ) RIGHT
-  moveto
-  ({job-billing}) show
+  ({job-originating-user-name}) show
 
-  % Then the CUPS logo....
-  gsave
-    pageWidth 4 mul
-    pageWidth 6 mul
-    translate
-    pageWidth 9 mul CUPSLOGO
-  grestore
+  ({?job-billing}) () ne {
+    pageHeight 3 mul sub		% y -= 2 lines
+    2 copy				% Copy X & Y
+    moveto
+    (Billing Info: ) RIGHT
+    2 copy				% Copy X & Y
+    moveto
+    ({job-billing}) show
+  } if
 
-  % And the ESP logo....
-  gsave
-    pageWidth 59 mul
-    pageWidth 6 mul
-    translate
-    pageWidth 6 mul ESPLOGO
-  grestore
 % Show the page...
 grestore
 showpage
 %
-% End of "$Id: unclassified 4494 2005-02-18 02:18:11Z mike $".
+% End of "$Id: unclassified 6649 2007-07-11 21:46:42Z mike $".
 %
 %%EOF