Merge CUPS 1.4svn-r7319.

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

9 files changed, 526 insertions, 1 deletions

diff --git a/data/Makefile b/data/Makefile
index f060e382d..85fb590af 100644
--- a/data/Makefile
+++ b/data/Makefile
@@ -3,7 +3,7 @@
 #
 #   Datafile makefile for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 2007 by Apple Inc.
+#   Copyright 2007-2008 by Apple Inc.
 #   Copyright 1993-2006 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
@@ -74,6 +74,16 @@ DATAFILES =	\
 		psglyphs \
 		testprint.ps
 
+PPDCFILES =	\
+		epson.h \
+		escp.h \
+		font.defs \
+		hp.h \
+		label.h \
+		media.defs \
+		pcl.h \
+		raster.defs
+
 
 #
 # Make everything...
@@ -117,6 +127,10 @@ install:	all
 	for file in $(DATAFILES); do \
 		$(INSTALL_DATA) $$file $(DATADIR)/data; \
 	done
+	$(INSTALL_DIR) -m 755 $(DATADIR)/ppdc
+	for file in $(PPDCFILES); do \
+		$(INSTALL_DATA) $$file $(DATADIR)/ppdc; \
+	done
 	$(INSTALL_DIR) -m 755 $(DATADIR)/profiles
 
 
@@ -137,7 +151,11 @@ uninstall:
 	for file in $(DATAFILES); do \
 		$(RM) $(DATADIR)/data/$$file; \
 	done
+	for file in $(PPDCFILES); do \
+		$(RM) $(DATADIR)/ppdc/$$file; \
+	done
 	-$(RMDIR) $(DATADIR)/profiles
+	-$(RMDIR) $(DATADIR)/ppdc
 	-$(RMDIR) $(DATADIR)/data
 	-$(RMDIR) $(DATADIR)/charsets
 	-$(RMDIR) $(DATADIR)/charmaps
diff --git a/data/epson.h b/data/epson.h
new file mode 100644
index 000000000..13cb1a346
--- /dev/null
+++ b/data/epson.h
@@ -0,0 +1,27 @@
+/*
+ * "$Id$"
+ *
+ *   This file contains model number definitions for the CUPS sample
+ *   ESC/P driver.
+ *
+ *   Copyright 2007 by Apple Inc.
+ *   Copyright 1997-2005 by Easy Software Products.
+ *
+ *   These coded instructions, statements, and computer programs are the
+ *   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/".
+ */
+
+#define EPSON_9PIN	0		/* 9-pin dot matrix */
+#define EPSON_24PIN	1		/* 24-pin dot matrix */
+#define EPSON_COLOR	2		/* Epson Stylus Color with ESC . */
+#define EPSON_PHOTO	3		/* Epson Stylus Photo with ESC . */
+#define EPSON_ICOLOR	4		/* Epson Stylus Color with ESC i */
+#define EPSON_IPHOTO	5		/* Epson Stylus Photo with ESC i */
+
+
+/*
+ * End of "$Id$".
+ */
diff --git a/data/escp.h b/data/escp.h
new file mode 100644
index 000000000..94389f3b9
--- /dev/null
+++ b/data/escp.h
@@ -0,0 +1,34 @@
+/*
+ * "$Id$"
+ *
+ *   This file contains model number definitions for the CUPS unified
+ *   ESC/P driver.
+ *
+ *   Copyright 2007 by Apple Inc.
+ *   Copyright 1997-2005 by Easy Software Products.
+ *
+ *   These coded instructions, statements, and computer programs are the
+ *   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/".
+ */
+
+/* General ESC/P Support */
+#define ESCP_DOTMATRIX		0x1		/* Dot matrix printer? */
+#define ESCP_MICROWEAVE		0x2		/* Use microweave command? */
+#define ESCP_STAGGER		0x4		/* Are color jets staggered? */
+#define ESCP_ESCK		0x8		/* Use print mode command?*/
+#define ESCP_EXT_UNITS		0x10		/* Use extended unit commands? */
+#define ESCP_EXT_MARGINS	0x20		/* Use extended margin command */
+#define ESCP_USB		0x40		/* Send USB packet mode escape? */
+#define ESCP_PAGE_SIZE		0x80		/* Use page size command */
+#define ESCP_RASTER_ESCI	0x100		/* Use ESC i graphics command */
+
+/* Remote mode support */
+#define ESCP_REMOTE		0x1000		/* Use remote mode commands? */
+
+
+/*
+ * End of "$Id$".
+ */
diff --git a/data/font.defs b/data/font.defs
new file mode 100644
index 000000000..ee4559e82
--- /dev/null
+++ b/data/font.defs
@@ -0,0 +1,55 @@
+/*
+ * "$Id: font.defs 343 2007-07-13 19:52:48Z mike $"
+ *
+ *   Standard ESP Ghostscript font definitions for the CUPS PPD file
+ *   compiler.
+ *
+ *   Copyright 2007 by Apple Inc.
+ *   Copyright 1997-2005 by Easy Software Products.
+ *
+ *   These coded instructions, statements, and computer programs are the
+ *   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/".
+ */
+
+#font AvantGarde-Book Standard "(1.05)" Standard ROM
+#font AvantGarde-BookOblique Standard "(1.05)" Standard ROM
+#font AvantGarde-Demi Standard "(1.05)" Standard ROM
+#font AvantGarde-DemiOblique Standard "(1.05)" Standard ROM
+#font Bookman-Demi Standard "(1.05)" Standard ROM
+#font Bookman-DemiItalic Standard "(1.05)" Standard ROM
+#font Bookman-Light Standard "(1.05)" Standard ROM
+#font Bookman-LightItalic Standard "(1.05)" Standard ROM
+#font Courier Standard "(1.05)" Standard ROM
+#font Courier-Bold Standard "(1.05)" Standard ROM
+#font Courier-BoldOblique Standard "(1.05)" Standard ROM
+#font Courier-Oblique Standard "(1.05)" Standard ROM
+#font Helvetica Standard "(1.05)" Standard ROM
+#font Helvetica-Bold Standard "(1.05)" Standard ROM
+#font Helvetica-BoldOblique Standard "(1.05)" Standard ROM
+#font Helvetica-Narrow Standard "(1.05)" Standard ROM
+#font Helvetica-Narrow-Bold Standard "(1.05)" Standard ROM
+#font Helvetica-Narrow-BoldOblique Standard "(1.05)" Standard ROM
+#font Helvetica-Narrow-Oblique Standard "(1.05)" Standard ROM
+#font Helvetica-Oblique Standard "(1.05)" Standard ROM
+#font NewCenturySchlbk-Bold Standard "(1.05)" Standard ROM
+#font NewCenturySchlbk-BoldItalic Standard "(1.05)" Standard ROM
+#font NewCenturySchlbk-Italic Standard "(1.05)" Standard ROM
+#font NewCenturySchlbk-Roman Standard "(1.05)" Standard ROM
+#font Palatino-Bold Standard "(1.05)" Standard ROM
+#font Palatino-BoldItalic Standard "(1.05)" Standard ROM
+#font Palatino-Italic Standard "(1.05)" Standard ROM
+#font Palatino-Roman Standard "(1.05)" Standard ROM
+#font Symbol Special "(001.005)" Special ROM
+#font Times-Bold Standard "(1.05)" Standard ROM
+#font Times-BoldItalic Standard "(1.05)" Standard ROM
+#font Times-Italic Standard "(1.05)" Standard ROM
+#font Times-Roman Standard "(1.05)" Standard ROM
+#font ZapfChancery-MediumItalic Standard "(1.05)" Standard ROM
+#font ZapfDingbats Special "(001.005)" Special ROM
+
+/*
+ * End of "$Id: font.defs 343 2007-07-13 19:52:48Z mike $".
+ */
diff --git a/data/hp.h b/data/hp.h
new file mode 100644
index 000000000..c70034316
--- /dev/null
+++ b/data/hp.h
@@ -0,0 +1,24 @@
+/*
+ * "$Id$"
+ *
+ *   This file contains model number definitions for the CUPS sample
+ *   HP driver.
+ *
+ *   Copyright 2007 by Apple Inc.
+ *   Copyright 1997-2005 by Easy Software Products.
+ *
+ *   These coded instructions, statements, and computer programs are the
+ *   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/".
+ */
+
+#define HP_LASERJET	0		/* HP LaserJet */
+#define HP_DESKJET	1		/* HP DeskJet with simple color */
+#define HP_DESKJET2	2		/* HP DeskJet with CRet color */
+
+
+/*
+ * End of "$Id$".
+ */
diff --git a/data/label.h b/data/label.h
new file mode 100644
index 000000000..4b6fba64f
--- /dev/null
+++ b/data/label.h
@@ -0,0 +1,28 @@
+/*
+ * "$Id$"
+ *
+ *   This file contains model number definitions for the CUPS sample
+ *   label printer driver.
+ *
+ *   Copyright 2007 by Apple Inc.
+ *   Copyright 1997-2005 by Easy Software Products.
+ *
+ *   These coded instructions, statements, and computer programs are the
+ *   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/".
+ */
+
+#define DYMO_3x0	0		/* Dymo Labelwriter 300/330/330 Turbo */
+
+#define ZEBRA_EPL_LINE  0x10            /* Zebra EPL line mode printers */
+#define ZEBRA_EPL_PAGE  0x11            /* Zebra EPL page mode printers */
+#define ZEBRA_ZPL       0x12            /* Zebra ZPL-based printers */
+#define ZEBRA_CPCL      0x13            /* Zebra CPCL-based printers */
+
+#define INTELLITECH_PCL	0x20		/* Intellitech PCL-based printers */
+
+/*
+ * End of "$Id$".
+ */
diff --git a/data/media.defs b/data/media.defs
new file mode 100644
index 000000000..07a4911fb
--- /dev/null
+++ b/data/media.defs
@@ -0,0 +1,207 @@
+/*
+ * "$Id: media.defs 343 2007-07-13 19:52:48Z mike $"
+ *
+ *   Adobe standard media size definitions for the CUPS PPD file compiler.
+ *
+ *   Copyright 2007 by Apple Inc.
+ *   Copyright 1997-2005 by Easy Software Products.
+ *
+ *   These codedinstructions, statements, and computer programs are the
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   copyright law.  Distribution and use rights are outlinedin the file
+ *   "LICENSE.txt" which should have beenincluded with this file.  If this
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
+ */
+
+#media "10x11/10x11 - 10x11in" 720 792
+#media "10x13/10x13 - 10x13in" 720 936
+#media "10x14/10x14 - 10x14in" 720 1008
+#media "12x11/12x11 - 12x11in" 864 792
+#media "15x11/15x11 - 15x11in" 1080 792
+#media "7x9/7x9 - 7x9in" 504 648
+#media "8x10/8x10 - 8x10in" 576 720
+#media "9x11/9x11 - 9x11in" 648 792
+#media "9x12/9x12 - 9x12in" 648 864
+#media "A0/A0 - 841x1189mm" 2384 3370
+#media "A0.Transverse/A0 - 1189x841mm" 3370 2384
+#media "A10/A10 - 26x37mm" 73 105
+#media "A1/A1 - 594x841mm" 1684 2384
+#media "A1.Transverse/A1 - 841x594mm" 2384 1684
+#media "A2/A2 - 420x594mm" 1191 1684
+#media "A2.Transverse/A2 - 594x420mm" 1684 1191
+#media "A3/A3 - 297x420mm" 842 1191
+#media "A3Extra/A3 Extra - 322x445mm" 913 1262
+#media "A3Extra.Transverse/A3 Extra.Transverse - 322x445mm" 913 1262
+#media "A3Rotated/A3 Rotated - 420x297mm" 1191 842
+#media "A3.Transverse/A3 - 420x297mm" 1191 842
+#media "A4/A4 - 210x297mm" 595 842
+#media "A4Extra/A4 Extra - 9.270x12.690in" 667 914
+#media "A4Plus/A4 Plus - 210x330mm" 595 936
+#media "A4Rotated/A4 Rotated - 297x210mm" 842 595
+#media "A4Small/A4 Small - 210x297mm" 595 842
+#media "A4.Transverse/A4 - 297x210mm" 842 595
+#media "A5/A5 - 148x210mm" 420 595
+#media "A5/A5 - 149x210mm" 420 595
+#media "A5Extra/A5 Extra - 174x235mm" 492 668
+#media "A5Rotated/A5 Rotated - 210x148mm" 595 420
+#media "A5.Transverse/A5 - 210x149mm" 595 420
+#media "A6/A6 - 105x148mm" 297 420
+#media "A6Rotated/A6 Rotated - 148x105mm" 420 297
+#media "A7/A7 - 74x105mm" 210 297
+#media "A8/A8 - 52x74mm" 148 210
+#media "A9/A9 - 37x52mm" 105 148
+#media "AnsiA/ANSI A - 8.5x11in" 612 792
+#media "AnsiB/ANSI B - 11x17in" 792 1224
+#media "AnsiC/ANSI C - 17x22in" 1224 1584
+#media "AnsiD/ANSI D - 22x34in" 1584 2448
+#media "AnsiE/ANSI E - 34x44in" 2448 3168
+#media "ARCHA/Arch. A - 9x12in" 648 864
+#media "ARCHA.Transverse/Arch. A - 12x9in" 864 648
+#media "ARCHB/Arch. B - 12x18in" 864 1296
+#media "ARCHB.Transverse/Arch. B - 18x12in" 1296 864
+#media "ARCHC/Arch. C - 18x24in" 1296 1728
+#media "ARCHC.Transverse/Arch. C - 24x18in" 1728 1296
+#media "ARCHD/Arch. D - 24x36in" 1728 2592
+#media "ARCHD.Transverse/Arch. D - 36x24in" 2592 1728
+#media "ARCHE/Arch. E - 36x48in" 2592 3456
+#media "ARCHE.Transverse/Arch. E - 48x36in" 3456 2592
+#media "B0/B0 - 1030x1456mm" 2920 4127
+#media "B10/B10 - 32x45mm" 91 127
+#media "B1/B1 - 728x1028mm" 2064 2918
+#media "B1/B1 - 728x1030mm" 2064 2920
+#media "B2/B2 - 515x728mm" 1460 2064
+#media "B3/B3 - 364x515mm" 1032 1460
+#media "B4/B4 - 257x364mm" 729 1032
+#media "B4Rotated/B4 Rotated - 364x257mm" 1032 729
+#media "B5/B5 - 182x257mm" 516 729
+#media "B5Rotated/B5 Rotated - 257x182mm" 729 516
+#media "B5.Transverse/B5.Transverse - 182x257mm" 516 729
+#media "B6/B6 - 128x182mm" 363 516
+#media "B6Rotated/B6 Rotated - 182x128mm" 516 363
+#media "B7/B7 - 91x128mm" 258 363
+#media "B8/B8 - 64x91mm" 181 258
+#media "B9/B9 - 45x64mm" 127 181
+#media "C4/C4 - 229x324mm" 649 918
+#media "C5/C5 - 162x229mm" 459 649
+#media "C6/C6 - 114x162mm" 323 459
+#media "DL/DL - 110x220mm" 312 624
+#media "DoublePostcard/DoublePostcard - 200x148mm" 567 420
+#media "DoublePostcardRotated/DoublePostcardRotated - 148x200mm" 420 567
+#media "Env10/#10 Envelope - 4.13x9.5in" 297 684
+#media "Env11/#11 Envelope - 4.5x10.375in" 324 747
+#media "Env12/#12 Envelope - 4.75x11in" 342 792
+#media "Env14/#14 Envelope - 127x292mm" 360 828
+#media "Env9/#9 Envelope - 3.875x8.875in" 279 639
+#media "EnvC0/C0 Envelope - 917x1297mm" 2599 3676
+#media "EnvC1/C1 Envelope - 648x917mm" 1837 2599
+#media "EnvC2/C2 Envelope - 458x648mm" 1298 1837
+#media "EnvC3/C3 Envelope - 324x458mm" 918 1296
+#media "EnvC4/C4 Envelope - 229x324mm" 649 918
+#media "EnvC5/C5 Envelope - 162x229mm" 459 649
+#media "EnvC65/C65 Envelope - 114x229mm" 324 648
+#media "EnvC6/C6 Envelope - 114x162mm" 323 459
+#media "EnvC7/C7 Envelope - 81x114mm" 230 323
+#media "EnvChou3/Chou3 Envelope - 120x235mm" 340 666
+#media "EnvChou3Rotated/Chou3 Envelope Rotated - 235x120mm" 666 340
+#media "EnvChou4/Chou4 Envelope - 90x205mm" 255 581
+#media "EnvChou4Rotated/Chou4 Envelope Rotated - 205x90mm" 581 255
+#media "EnvDL/DL Envelope - 110x220mm" 312 624
+#media "EnvInvite/Invite Envelope - 220x220mm" 624 624
+#media "EnvISOB4/ISOB4 Envelope - 250x353mm" 708 1001
+#media "EnvISOB5/ISOB5 Envelope - 176x250mm" 499 709
+#media "EnvISOB6/ISOB6 Envelope - 176x125mm" 499 354
+#media "EnvItalian/Italian Envelope - 110x230mm" 312 652
+#media "EnvKaku2/Kaku2 Envelope - 240x332mm" 680 941
+#media "EnvKaku2Rotated/Kaku2 Envelope Rotated - 332x240mm" 941 680
+#media "EnvKaku3/Kaku3 Envelope - 216x277mm" 612 785
+#media "EnvKaku3Rotated/Kaku3 Envelope Rotated - 277x216mm" 785 612
+#media "EnvMonarch/Monarch Envelope - 3.875x7.5in" 279 540
+#media "EnvPersonal/Personal Envelope - 3.625x6.5in" 261 468
+#media "EnvPRC10/PRC10 Envelope - 324x458mm" 918 1298
+#media "EnvPRC10Rotated/PRC10 Envelope Rotated - 458x324mm" 1298 918
+#media "EnvPRC1/PRC1 Envelope - 102x165mm" 289 468
+#media "EnvPRC1Rotated/PRC1 Envelope Rotated - 165x102mm" 468 289
+#media "EnvPRC2/PRC2 Envelope - 102x176mm" 289 499
+#media "EnvPRC2Rotated/PRC2 Envelope Rotated - 176x102mm" 499 289
+#media "EnvPRC3/PRC3 Envelope - 125x176mm" 354 499
+#media "EnvPRC3Rotated/PRC3 Envelope Rotated - 176x125mm" 499 354
+#media "EnvPRC4/PRC4 Envelope - 110x208mm" 312 590
+#media "EnvPRC4Rotated/PRC4 Envelope Rotated - 208x110mm" 590 312
+#media "EnvPRC5/PRC5 Envelope - 110x220mm" 312 624
+#media "EnvPRC5Rotated/PRC5 Envelope Rotated - 220x110mm" 624 312
+#media "EnvPRC6/PRC6 Envelope - 120x230mm" 340 652
+#media "EnvPRC6Rotated/PRC6 Envelope Rotated - 230x120mm" 652 340
+#media "EnvPRC7/PRC7 Envelope - 160x230mm" 454 652
+#media "EnvPRC7Rotated/PRC7 Envelope Rotated - 230x160mm" 652 454
+#media "EnvPRC8/PRC8 Envelope - 120x309mm" 340 876
+#media "EnvPRC8Rotated/PRC8 Envelope Rotated - 309x120mm" 876 340
+#media "EnvPRC9/PRC9 Envelope - 229x324mm" 649 918
+#media "EnvPRC9Rotated/PRC9 Envelope Rotated - 324x229mm" 918 649
+#media "EnvYou4/You4 Envelope - 105x235mm" 298 666
+#media "EnvYou4Rotated/You4 Envelope Rotated - 235x105mm" 666 298
+#media "Executive/Executive - 7.25x10.5in" 522 756
+#media "FanFoldGerman/FanFold German - 8.5x12in" 612 864
+#media "FanFoldGermanLegal/FanFold German Legal - 216x330mm" 612 936
+#media "FanFoldUS/Fanfold - 14.875x11in" 1071 792
+#media "Folio/Folio - 210x330mm" 595 935
+#media "ISOB0/ISOB0 - 1000x1414mm" 2835 4008
+#media "ISOB10/ISOB10 - 31x44mm" 88 125
+#media "ISOB1/ISOB1 - 707x1000mm" 2004 2835
+#media "ISOB2/ISOB2 - 500x707mm" 1417 2004
+#media "ISOB3/ISOB3 - 353x500mm" 1001 1417
+#media "ISOB4/ISOB4 - 250x353mm" 709 1001
+#media "ISOB5Extra/ISOB5 Extra - 201x276mm" 570 782
+#media "ISOB5/ISOB5 - 176x250mm" 499 709
+#media "ISOB6/ISOB6 - 125x176mm" 354 499
+#media "ISOB7/ISOB7 - 88x125mm" 249 354
+#media "ISOB8/ISOB8 - 62x88mm" 176 249
+#media "ISOB9/ISOB9 - 44x62mm" 125 176
+#media "Ledger/Ledger - 17x11in" 1224 792
+#media "LegalExtra/Legal Extra - 9.5x15in" 684 1080
+#media "Legal/Legal - 8.5x14in" 612 1008
+#media "LetterExtra/Letter Extra - 9.5x12in" 684 864
+#media "LetterExtra.Transverse/Letter Extra - 12x9.5in" 864 684
+#media "Letter/Letter - 8.5x11in" 612 792
+#media "LetterPlus/Letter Plus - 8.5x12.690in" 612 914
+#media "LetterRotated/Letter Rotated - 11x8.5in" 792 612
+#media "LetterSmall/Letter Small - 8.5x11in" 612 792
+#media "Letter.Transverse/Letter - 11x8.5in" 792 612
+#media "Monarch/Monarch - 3.875x7.5in" 279 540
+#media "Note/Note - 8.5x11in" 612 792
+#media "Postcard/Postcard - 100x148mm" 284 419
+#media "PostcardRotated/PostcardRotated - 148x100mm" 419 284
+#media "PRC16K/PRC16K - 146x215mm" 414 610
+#media "PRC16KRotated/PRC16KRotated - 215x146mm" 610 414
+#media "PRC32KBig/PRC32KBig - 97x151mm" 275 428
+#media "PRC32KBigRotated/PRC32KBigRotated - 151x97mm" 428 275
+#media "PRC32K/PRC32K - 97x151mm" 275 428
+#media "PRC32KRotated/PRC32KRotated - 151x97mm" 428 275
+#media "Quarto/Quarto - 8.5x10.830in" 610 780
+#media "Statement/Statement - 5.5x8.5in" 396 612
+#media "SuperA/SuperA - 227x356mm" 643 1009
+#media "SuperB/SuperB - 305x487mm" 864 1380
+#media "TabloidExtra/Tabloid Extra - 12x18in" 864 1296
+#media "Tabloid/Tabloid - 11x17in" 792 1224
+
+/*
+ * Non-standard sizes...
+ */
+
+#media "Photo4x6/Photo - 4x6in" 288 432
+#media "PhotoLabel/Photo Labels - 4x6.5in" 288 468
+#media "w288h418/Photo - 4x5.8in" 288 418
+#media "w936h1368/Super B/A3 - 13x19in" 936 1368
+#media "w81h252/Address - 1 1/8x3 1/2in" 81 252
+#media "w101h252/Large Address - 1 4/10x3 1/2in" 101 252
+#media "w54h144/Return Address - 3/4x2in" 54 144
+#media "w167h288/Shipping Address - 2 5/16x4in" 167 288
+#media "w162h540/Internet Postage 2-Part - 2 1/4x7 1/2in" 162 540
+#media "w162h504/Internet Postage 3-Part - 2 1/4x7in" 162 504
+#media "w41h248/File Folder - 9/16x3 7/16in" 41 248
+#media "w41h144/Hanging Folder - 9/16x2in" 41 144
+#media "w153h198/3.5\" Disk - 2 1/8x2 3/4in" 153 198
+
+
+/*
+ * End of "$Id: media.defs 343 2007-07-13 19:52:48Z mike $".
+ */
diff --git a/data/pcl.h b/data/pcl.h
new file mode 100644
index 000000000..0cb1effe5
--- /dev/null
+++ b/data/pcl.h
@@ -0,0 +1,38 @@
+/*
+ * "$Id$"
+ *
+ *   This file contains model number definitions for the CUPS unified
+ *   PCL driver.
+ *
+ *   Copyright 2007 by Apple Inc.
+ *   Copyright 1997-2005 by Easy Software Products.
+ *
+ *   These coded instructions, statements, and computer programs are the
+ *   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/".
+ */
+
+/* General PCL Support */
+#define PCL_PAPER_SIZE		0x1		/* Use ESC&l#A */
+#define PCL_INKJET		0x2		/* Use inkjet commands */
+
+/* Raster Support */
+#define PCL_RASTER_END_COLOR	0x100		/* Use ESC*rC */
+#define PCL_RASTER_CID		0x200		/* Use ESC*v#W */
+#define PCL_RASTER_CRD		0x400		/* Use ESC*g#W */
+#define PCL_RASTER_SIMPLE	0x800		/* Use ESC*r#U */
+#define PCL_RASTER_RGB24	0x1000		/* Use 24-bit RGB mode */
+
+/* PJL Support */
+#define PCL_PJL			0x10000		/* Use PJL Commands */
+#define PCL_PJL_PAPERWIDTH	0x20000		/* Use PJL PAPERWIDTH/LENGTH */
+#define PCL_PJL_HPGL2		0x40000		/* Enter HPGL2 */
+#define PCL_PJL_PCL3GUI		0x80000		/* Enter PCL3GUI */
+#define PCL_PJL_RESOLUTION	0x100000	/* Use PJL SET RESOLUTION */
+
+
+/*
+ * End of "$Id$".
+ */
diff --git a/data/raster.defs b/data/raster.defs
new file mode 100644
index 000000000..486165f01
--- /dev/null
+++ b/data/raster.defs
@@ -0,0 +1,94 @@
+/*
+ * "$Id: raster.defs 343 2007-07-13 19:52:48Z mike $"
+ *
+ *   This file contains the standard definitions for enumerated attributes
+ *   in the CUPS raster page device dictionary.
+ *
+ *   Copyright 2007 by Apple Inc.
+ *   Copyright 1997-2005 by Easy Software Products.
+ *
+ *   These coded instructions, statements, and computer programs are the
+ *   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/".
+ */
+
+/* Jog values */
+#define CUPS_JOG_NONE		0	/* Never move pages */
+#define CUPS_JOG_FILE		1	/* Move pages after this file */
+#define CUPS_JOG_JOB		2	/* Move pages after this job */
+#define CUPS_JOG_SET		3	/* Move pages after this set */
+
+/* Orientation values */
+#define CUPS_ORIENT_0		0	/* Don't rotate the page */
+#define CUPS_ORIENT_90		1	/* Rotate the page counter-clockwise */
+#define CUPS_ORIENT_180		2	/* Turn the page upside down */
+#define CUPS_ORIENT_270		3	/* Rotate the page clockwise */
+
+/* CutMedia values */
+#define CUPS_CUT_NONE		0	/* Never cut the roll */
+#define CUPS_CUT_FILE		1	/* Cut the roll after this file */
+#define CUPS_CUT_JOB		2	/* Cut the roll after this job */
+#define CUPS_CUT_SET		3	/* Cut the roll after this set */
+#define CUPS_CUT_PAGE		4	/* Cut the roll after this page */
+
+/* AdvanceMedia values */
+#define CUPS_ADVANCE_NONE	0	/* Never advance the roll */
+#define CUPS_ADVANCE_FILE	1	/* Advance the roll after this file */
+#define CUPS_ADVANCE_JOB	2	/* Advance the roll after this job */
+#define CUPS_ADVANCE_SET	3	/* Advance the roll after this set */
+#define CUPS_ADVANCE_PAGE	4	/* Advance the roll after this page */
+
+/* LeadingEdge values */
+#define CUPS_EDGE_TOP		0	/* Leading edge is the top of the page */
+#define CUPS_EDGE_RIGHT		1	/* Leading edge is the right of the page */
+#define CUPS_EDGE_BOTTOM	2	/* Leading edge is the bottom of the page */
+#define CUPS_EDGE_LEFT		3	/* Leading edge is the left of the page */
+
+/* cupsColorOrder values */
+#define CUPS_ORDER_CHUNKED	0	/* CMYK CMYK CMYK ... */
+#define CUPS_ORDER_BANDED	1	/* CCC MMM YYY KKK ... */
+#define CUPS_ORDER_PLANAR	2	/* CCC ... MMM ... YYY ... KKK ... */
+
+/* cupsColorSpace values */
+#define CUPS_CSPACE_W		0	/* Luminance */
+#define CUPS_CSPACE_RGB		1	/* Red, green, blue */
+#define CUPS_CSPACE_RGBA	2	/* Red, green, blue, alpha */
+#define CUPS_CSPACE_K		3	/* Black */
+#define CUPS_CSPACE_CMY		4	/* Cyan, magenta, yellow */
+#define CUPS_CSPACE_YMC		5	/* Yellow, magenta, cyan */
+#define CUPS_CSPACE_CMYK	6	/* Cyan, magenta, yellow, black */
+#define CUPS_CSPACE_YMCK	7	/* Yellow, magenta, cyan, black */
+#define CUPS_CSPACE_KCMY	8	/* Black, cyan, magenta, yellow */
+#define CUPS_CSPACE_KCMYcm	9	/* Black, cyan, magenta, yellow, *
+				         * light-cyan, light-magenta     */
+#define CUPS_CSPACE_GMCK	10	/* Gold, magenta, yellow, black */
+#define CUPS_CSPACE_GMCS	11	/* Gold, magenta, yellow, silver */
+#define CUPS_CSPACE_WHITE	12	/* White ink (as black) */
+#define CUPS_CSPACE_GOLD	13	/* Gold foil */
+#define CUPS_CSPACE_SILVER	14	/* Silver foil */
+
+#define CUPS_CSPACE_CIEXYZ	15	/* CIE XYZ */
+#define CUPS_CSPACE_CIELab	16	/* CIE Lab */
+
+#define CUPS_CSPACE_ICC1	32	/* ICC-based, 1 color */
+#define CUPS_CSPACE_ICC2	33	/* ICC-based, 2 colors */
+#define CUPS_CSPACE_ICC3	34	/* ICC-based, 3 colors */
+#define CUPS_CSPACE_ICC4	35	/* ICC-based, 4 colors */
+#define CUPS_CSPACE_ICC5	36	/* ICC-based, 5 colors */
+#define CUPS_CSPACE_ICC6	37	/* ICC-based, 6 colors */
+#define CUPS_CSPACE_ICC7	38	/* ICC-based, 7 colors */
+#define CUPS_CSPACE_ICC8	39	/* ICC-based, 8 colors */
+#define CUPS_CSPACE_ICC9	40	/* ICC-based, 9 colors */
+#define CUPS_CSPACE_ICCA	41	/* ICC-based, 10 colors */
+#define CUPS_CSPACE_ICCB	42	/* ICC-based, 11 colors */
+#define CUPS_CSPACE_ICCC	43	/* ICC-based, 12 colors */
+#define CUPS_CSPACE_ICCD	44	/* ICC-based, 13 colors */
+#define CUPS_CSPACE_ICCE	45	/* ICC-based, 14 colors */
+#define CUPS_CSPACE_ICCF	46	/* ICC-based, 15 colors */
+
+
+/*
+ * End of "$Id: raster.defs 343 2007-07-13 19:52:48Z mike $".
+ */