← Back to branch summary

~ubuntu-branches/debian/experimental/hplip/experimental

« back to all changes in this revision

Viewing changes to debian/patches/add-lidil-two-cartridge-modes.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): Mark Purcell
  • Date: 2010-12-23 11:04:31 UTC
  • mfrom: (2.1.158 natty)
  • Revision ID: james.westby@ubuntu.com-20101223110431-ev5wz1it6b7jce51
Tags: 3.10.9-1
New Upstream Release 

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/add-lidil-two-cartridge-modes.dpatch
 
1
#! /bin/sh /usr/share/dpatch/dpatch-run
 
2
## add-lidil-two-cartridge-modes.dpatch by  <till.kamppeter@gmail.com>
 
3
##
 
4
## All lines beginning with `## DP:' are a description of the patch.
 
5
## DP: No description.
 
6
 
 
7
@DPATCH@
 
8
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' hplip-3.10.6~/prnt/drv/hpcups.drv.in hplip-3.10.6/prnt/drv/hpcups.drv.in
 
9
--- hplip-3.10.6~/prnt/drv/hpcups.drv.in        2010-09-14 16:08:45.926316041 +0200
 
10
+++ hplip-3.10.6/prnt/drv/hpcups.drv.in 2010-09-14 16:08:46.496315327 +0200
 
11
@@ -4778,51 +4778,95 @@
 
12
 
 
13
   // cupsCompression values map to QUALITY_MODE from global_types.h
 
14
   Option "OutputMode/Print Quality" PickOne AnySetup 10.0
 
15
-    *Choice "NormalRGB/Normal Color" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 1/OutputType(0)/cupsString0(PlainNormalColor)/HWResolution[600 600]>>setpagedevice"
 
16
+    *Choice "NormalRGB/Normal Color" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(0)/cupsString0(PlainNormalKColor)/HWResolution[600 600]>>setpagedevice"
 
17
+    Choice "NormalRGBC/Normal Color (Only Color Cartridge)" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 1/OutputType(0)/cupsString0(PlainNormalColor)/HWResolution[600 600]>>setpagedevice"
 
18
+    Choice "NormalRGBP/Normal Color (With Photo Cartridge)" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(0)/cupsString0(PlainNormalPhotoColor)/HWResolution[600 600]>>setpagedevice"
 
19
     Choice "NormalGray/Normal Grayscale" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 2/OutputType(0)/cupsString0(PlainNormalGrayK)/HWResolution[600 600]>>setpagedevice"
 
20
-    Choice "DraftRGB/Draft Color" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(-1)/cupsString0(PlainDraftColor)/HWResolution[600 600]>>setpagedevice"
 
21
+    Choice "NormalGrayP/Normal Grayscale (With Photo Cartridge)" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(0)/cupsString0(PlainNormalPhotoGrayK)/HWResolution[600 600]>>setpagedevice"
 
22
+    Choice "DraftRGB/Draft Color" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(-1)/cupsString0(PlainDraftKColor)/HWResolution[600 600]>>setpagedevice"
 
23
+    Choice "DraftRGBC/Draft Color (Only Color Cartridge)" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 1/OutputType(-1)/cupsString0(PlainDraftColor)/HWResolution[600 600]>>setpagedevice"
 
24
+    Choice "DraftRGBP/Draft Color (With Photo Cartridge)" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(-1)/cupsString0(PlainDraftPhotoColor)/HWResolution[600 600]>>setpagedevice"
 
25
     Choice "DraftGray/Draft Grayscale" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 2/OutputType(-1)/cupsString0(PlainDraftGrayK)/HWResolution[600 600]>>setpagedevice"
 
26
-    Choice "Photo/High-Resolution Photo" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(2)/cupsString0(PhotoBestPhotoColor)/HWResolution[600 600]>>setpagedevice"
 
27
+    Choice "Photo/High-Resolution Photo" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(2)/cupsString0(PhotoBest)/HWResolution[600 600]>>setpagedevice"
 
28
+    Choice "PhotoP/High-Resolution Photo (With Photo Cartridge)" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(2)/cupsString0(PhotoBestPhotoColor)/HWResolution[600 600]>>setpagedevice"
 
29
 
 
30
   // Constraints
 
31
   UIConstraints "*MediaType Glossy *OutputMode DraftRGB"
 
32
+  UIConstraints "*MediaType Glossy *OutputMode DraftRGBC"
 
33
+  UIConstraints "*MediaType Glossy *OutputMode DraftRGBP"
 
34
   UIConstraints "*MediaType Glossy *OutputMode DraftGray"
 
35
   UIConstraints "*MediaType TransparencyFilm *OutputMode DraftRGB"
 
36
+  UIConstraints "*MediaType TransparencyFilm *OutputMode DraftRGBC"
 
37
+  UIConstraints "*MediaType TransparencyFilm *OutputMode DraftRGBP"
 
38
   UIConstraints "*MediaType TransparencyFilm *OutputMode DraftGray"
 
39
   UIConstraints "*MediaType Plain *OutputMode Photo"
 
40
+  UIConstraints "*MediaType Plain *OutputMode PhotoP"
 
41
   UIConstraints "*MediaType TransparencyFilm *OutputMode Photo"
 
42
+  UIConstraints "*MediaType TransparencyFilm *OutputMode PhotoP"
 
43
 
 
44
   UIConstraints "*PageSize L.FB *OutputMode DraftRGB"
 
45
+  UIConstraints "*PageSize L.FB *OutputMode DraftRGBC"
 
46
+  UIConstraints "*PageSize L.FB *OutputMode DraftRGBP"
 
47
   UIConstraints "*PageSize L.FB *OutputMode DraftGray"
 
48
   UIConstraints "*PageSize PhotoL.FB *OutputMode DraftRGB"
 
49
+  UIConstraints "*PageSize PhotoL.FB *OutputMode DraftRGBC"
 
50
+  UIConstraints "*PageSize PhotoL.FB *OutputMode DraftRGBP"
 
51
   UIConstraints "*PageSize PhotoL.FB *OutputMode DraftGray"
 
52
+  UIConstraints "*PageSize Hagaki.FB *OutputMode DraftRGBC"
 
53
+  UIConstraints "*PageSize Hagaki.FB *OutputMode DraftRGBP"
 
54
   UIConstraints "*PageSize Hagaki.FB *OutputMode DraftRGB"
 
55
   UIConstraints "*PageSize Hagaki.FB *OutputMode DraftGray"
 
56
   UIConstraints "*PageSize Photo4x6.FB *OutputMode DraftRGB"
 
57
+  UIConstraints "*PageSize Photo4x6.FB *OutputMode DraftRGBC"
 
58
+  UIConstraints "*PageSize Photo4x6.FB *OutputMode DraftRGBP"
 
59
   UIConstraints "*PageSize Photo4x6.FB *OutputMode DraftGray"
 
60
   UIConstraints "*PageSize A6.FB *OutputMode DraftRGB"
 
61
+  UIConstraints "*PageSize A6.FB *OutputMode DraftRGBC"
 
62
+  UIConstraints "*PageSize A6.FB *OutputMode DraftRGBP"
 
63
   UIConstraints "*PageSize A6.FB *OutputMode DraftGray"
 
64
   UIConstraints "*PageSize Cabinet.FB *OutputMode DraftRGB"
 
65
+  UIConstraints "*PageSize Cabinet.FB *OutputMode DraftRGBC"
 
66
+  UIConstraints "*PageSize Cabinet.FB *OutputMode DraftRGBP"
 
67
   UIConstraints "*PageSize Cabinet.FB *OutputMode DraftGray"
 
68
   UIConstraints "*PageSize Photo5x7.FB *OutputMode DraftRGB"
 
69
+  UIConstraints "*PageSize Photo5x7.FB *OutputMode DraftRGBC"
 
70
+  UIConstraints "*PageSize Photo5x7.FB *OutputMode DraftRGBP"
 
71
   UIConstraints "*PageSize Photo5x7.FB *OutputMode DraftGray"
 
72
   UIConstraints "*PageSize 2L.FB *OutputMode DraftRGB"
 
73
+  UIConstraints "*PageSize 2L.FB *OutputMode DraftRGBC"
 
74
+  UIConstraints "*PageSize 2L.FB *OutputMode DraftRGBP"
 
75
   UIConstraints "*PageSize 2L.FB *OutputMode DraftGray"
 
76
   UIConstraints "*PageSize A5.FB *OutputMode DraftRGB"
 
77
+  UIConstraints "*PageSize A5.FB *OutputMode DraftRGBC"
 
78
+  UIConstraints "*PageSize A5.FB *OutputMode DraftRGBP"
 
79
   UIConstraints "*PageSize A5.FB *OutputMode DraftGray"
 
80
   UIConstraints "*PageSize 8x10.FB *OutputMode DraftRGB"
 
81
+  UIConstraints "*PageSize 8x10.FB *OutputMode DraftRGBC"
 
82
+  UIConstraints "*PageSize 8x10.FB *OutputMode DraftRGBP"
 
83
   UIConstraints "*PageSize 8x10.FB *OutputMode DraftGray"
 
84
   UIConstraints "*PageSize Letter.FB *OutputMode DraftRGB"
 
85
+  UIConstraints "*PageSize Letter.FB *OutputMode DraftRGBC"
 
86
+  UIConstraints "*PageSize Letter.FB *OutputMode DraftRGBP"
 
87
   UIConstraints "*PageSize Letter.FB *OutputMode DraftGray"
 
88
   UIConstraints "*PageSize A4.FB *OutputMode DraftRGB"
 
89
+  UIConstraints "*PageSize A4.FB *OutputMode DraftRGBC"
 
90
+  UIConstraints "*PageSize A4.FB *OutputMode DraftRGBP"
 
91
   UIConstraints "*PageSize A4.FB *OutputMode DraftGray"
 
92
   UIConstraints "*PageSize B5.FB *OutputMode DraftRGB"
 
93
+  UIConstraints "*PageSize B5.FB *OutputMode DraftRGBC"
 
94
+  UIConstraints "*PageSize B5.FB *OutputMode DraftRGBP"
 
95
   UIConstraints "*PageSize B5.FB *OutputMode DraftGray"
 
96
   UIConstraints "*PageSize JB5.FB *OutputMode DraftRGB"
 
97
+  UIConstraints "*PageSize JB5.FB *OutputMode DraftRGBC"
 
98
+  UIConstraints "*PageSize JB5.FB *OutputMode DraftRGBP"
 
99
   UIConstraints "*PageSize JB5.FB *OutputMode DraftGray"
 
100
   UIConstraints "*PageSize HV.FB *OutputMode DraftRGB"
 
101
+  UIConstraints "*PageSize HV.FB *OutputMode DraftRGBC"
 
102
+  UIConstraints "*PageSize HV.FB *OutputMode DraftRGBP"
 
103
   UIConstraints "*PageSize HV.FB *OutputMode DraftGray"
 
104
   UIConstraints "*PageSize Mutsugiri.FB *OutputMode DraftRGB"
 
105
+  UIConstraints "*PageSize Mutsugiri.FB *OutputMode DraftRGBC"
 
106
+  UIConstraints "*PageSize Mutsugiri.FB *OutputMode DraftRGBP"
 
107
   UIConstraints "*PageSize Mutsugiri.FB *OutputMode DraftGray"
 
108
 
 
109
 // 4x6 or smaller
 
110
@@ -4988,21 +5032,35 @@
 
111
 
 
112
   // cupsCompression values map to QUALITY_MODE from global_types.h
 
113
   Option "OutputMode/Print Quality" PickOne AnySetup 10.0
 
114
-    *Choice "NormalRGB/Normal Color" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 1/OutputType(0)/cupsString0(PlainNormalColor)/HWResolution[600 600]>>setpagedevice"
 
115
+    *Choice "NormalRGB/Normal Color" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(0)/cupsString0(PlainNormalKColor)/HWResolution[600 600]>>setpagedevice"
 
116
+    Choice "NormalRGBC/Normal Color (Only Color Cartridge)" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 1/OutputType(0)/cupsString0(PlainNormalColor)/HWResolution[600 600]>>setpagedevice"
 
117
+    Choice "NormalRGBP/Normal Color (With Photo Cartridge)" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(0)/cupsString0(PlainNormalPhotoColor)/HWResolution[600 600]>>setpagedevice"
 
118
     Choice "NormalGray/Normal Grayscale" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 2/OutputType(0)/cupsString0(PlainNormalGrayK)/HWResolution[600 600]>>setpagedevice"
 
119
-    Choice "DraftRGB/Draft Color" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(-1)/cupsString0(PlainDraftColor)/HWResolution[600 600]>>setpagedevice"
 
120
+    Choice "NormalGrayP/Normal Grayscale (With Photo Cartridge)" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(0)/cupsString0(PlainNormalPhotoGrayK)/HWResolution[600 600]>>setpagedevice"
 
121
+    Choice "DraftRGB/Draft Color" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(-1)/cupsString0(PlainDraftKColor)/HWResolution[600 600]>>setpagedevice"
 
122
+    Choice "DraftRGBC/Draft Color (Only Color Cartridge)" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 1/OutputType(-1)/cupsString0(PlainDraftColor)/HWResolution[600 600]>>setpagedevice"
 
123
+    Choice "DraftRGBP/Draft Color (With Photo Cartridge)" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(-1)/cupsString0(PlainDraftPhotoColor)/HWResolution[600 600]>>setpagedevice"
 
124
     Choice "DraftGray/Draft Grayscale" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 2/OutputType(-1)/cupsString0(PlainDraftGrayK)/HWResolution[600 600]>>setpagedevice"
 
125
-    Choice "Photo/High-Resolution Photo" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(2)/cupsString0(PhotoBestPhotoColor)/HWResolution[600 600]>>setpagedevice"
 
126
+    Choice "Photo/High-Resolution Photo" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(2)/cupsString0(PhotoBest)/HWResolution[600 600]>>setpagedevice"
 
127
+    Choice "PhotoP/High-Resolution Photo (With Photo Cartridge)" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(2)/cupsString0(PhotoBestPhotoColor)/HWResolution[600 600]>>setpagedevice"
 
128
 
 
129
   // Constraints
 
130
   UIConstraints "*MediaType Glossy *OutputMode DraftRGB"
 
131
+  UIConstraints "*MediaType Glossy *OutputMode DraftRGBC"
 
132
+  UIConstraints "*MediaType Glossy *OutputMode DraftRGBP"
 
133
   UIConstraints "*MediaType Glossy *OutputMode DraftGray"
 
134
   UIConstraints "*MediaType TransparencyFilm *OutputMode DraftRGB"
 
135
+  UIConstraints "*MediaType TransparencyFilm *OutputMode DraftRGBC"
 
136
+  UIConstraints "*MediaType TransparencyFilm *OutputMode DraftRGBP"
 
137
   UIConstraints "*MediaType TransparencyFilm *OutputMode DraftGray"
 
138
   UIConstraints "*MediaType Plain *OutputMode Photo"
 
139
+  UIConstraints "*MediaType Plain *OutputMode PhotoP"
 
140
   UIConstraints "*MediaType TransparencyFilm *OutputMode Photo"
 
141
+  UIConstraints "*MediaType TransparencyFilm *OutputMode PhotoP"
 
142
 
 
143
   UIConstraints "*PageSize Photo4x6tab.FB *OutputMode DraftRGB"
 
144
+  UIConstraints "*PageSize Photo4x6tab.FB *OutputMode DraftRGBC"
 
145
+  UIConstraints "*PageSize Photo4x6tab.FB *OutputMode DraftRGBP"
 
146
   UIConstraints "*PageSize Photo4x6tab.FB *OutputMode DraftGray"
 
147
 
 
148
 // 4x6 or smaller
 
149
@@ -7480,11 +7538,17 @@
 
150
 
 
151
   // cupsCompression values map to QUALITY_MODE from global_types.h
 
152
   Option "OutputMode/Print Quality" PickOne AnySetup 10.0
 
153
-    *Choice "NormalRGB/Normal Color" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 1/OutputType(0)/cupsString0(PlainNormalColor)/HWResolution[600 600]>>setpagedevice"
 
154
+    *Choice "NormalRGB/Normal Color" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(0)/cupsString0(PlainNormalKColor)/HWResolution[600 600]>>setpagedevice"
 
155
+    Choice "NormalRGBC/Normal Color (Only Color Cartridge)" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 1/OutputType(0)/cupsString0(PlainNormalColor)/HWResolution[600 600]>>setpagedevice"
 
156
+    Choice "NormalRGBP/Normal Color (With Photo Cartridge)" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(0)/cupsString0(PlainNormalColorPhoto)/HWResolution[600 600]>>setpagedevice"
 
157
     Choice "NormalGray/Normal Grayscale" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 2/OutputType(0)/cupsString0(PlainNormalGrayK)/HWResolution[600 600]>>setpagedevice"
 
158
-    Choice "DraftRGB/Draft Color" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(-1)/cupsString0(PlainDraftColor)/HWResolution[300 300]>>setpagedevice"
 
159
+    Choice "NormalGrayP/Normal Grayscale (With Photo Cartridge)" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(0)/cupsString0(PlainGrayPhotoColor)/HWResolution[600 600]>>setpagedevice"
 
160
+    Choice "DraftRGB/Draft Color" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(-1)/cupsString0(PlainDraftKColor)/HWResolution[300 300]>>setpagedevice"
 
161
+    Choice "DraftRGBC/Draft Color (Only Color Cartridge)" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 1/OutputType(-1)/cupsString0(PlainDraftColor)/HWResolution[300 300]>>setpagedevice"
 
162
+    Choice "DraftRGBP/Draft Color (With Photo Cartridge)" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(-1)/cupsString0(PlainDraftColorPhoto)/HWResolution[300 300]>>setpagedevice"
 
163
     Choice "DraftGray/Draft Grayscale" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 2/OutputType(-1)/cupsString0(PlainDraftGrayK)/HWResolution[300 300]>>setpagedevice"
 
164
-    Choice "Photo/High-Resolution Photo" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(2)/cupsString0(PhotoBestPhotoColor)/HWResolution[600 600]>>setpagedevice"
 
165
+    Choice "Photo/High-Resolution Photo" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(2)/cupsString0(PhotoBest)/HWResolution[600 600]>>setpagedevice"
 
166
+    Choice "PhotoP/High-Resolution Photo (With Photo Cartridge)" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(2)/cupsString0(PhotoBestPhotoColor)/HWResolution[600 600]>>setpagedevice"
 
167
 
 
168
   // Duplexer is optional...
 
169
   Installable "OptionDuplex/Duplexer Installed"
 
170
@@ -7492,8 +7556,11 @@
 
171
   // Constraints
 
172
   UIConstraints "*Duplex *OptionDuplex False"
 
173
   UIConstraints "*MediaType Glossy *OutputMode DraftRGB"
 
174
+  UIConstraints "*MediaType Glossy *OutputMode DraftRGBC"
 
175
+  UIConstraints "*MediaType Glossy *OutputMode DraftRGBP"
 
176
   UIConstraints "*MediaType Glossy *OutputMode DraftGray"
 
177
   UIConstraints "*MediaType Plain *OutputMode Photo"
 
178
+  UIConstraints "*MediaType Plain *OutputMode PhotoP"
 
179
 
 
180
   Attribute "cupsModelName" "" "deskjet 3320"     // APDK device class 
 
181
 
 
182
@@ -7891,11 +7958,17 @@
 
183
 
 
184
   // cupsCompression values map to QUALITY_MODE from global_types.h
 
185
   Option "OutputMode/Print Quality" PickOne AnySetup 10.0
 
186
-    *Choice "NormalRGB/Normal Color" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 1/OutputType(0)/cupsString0(PlainNormalColor)/HWResolution[600 600]>>setpagedevice"
 
187
+    *Choice "NormalRGB/Normal Color" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(0)/cupsString0(PlainNormalKColor)/HWResolution[600 600]>>setpagedevice"
 
188
+    Choice "NormalRGBC/Normal Color (Only Color Cartridge)" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 1/OutputType(0)/cupsString0(PlainNormalColor)/HWResolution[600 600]>>setpagedevice"
 
189
+    Choice "NormalRGBP/Normal Color (With Photo Cartridge)" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(0)/cupsString0(PlainNormalColorPhoto)/HWResolution[600 600]>>setpagedevice"
 
190
     Choice "NormalGray/Normal Grayscale" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 2/OutputType(0)/cupsString0(PlainNormalGrayK)/HWResolution[600 600]>>setpagedevice"
 
191
-    Choice "DraftRGB/Draft Color" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(-1)/cupsString0(PlainDraftColor)/HWResolution[300 300]>>setpagedevice"
 
192
+    Choice "NormalGrayP/Normal Grayscale (With Photo Cartridge)" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(0)/cupsString0(PlainGrayPhotoColor)/HWResolution[600 600]>>setpagedevice"
 
193
+    Choice "DraftRGB/Draft Color" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(-1)/cupsString0(PlainDraftKColor)/HWResolution[300 300]>>setpagedevice"
 
194
+    Choice "DraftRGBC/Draft Color (Only Color Cartridge)" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 1/OutputType(-1)/cupsString0(PlainDraftColor)/HWResolution[300 300]>>setpagedevice"
 
195
+    Choice "DraftRGBP/Draft Color (With Photo Cartridge)" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(-1)/cupsString0(PlainDraftColorPhoto)/HWResolution[300 300]>>setpagedevice"
 
196
     Choice "DraftGray/Draft Grayscale" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 2/OutputType(-1)/cupsString0(PlainDraftGrayK)/HWResolution[300 300]>>setpagedevice"
 
197
-    Choice "Photo/High-Resolution Photo" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(2)/cupsString0(PhotoBestPhotoColor)/HWResolution[600 600]>>setpagedevice"
 
198
+    Choice "Photo/High-Resolution Photo" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(2)/cupsString0(PhotoBest)/HWResolution[600 600]>>setpagedevice"
 
199
+    Choice "PhotoP/High-Resolution Photo (With Photo Cartridge)" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(2)/cupsString0(PhotoBestPhotoColor)/HWResolution[600 600]>>setpagedevice"
 
200
 
 
201
   // Duplexer is optional...
 
202
   Installable "OptionDuplex/Duplexer Installed"
 
203
@@ -7903,8 +7976,11 @@
 
204
   // Constraints
 
205
   UIConstraints "*Duplex *OptionDuplex False"
 
206
   UIConstraints "*MediaType Glossy *OutputMode DraftRGB"
 
207
+  UIConstraints "*MediaType Glossy *OutputMode DraftRGBC"
 
208
+  UIConstraints "*MediaType Glossy *OutputMode DraftRGBP"
 
209
   UIConstraints "*MediaType Glossy *OutputMode DraftGray"
 
210
   UIConstraints "*MediaType Plain *OutputMode Photo"
 
211
+  UIConstraints "*MediaType Plain *OutputMode PhotoP"
 
212
 
 
213
   Attribute "cupsModelName" "" "deskjet 3600"     // APDK device class 
 
214
 
 
215
@@ -8286,11 +8362,17 @@
 
216
 
 
217
   // cupsCompression values map to QUALITY_MODE from global_types.h
 
218
   Option "OutputMode/Print Quality" PickOne AnySetup 10.0
 
219
-    *Choice "NormalRGB/Normal Color" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 1/OutputType(0)/cupsString0(PlainNormalColor)/HWResolution[600 600]>>setpagedevice"
 
220
+    *Choice "NormalRGB/Normal Color" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(0)/cupsString0(PlainNormalKColor)/HWResolution[600 600]>>setpagedevice"
 
221
+    Choice "NormalRGBC/Normal Color (Only Color Cartridge)" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 1/OutputType(0)/cupsString0(PlainNormalColor)/HWResolution[600 600]>>setpagedevice"
 
222
+    Choice "NormalRGBP/Normal Color (With Photo Cartridge)" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(0)/cupsString0(PlainNormalPhotoColor)/HWResolution[600 600]>>setpagedevice"
 
223
     Choice "NormalGray/Normal Grayscale" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 2/OutputType(0)/cupsString0(PlainNormalGrayK)/HWResolution[600 600]>>setpagedevice"
 
224
-    Choice "DraftRGB/Draft Color" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(-1)/cupsString0(PlainDraftColor)/HWResolution[600 600]>>setpagedevice"
 
225
+    Choice "NormalGrayP/Normal Grayscale (With Photo Cartridge)" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(0)/cupsString0(PlainNormalPhotoGrayK)/HWResolution[600 600]>>setpagedevice"
 
226
+    Choice "DraftRGB/Draft Color" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(-1)/cupsString0(PlainDraftKColor)/HWResolution[600 600]>>setpagedevice"
 
227
+    Choice "DraftRGBC/Draft Color (Only Color Cartridge)" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 1/OutputType(-1)/cupsString0(PlainDraftColor)/HWResolution[600 600]>>setpagedevice"
 
228
+    Choice "DraftRGBP/Draft Color (With Photo Cartridge)" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(-1)/cupsString0(PlainDraftPhotoColor)/HWResolution[600 600]>>setpagedevice"
 
229
     Choice "DraftGray/Draft Grayscale" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 2/OutputType(-1)/cupsString0(PlainDraftGrayK)/HWResolution[600 600]>>setpagedevice"
 
230
-    Choice "Photo/High-Resolution Photo" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(2)/cupsString0(PhotoBestPhotoColor)/HWResolution[600 600]>>setpagedevice"
 
231
+    Choice "Photo/High-Resolution Photo" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(2)/cupsString0(PhotoBest)/HWResolution[600 600]>>setpagedevice"
 
232
+    Choice "PhotoP/High-Resolution Photo (With Photo Cartridge)" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(2)/cupsString0(PhotoBestPhotoColor)/HWResolution[600 600]>>setpagedevice"
 
233
 
 
234
   // Duplexer is optional...
 
235
   Installable "OptionDuplex/Duplexer Installed"
 
236
@@ -8298,8 +8380,11 @@
 
237
   // Constraints
 
238
   UIConstraints "*Duplex *OptionDuplex False"
 
239
   UIConstraints "*MediaType Glossy *OutputMode DraftRGB"
 
240
+  UIConstraints "*MediaType Glossy *OutputMode DraftRGBC"
 
241
+  UIConstraints "*MediaType Glossy *OutputMode DraftRGBP"
 
242
   UIConstraints "*MediaType Glossy *OutputMode DraftGray"
 
243
   UIConstraints "*MediaType Plain *OutputMode Photo"
 
244
+  UIConstraints "*MediaType Plain *OutputMode PhotoP"
 
245
 
 
246
   {
 
247
 // 4x6 or smaller
 
248
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' hplip-3.10.6~/prnt/drv/hpijs.drv.in hplip-3.10.6/prnt/drv/hpijs.drv.in
 
249
--- hplip-3.10.6~/prnt/drv/hpijs.drv.in 2010-09-14 16:08:45.936316029 +0200
 
250
+++ hplip-3.10.6/prnt/drv/hpijs.drv.in  2010-09-14 16:08:46.506315314 +0200
 
251
@@ -4411,16 +4411,16 @@
 
252
 r=&quot;HEWLETT-PACKARD&quot; -sDeviceModel=&quot;deskjet 3320&quot;"
 
253
   Attribute "FoomaticRIPOption" "PrintoutMode" "enum Composite B"
 
254
   Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Draft" "Quality=300DraftColorCM&&
 
255
-Y"
 
256
+YK"
 
257
   Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Draft.Gray" "Quality=300DraftGr&&
 
258
 ayscaleK"
 
259
-  Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal" "Quality=300ColorCMY"
 
260
+  Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal" "Quality=300ColorCMYK"
 
261
   Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal.Gray" "Quality=300Graysc&&
 
262
 aleK"
 
263
-  Attribute "FoomaticRIPOptionSetting" "PrintoutMode=High" "Quality=600ColorCMY"
 
264
+  Attribute "FoomaticRIPOptionSetting" "PrintoutMode=High" "Quality=600ColorCMYK"
 
265
   Attribute "FoomaticRIPOptionSetting" "PrintoutMode=High.Gray" "Quality=600Grayscal&&
 
266
 eK"
 
267
-  Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Photo" "Quality=600PhotoCMY"
 
268
+  Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Photo" "Quality=600PhotoCMYK"
 
269
   Attribute "FoomaticRIPOption" "PageSize" "enum CmdLine A"
 
270
   Attribute "FoomaticRIPOptionSetting" "PageSize=Letter" " -dDEVICEWIDTHPOINTS=612 -&&
 
271
 dDEVICEHEIGHTPOINTS=792"
 
272
@@ -4879,13 +4879,13 @@
 
273
 r=&quot;HEWLETT-PACKARD&quot; -sDeviceModel=&quot;deskjet 3600&quot;"
 
274
   Attribute "FoomaticRIPOption" "PrintoutMode" "enum Composite B"
 
275
   Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Draft" "Quality=300DraftColorCM&&
 
276
-Y"
 
277
+YK"
 
278
   Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Draft.Gray" "Quality=300DraftGr&&
 
279
 ayscaleK"
 
280
-  Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal" "Quality=300ColorCMY"
 
281
+  Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal" "Quality=300ColorCMYK"
 
282
   Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal.Gray" "Quality=300Graysc&&
 
283
 aleK"
 
284
-  Attribute "FoomaticRIPOptionSetting" "PrintoutMode=High" "Quality=600ColorCMY"
 
285
+  Attribute "FoomaticRIPOptionSetting" "PrintoutMode=High" "Quality=600ColorCMYK"
 
286
   Attribute "FoomaticRIPOptionSetting" "PrintoutMode=High.Gray" "Quality=600Grayscal&&
 
287
 eK"
 
288
   Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Photo" "Quality=600PhotoCMYKFul&&
 
289
@@ -5347,13 +5347,13 @@
 
290
 "
 
291
   Attribute "FoomaticRIPOption" "PrintoutMode" "enum Composite B"
 
292
   Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Draft" "Quality=600DraftColorCM&&
 
293
-Y"
 
294
+YK"
 
295
   Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Draft.Gray" "Quality=600DraftGr&&
 
296
 ayscaleK"
 
297
-  Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal" "Quality=600ColorCMY"
 
298
+  Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal" "Quality=600ColorCMYK"
 
299
   Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal.Gray" "Quality=600Graysc&&
 
300
 aleK"
 
301
-  Attribute "FoomaticRIPOptionSetting" "PrintoutMode=High" "Quality=600ColorCMY"
 
302
+  Attribute "FoomaticRIPOptionSetting" "PrintoutMode=High" "Quality=600ColorCMYK"
 
303
   Attribute "FoomaticRIPOptionSetting" "PrintoutMode=High.Gray" "Quality=600Grayscal&&
 
304
 eK"
 
305
   Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Photo" "Quality=600PhotoCMYKFul&&
 
306
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' hplip-3.10.6~/prnt/drv/hpijs.drv.in.template hplip-3.10.6/prnt/drv/hpijs.drv.in.template
 
307
--- hplip-3.10.6~/prnt/drv/hpijs.drv.in.template        2010-07-19 04:15:11.000000000 +0200
 
308
+++ hplip-3.10.6/prnt/drv/hpijs.drv.in.template 2010-09-14 16:08:57.346301718 +0200
 
309
@@ -2221,16 +2221,16 @@
 
310
 r=&quot;HEWLETT-PACKARD&quot; -sDeviceModel=&quot;deskjet 3320&quot;"
 
311
   Attribute "FoomaticRIPOption" "PrintoutMode" "enum Composite B"
 
312
   Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Draft" "Quality=300DraftColorCM&&
 
313
-Y"
 
314
+YK"
 
315
   Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Draft.Gray" "Quality=300DraftGr&&
 
316
 ayscaleK"
 
317
-  Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal" "Quality=300ColorCMY"
 
318
+  Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal" "Quality=300ColorCMYK"
 
319
   Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal.Gray" "Quality=300Graysc&&
 
320
 aleK"
 
321
-  Attribute "FoomaticRIPOptionSetting" "PrintoutMode=High" "Quality=600ColorCMY"
 
322
+  Attribute "FoomaticRIPOptionSetting" "PrintoutMode=High" "Quality=600ColorCMYK"
 
323
   Attribute "FoomaticRIPOptionSetting" "PrintoutMode=High.Gray" "Quality=600Grayscal&&
 
324
 eK"
 
325
-  Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Photo" "Quality=600PhotoCMY"
 
326
+  Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Photo" "Quality=600PhotoCMYK"
 
327
   Attribute "FoomaticRIPOption" "PageSize" "enum CmdLine A"
 
328
   Attribute "FoomaticRIPOptionSetting" "PageSize=Letter" " -dDEVICEWIDTHPOINTS=612 -&&
 
329
 dDEVICEHEIGHTPOINTS=792"
 
330
@@ -2403,13 +2403,13 @@
 
331
 r=&quot;HEWLETT-PACKARD&quot; -sDeviceModel=&quot;deskjet 3600&quot;"
 
332
   Attribute "FoomaticRIPOption" "PrintoutMode" "enum Composite B"
 
333
   Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Draft" "Quality=300DraftColorCM&&
 
334
-Y"
 
335
+YK"
 
336
   Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Draft.Gray" "Quality=300DraftGr&&
 
337
 ayscaleK"
 
338
-  Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal" "Quality=300ColorCMY"
 
339
+  Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal" "Quality=300ColorCMYK"
 
340
   Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal.Gray" "Quality=300Graysc&&
 
341
 aleK"
 
342
-  Attribute "FoomaticRIPOptionSetting" "PrintoutMode=High" "Quality=600ColorCMY"
 
343
+  Attribute "FoomaticRIPOptionSetting" "PrintoutMode=High" "Quality=600ColorCMYK"
 
344
   Attribute "FoomaticRIPOptionSetting" "PrintoutMode=High.Gray" "Quality=600Grayscal&&
 
345
 eK"
 
346
   Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Photo" "Quality=600PhotoCMYKFul&&
 
347
@@ -2599,13 +2599,13 @@
 
348
 "
 
349
   Attribute "FoomaticRIPOption" "PrintoutMode" "enum Composite B"
 
350
   Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Draft" "Quality=600DraftColorCM&&
 
351
-Y"
 
352
+YK"
 
353
   Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Draft.Gray" "Quality=600DraftGr&&
 
354
 ayscaleK"
 
355
-  Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal" "Quality=600ColorCMY"
 
356
+  Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal" "Quality=600ColorCMYK"
 
357
   Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal.Gray" "Quality=600Graysc&&
 
358
 aleK"
 
359
-  Attribute "FoomaticRIPOptionSetting" "PrintoutMode=High" "Quality=600ColorCMY"
 
360
+  Attribute "FoomaticRIPOptionSetting" "PrintoutMode=High" "Quality=600ColorCMYK"
 
361
   Attribute "FoomaticRIPOptionSetting" "PrintoutMode=High.Gray" "Quality=600Grayscal&&
 
362
 eK"
 
363
   Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Photo" "Quality=600PhotoCMYKFul&&