From 833ee538ec60d347cf8a4dfcbdce6680205160d4 Mon Sep 17 00:00:00 2001 From: Till Kamppeter Date: Fri, 22 Jul 2016 09:32:58 +0200 Subject: For the Lidil printers, enable two-cartridge modes (black and color cartridge) in the hpcups driver and assign the choices of the "Printout Mode" option to two-cartridge modes in the hpijs driver LP: #235399 Patch-Name: add-lidil-two-cartridge-modes.patch --- prnt/drv/hpijs.drv.in | 20 ++++++++++---------- prnt/drv/hpijs.drv.in.template | 20 ++++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/prnt/drv/hpijs.drv.in b/prnt/drv/hpijs.drv.in index f8f9977bc..70b760ba2 100644 --- a/prnt/drv/hpijs.drv.in +++ b/prnt/drv/hpijs.drv.in @@ -4356,16 +4356,16 @@ le=- -" r="HEWLETT-PACKARD" -sDeviceModel="deskjet 3320"" Attribute "FoomaticRIPOption" "PrintoutMode" "enum Composite B" Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Draft" "Quality=300DraftColorCM&& -Y" +YK" Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Draft.Gray" "Quality=300DraftGr&& ayscaleK" - Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal" "Quality=300ColorCMY" + Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal" "Quality=300ColorCMYK" Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal.Gray" "Quality=300Graysc&& aleK" - Attribute "FoomaticRIPOptionSetting" "PrintoutMode=High" "Quality=600ColorCMY" + Attribute "FoomaticRIPOptionSetting" "PrintoutMode=High" "Quality=600ColorCMYK" Attribute "FoomaticRIPOptionSetting" "PrintoutMode=High.Gray" "Quality=600Grayscal&& eK" - Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Photo" "Quality=600PhotoCMY" + Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Photo" "Quality=600PhotoCMYK" Attribute "FoomaticRIPOption" "PageSize" "enum CmdLine A" Attribute "FoomaticRIPOptionSetting" "PageSize=Letter" " -dDEVICEWIDTHPOINTS=612 -&& dDEVICEHEIGHTPOINTS=792" @@ -4824,13 +4824,13 @@ le=- -" r="HEWLETT-PACKARD" -sDeviceModel="deskjet 3600"" Attribute "FoomaticRIPOption" "PrintoutMode" "enum Composite B" Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Draft" "Quality=300DraftColorCM&& -Y" +YK" Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Draft.Gray" "Quality=300DraftGr&& ayscaleK" - Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal" "Quality=300ColorCMY" + Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal" "Quality=300ColorCMYK" Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal.Gray" "Quality=300Graysc&& aleK" - Attribute "FoomaticRIPOptionSetting" "PrintoutMode=High" "Quality=600ColorCMY" + Attribute "FoomaticRIPOptionSetting" "PrintoutMode=High" "Quality=600ColorCMYK" Attribute "FoomaticRIPOptionSetting" "PrintoutMode=High.Gray" "Quality=600Grayscal&& eK" Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Photo" "Quality=600PhotoCMYKFul&& @@ -5292,13 +5292,13 @@ er="HEWLETT-PACKARD" -sDeviceModel="Deskjet D4100"&& " Attribute "FoomaticRIPOption" "PrintoutMode" "enum Composite B" Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Draft" "Quality=600DraftColorCM&& -Y" +YK" Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Draft.Gray" "Quality=600DraftGr&& ayscaleK" - Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal" "Quality=600ColorCMY" + Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal" "Quality=600ColorCMYK" Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal.Gray" "Quality=600Graysc&& aleK" - Attribute "FoomaticRIPOptionSetting" "PrintoutMode=High" "Quality=600ColorCMY" + Attribute "FoomaticRIPOptionSetting" "PrintoutMode=High" "Quality=600ColorCMYK" Attribute "FoomaticRIPOptionSetting" "PrintoutMode=High.Gray" "Quality=600Grayscal&& eK" Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Photo" "Quality=600PhotoCMYKFul&& diff --git a/prnt/drv/hpijs.drv.in.template b/prnt/drv/hpijs.drv.in.template index 51cf63c1a..c70aed5ba 100644 --- a/prnt/drv/hpijs.drv.in.template +++ b/prnt/drv/hpijs.drv.in.template @@ -2220,16 +2220,16 @@ le=- -" r="HEWLETT-PACKARD" -sDeviceModel="deskjet 3320"" Attribute "FoomaticRIPOption" "PrintoutMode" "enum Composite B" Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Draft" "Quality=300DraftColorCM&& -Y" +YK" Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Draft.Gray" "Quality=300DraftGr&& ayscaleK" - Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal" "Quality=300ColorCMY" + Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal" "Quality=300ColorCMYK" Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal.Gray" "Quality=300Graysc&& aleK" - Attribute "FoomaticRIPOptionSetting" "PrintoutMode=High" "Quality=600ColorCMY" + Attribute "FoomaticRIPOptionSetting" "PrintoutMode=High" "Quality=600ColorCMYK" Attribute "FoomaticRIPOptionSetting" "PrintoutMode=High.Gray" "Quality=600Grayscal&& eK" - Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Photo" "Quality=600PhotoCMY" + Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Photo" "Quality=600PhotoCMYK" Attribute "FoomaticRIPOption" "PageSize" "enum CmdLine A" Attribute "FoomaticRIPOptionSetting" "PageSize=Letter" " -dDEVICEWIDTHPOINTS=612 -&& dDEVICEHEIGHTPOINTS=792" @@ -2402,13 +2402,13 @@ le=- -" r="HEWLETT-PACKARD" -sDeviceModel="deskjet 3600"" Attribute "FoomaticRIPOption" "PrintoutMode" "enum Composite B" Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Draft" "Quality=300DraftColorCM&& -Y" +YK" Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Draft.Gray" "Quality=300DraftGr&& ayscaleK" - Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal" "Quality=300ColorCMY" + Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal" "Quality=300ColorCMYK" Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal.Gray" "Quality=300Graysc&& aleK" - Attribute "FoomaticRIPOptionSetting" "PrintoutMode=High" "Quality=600ColorCMY" + Attribute "FoomaticRIPOptionSetting" "PrintoutMode=High" "Quality=600ColorCMYK" Attribute "FoomaticRIPOptionSetting" "PrintoutMode=High.Gray" "Quality=600Grayscal&& eK" Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Photo" "Quality=600PhotoCMYKFul&& @@ -2598,13 +2598,13 @@ er="HEWLETT-PACKARD" -sDeviceModel="Deskjet D4100"&& " Attribute "FoomaticRIPOption" "PrintoutMode" "enum Composite B" Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Draft" "Quality=600DraftColorCM&& -Y" +YK" Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Draft.Gray" "Quality=600DraftGr&& ayscaleK" - Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal" "Quality=600ColorCMY" + Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal" "Quality=600ColorCMYK" Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal.Gray" "Quality=600Graysc&& aleK" - Attribute "FoomaticRIPOptionSetting" "PrintoutMode=High" "Quality=600ColorCMY" + Attribute "FoomaticRIPOptionSetting" "PrintoutMode=High" "Quality=600ColorCMYK" Attribute "FoomaticRIPOptionSetting" "PrintoutMode=High.Gray" "Quality=600Grayscal&& eK" Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Photo" "Quality=600PhotoCMYKFul&&