File gutenprint-5.0.2-resolution.patch of Package cups-drivers
--- gutenprint/src/main/escp2-resolutions.c.orig 2008-01-02 03:29:08.000000000 +0100
+++ gutenprint/src/main/escp2-resolutions.c 2008-01-15 19:53:03.000000000 +0100
@@ -33,147 +33,147 @@ static const res_t r_360x90dpi =
{ "360x90dpi", N_("360 x 90 DPI Fast Economy"),
360, 90, 360, 90, 360, 90, 0, 0, 1 };
static const res_t r_360x90sw =
-{ "360x90sw", N_("360 x 90 DPI Fast Economy"),
+{ "360x90dpi", N_("360 x 90 DPI Fast Economy Softweave"),
360, 90, 360, 90, 360, 90, 1, 0, 1 };
static const res_t r_360x120dpi =
{ "360x120dpi", N_("360 x 120 DPI Economy"),
360, 120, 360, 120, 360, 120, 0, 0, 1 };
static const res_t r_360x120sw =
-{ "360x120sw", N_("360 x 120 DPI Economy"),
+{ "360x120dpi", N_("360 x 120 DPI Economy Softweave"),
360, 120, 360, 120, 360, 120, 1, 0, 1 };
static const res_t r_180dpi =
{ "180dpi", N_("180 DPI Economy"),
180, 180, 180, 180, 180, 180, 0, 0, 1 };
static const res_t r_180sw =
-{ "180sw", N_("180 DPI Economy"),
+{ "180dpi", N_("180 DPI Economy Softweave"),
180, 180, 180, 180, 180, 180, 1, 0, 1 };
static const res_t r_360x180dpi =
{ "360x180dpi", N_("360 x 180 DPI Draft"),
360, 180, 360, 180, 360, 180, 0, 0, 1 };
static const res_t r_360x180sw =
-{ "360x180sw", N_("360 x 180 DPI Draft"),
+{ "360x180dpi", N_("360 x 180 DPI Draft Softweave"),
360, 180, 360, 180, 360, 180, 1, 0, 1 };
static const res_t r_360x240dpi =
{ "360x240dpi", N_("360 x 240 DPI Draft"),
360, 240, 360, 240, 360, 240, 0, 0, 1 };
static const res_t r_360x240sw =
-{ "360x240sw", N_("360 x 240 DPI Draft"),
+{ "360x240dpi", N_("360 x 240 DPI Draft Softweave"),
360, 240, 360, 240, 360, 240, 1, 0, 1 };
static const res_t r_360mw =
-{ "360mw", N_("360 DPI High Quality"),
+{ "360x360dpi", N_("360 DPI High Quality"),
360, 360, 360, 360, 360, 360, 0, 1, 1 };
static const res_t r_360pro =
-{ "360pro", N_("360 DPI"),
+{ "360x360dpi", N_("360 DPI Pro"),
360, 360, 360, 360, 360, 360, 0, 1, 1 };
static const res_t r_360 =
-{ "360", N_("360 DPI"),
+{ "360x360dpi", N_("360 DPI"),
360, 360, 360, 360, 360, 360, 0, 0, 1 };
static const res_t r_360sw =
-{ "360sw", N_("360 DPI"),
+{ "360x360dpi", N_("360 DPI Softweave"),
360, 360, 360, 360, 360, 360, 1, 0, 1 };
static const res_t r_720x360mw =
-{ "720x360mw", N_("720 x 360 DPI"),
+{ "720x360dpi", N_("720 x 360 DPI Weave"),
720, 360, 720, 360, 720, 360, 0, 1, 1 };
static const res_t r_720x360sw =
-{ "720x360sw", N_("720 x 360 DPI"),
+{ "720x360dpi", N_("720 x 360 DPI"),
720, 360, 720, 360, 720, 360, 1, 0, 1 };
static const res_t r_720x360un =
-{ "720x360un", N_("720 x 360 DPI Enhanced"),
+{ "720x360dpi", N_("720 x 360 DPI Enhanced"),
720, 360, 1440, 720, 720, 360, 1, 0, 1 };
static const res_t r_720mw =
-{ "720mw", N_("720 DPI"),
+{ "720dpi", N_("720 DPI"),
720, 720, 720, 720, 720, 720, 0, 1, 1 };
static const res_t r_720sw =
-{ "720sw", N_("720 DPI"),
+{ "720dpi", N_("720 DPI Softweave"),
720, 720, 720, 720, 720, 720, 1, 0, 1 };
static const res_t r_720un =
-{ "720un", N_("720 DPI High Quality"),
+{ "720dpi", N_("720 DPI High Quality Uni"),
720, 720, 1440, 720, 720, 720, 1, 0, 1 };
static const res_t r_720hq =
-{ "720hq", N_("720 DPI High Quality"),
+{ "720dpi", N_("720 DPI High Quality"),
720, 720, 720, 720, 720, 720, 1, 0, 2 };
static const res_t r_720hq2 =
-{ "720hq2", N_("720 DPI Highest Quality"),
+{ "720dpi", N_("720 DPI Highest Quality"),
720, 720, 720, 720, 720, 720, 1, 0, 4 };
static const res_t r_720x720oov =
-{ "720x720oov", N_("720 x 720 DPI"),
+{ "720x720dpi", N_("720 x 720 DPI OOV"),
2880, 720, 2880, 720, 720, 720, 1, 0, 1 };
static const res_t r_1440x720mw =
-{ "1440x720mw", N_("1440 x 720 DPI"),
+{ "1440x720dpi", N_("1440 x 720 DPI MWeave"),
1440, 720, 1440, 720, 1440, 720, 0, 1, 1 };
static const res_t r_1440x720sw =
-{ "1440x720sw", N_("1440 x 720 DPI"),
+{ "1440x720dpi", N_("1440 x 720 DPI Softweave"),
1440, 720, 1440, 720, 1440, 720, 1, 0, 1 };
static const res_t r_1440x720hq2 =
-{ "1440x720hq2", N_("1440 x 720 DPI Highest Quality"),
+{ "1440x720dpi", N_("1440 x 720 DPI Highest Quality"),
1440, 720, 1440, 720, 1440, 720, 1, 0, 2 };
static const res_t r_720x1440sw =
-{ "720x1440sw", N_("1440 x 720 DPI Transposed"),
+{ "720x1440dpi", N_("1440 x 720 DPI Transposed"),
720, 1440, 720, 1440, 720, 1440, 1, 0, 1 };
static const res_t r_720x1440ov =
-{ "720x1440ov", N_("1440 x 720 DPI Transposed"),
+{ "720x1440dpi", N_("1440 x 720 DPI Transposed"),
1440, 1440, 1440, 1440, 720, 1440, 1, 0, 1};
static const res_t r_1440x720ov =
-{ "1440x720ov", N_("1440 x 720 DPI"),
+{ "1440x720dpi", N_("1440 x 720 DPI OV"),
2880, 720, 2880, 720, 1440, 720, 1, 0, 1 };
static const res_t r_2880x720mw =
-{ "2880x720mw", N_("2880 x 720 DPI"),
+{ "2880x720dpi", N_("2880 x 720 DPI MWeave"),
2880, 720, 2880, 720, 2880, 720, 0, 1, 1};
static const res_t r_2880x720sw =
-{ "2880x720sw", N_("2880 x 720 DPI"),
+{ "2880x720dpi", N_("2880 x 720 DPI"),
2880, 720, 2880, 720, 2880, 720, 1, 0, 1};
static const res_t r_2880x720hq2 =
-{ "2880x720hq2", N_("2880 x 720 DPI Highest Quality"),
+{ "2880x720dpi", N_("2880 x 720 DPI Highest Quality"),
2880, 720, 2880, 720, 2880, 720, 1, 0, 2 };
static const res_t r_1440x1440mw =
-{ "1440x1440mw", N_("1440 x 1440 DPI"),
+{ "1440x1440dpi", N_("1440 x 1440 DPI"),
1440, 1440, 1440, 1440, 1440, 1440, 0, 1, 1};
static const res_t r_1440x1440sw =
-{ "1440x1440sw", N_("1440 x 1440 DPI"),
+{ "1440x1440dpi", N_("1440 x 1440 DPI Softweave"),
1440, 1440, 1440, 1440, 1440, 1440, 1, 0, 1};
static const res_t r_1440x1440ov =
-{ "1440x1440ov", N_("1440 x 1440 DPI"),
+{ "1440x1440dpi", N_("1440 x 1440 DPI OV"),
2880, 1440, 2880, 1440, 1440, 1440, 1, 0, 1};
static const res_t r_2880x1440mw =
-{ "2880x1440mw", N_("2880 x 1440 DPI"),
+{ "2880x1440dpi", N_("2880 x 1440 DPI"),
2880, 1440, 2880, 1440, 2880, 1440, 0, 1, 1};
static const res_t r_2880x1440sw =
-{ "2880x1440sw", N_("2880 x 1440 DPI"),
+{ "2880x1440dpi", N_("2880 x 1440 DPI Softweave"),
2880, 1440, 2880, 1440, 2880, 1440, 1, 0, 1};
static const res_t r_1440x2880sw =
-{ "1440x2880sw", N_("2880 x 1440 DPI Transposed"),
+{ "1440x2880dpi", N_("2880 x 1440 DPI Transposed"),
1440, 2880, 1440, 2880, 1440, 2880, 1, 0, 1};
static const res_t r_2880x1440sw2400 =
-{ "2880x1440sw", N_("2880 x 1440 DPI"),
+{ "2880x1440dpi", N_("2880 x 1440 DPI Softweave2400"),
1440, 2880, 1440, 2880, 1440, 2880, 1, 0, 1};
static const res_t r_5760x1440sw =
-{ "5760x1440sw", N_("5760 x 1440 DPI"),
+{ "5760x1440dpi", N_("5760 x 1440 DPI"),
5760, 1440, 5760, 1440, 5760, 1440, 1, 0, 1};
static const res_t r_2880x2880mw =
-{ "2880x2880mw", N_("2880 x 2880 DPI"),
+{ "2880x2880dpi", N_("2880 x 2880 DPI"),
2880, 2880, 2880, 2880, 2880, 2880, 0, 1, 1};
static const res_t r_2880x2880sw =
-{ "2880x2880sw", N_("2880 x 2880 DPI"),
+{ "2880x2880dpi", N_("2880 x 2880 DPI Softweave"),
2880, 2880, 2880, 2880, 2880, 2880, 1, 0, 1};
static const res_t r_5760x2880mw =
-{ "5760x2880mw", N_("5760 x 2880 DPI"),
+{ "5760x2880dpi", N_("5760 x 2880 DPI"),
5760, 2880, 5760, 2880, 5760, 2880, 0, 1, 1};
static const res_t r_5760x2880sw =
-{ "5760x2880sw", N_("5760 x 2880 DPI"),
+{ "5760x2880dpi", N_("5760 x 2880 DPI Softweave"),
5760, 2880, 5760, 2880, 5760, 2880, 1, 0, 1};
--- gutenprint/src/main/canon-modes.h.orig 2008-01-02 03:29:08.000000000 +0100
+++ gutenprint/src/main/canon-modes.h 2008-01-15 19:56:38.000000000 +0100
@@ -147,7 +147,7 @@ static const canon_mode_t canon_BJC_85_m
{ 360, 360,CANON_INK_K | CANON_INK_CMYK | CANON_INK_CcMmYK,
"360x360dpi",N_("360x360 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
{ 360, 360,CANON_INK_K | CANON_INK_CMYK | CANON_INK_CcMmYK,
- "360x360dmt",N_("360x360 DPI DMT"),INKSET(6_C4M4Y4K4c4m4),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
+ "360x361dpi",N_("360x360 DPI DMT"),INKSET(6_C4M4Y4K4c4m4),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
{ 720, 360,CANON_INK_K | CANON_INK_CMYK | CANON_INK_CcMmYK,
"720x360dpi",N_("720x360 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
};
@@ -168,7 +168,7 @@ static const canon_mode_t canon_BJC_240_
{ 90, 90,CANON_INK_K | CANON_INK_CMY,"90x90dpi",N_("90x90 DPI"),INKSET(4_C2M2Y2K2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
{ 180, 180,CANON_INK_K | CANON_INK_CMY,"180x180dpi",N_("180x180 DPI"),INKSET(4_C2M2Y2K2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
{ 360, 360,CANON_INK_K | CANON_INK_CMY,"360x360dpi",N_("360x360 DPI"),INKSET(4_C2M2Y2K2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
- { 360, 360,CANON_INK_K | CANON_INK_CMY,"360x360dmt",N_("360x360 DMT"),INKSET(4_C4M4Y4K4),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
+ { 360, 360,CANON_INK_K | CANON_INK_CMY,"360x361dpi",N_("360x360 DMT"),INKSET(4_C4M4Y4K4),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
{ 720, 360,CANON_INK_K | CANON_INK_CMY,"720x360dpi",N_("720x360 DPI"),INKSET(4_C2M2Y2K2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
};
DECLARE_MODES(canon_BJC_240,0);
@@ -183,7 +183,7 @@ DECLARE_MODES(canon_BJC_2000,0);
static const canon_mode_t canon_BJC_3000_modes[] = {
{ 360, 360,CANON_INK_CMYK | CANON_INK_CcMmYK,"360x360dpi",N_("360x360 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
- { 360, 360,CANON_INK_CMYK | CANON_INK_CcMmYK,"360x360dmt",N_("360x360 DPI DMT"),INKSET(6_C4M4Y4K4c4m4),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
+ { 360, 360,CANON_INK_CMYK | CANON_INK_CcMmYK,"360x361dpi",N_("360x360 DPI DMT"),INKSET(6_C4M4Y4K4c4m4),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
{ 720, 720,CANON_INK_CMYK | CANON_INK_CcMmYK,"720x720dpi",N_("720x720 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
{ 1440, 720,CANON_INK_CMYK | CANON_INK_CcMmYK,"1440x720dpi",N_("1440x720 DPI"),INKSET(6_C2M2Y2K2c2m2),0,delay_1440,1.0,1.0,NULL,NULL,NULL,2},
};
@@ -192,7 +192,7 @@ DECLARE_MODES(canon_BJC_3000,0);
static const canon_mode_t canon_BJC_4300_modes[] = {
{ 360, 360,CANON_INK_CMYK | CANON_INK_CcMmYK,"360x360dpi",N_("360x360 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
- { 360, 360,CANON_INK_CMYK | CANON_INK_CcMmYK,"360x360dmt",N_("360x360 DPI DMT"),INKSET(6_C4M4Y4K4c4m4),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
+ { 360, 360,CANON_INK_CMYK | CANON_INK_CcMmYK,"360x361dpi",N_("360x360 DPI DMT"),INKSET(6_C4M4Y4K4c4m4),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
{ 720, 720,CANON_INK_CMYK | CANON_INK_CcMmYK,"720x720dpi",N_("720x720 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
{ 1440, 720,CANON_INK_CMYK | CANON_INK_CcMmYK,"1440x720dpi",N_("1440x720 DPI"),INKSET(6_C2M2Y2K2c2m2),0,delay_1440,1.0,1.0,NULL,NULL,NULL,2},
};
@@ -218,7 +218,7 @@ DECLARE_MODES(canon_BJC_5500,0);
static const canon_mode_t canon_BJC_6000_modes[] = {
{ 360, 360,CANON_INK_CMYK | CANON_INK_CcMmYK,"360x360dpi",N_("360x360 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,1.8,1.0,NULL,NULL,NULL,2},
- { 360, 360,CANON_INK_CMYK | CANON_INK_CcMmYK,"360x360dmt",N_("360x360 DPI DMT"),INKSET(6_C4M4Y4K4c4m4),0,NULL,1.8,1.0,NULL,NULL,NULL,2},
+ { 360, 360,CANON_INK_CMYK | CANON_INK_CcMmYK,"360x361dpi",N_("360x360 DPI DMT"),INKSET(6_C4M4Y4K4c4m4),0,NULL,1.8,1.0,NULL,NULL,NULL,2},
{ 720, 720,CANON_INK_CMYK | CANON_INK_CcMmYK,"720x720dpi",N_("720x720 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
{ 1440, 720,CANON_INK_CMYK | CANON_INK_CcMmYK,"1440x720dpi",N_("1440x720 DPI"),INKSET(6_C2M2Y2K2c2m2),0,delay_1440,0.5,1.0,NULL,NULL,NULL,2},
};
@@ -281,9 +281,9 @@ DECLARE_MODES(canon_S200,0);
static const canon_mode_t canon_S500_modes[] = {
{ 300, 300,CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(4_C2M2Y2K2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
- { 600, 600,CANON_INK_CMYK,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(9_C3M3Y2K2),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+ { 600, 600,CANON_INK_CMYK,"600x300dpi",N_("600x600 DPI DRAFT"),INKSET(9_C3M3Y2K2),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
{ 600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
-/* { 600, 600,CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(9_C4M4Y4K2),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3}, */
+/* { 600, 600,CANON_INK_CMYK,"600x601dpi",N_("600x600 DPI HIGH"),INKSET(9_C4M4Y4K2),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3}, */
};
DECLARE_MODES(canon_S500,2);
@@ -302,10 +302,10 @@ DECLARE_MODES(canon_PIXMA_iP3000,1);
static const canon_mode_t canon_PIXMA_iP4000_modes[] = {
{ 300, 300,CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(4_C2M2Y2K2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
- { 600, 600,CANON_INK_CMYK,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(4_C2M2Y2K2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
+ { 600, 600,CANON_INK_CMYK,"600x300dpi",N_("600x600 DPI DRAFT"),INKSET(4_C2M2Y2K2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
{ 600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(9_C3M3Y2K2k3_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-/* { 600, 600,CANON_INK_CcMmYyK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(9_C4M4Y4K2c4m4k4),MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL},*/ /* this mode is used for CD printing, K is ignored by the printer then, the seperation between the small and large dot inks needs more work */
-/* { 600, 600,CANON_INK_CcMmYyK,"600x600dpi_superphoto",N_("600x600 DPI Superphoto"),INKSET(9_C8M8Y8c16m16k8),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL}, */
+/* { 600, 600,CANON_INK_CcMmYyK,"600x601dpi",N_("600x600 DPI HIGH"),INKSET(9_C4M4Y4K2c4m4k4),MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL},*/ /* this mode is used for CD printing, K is ignored by the printer then, the seperation between the small and large dot inks needs more work */
+/* { 600, 600,CANON_INK_CcMmYyK,"601x601dpi",N_("600x600 DPI Superphoto"),INKSET(9_C8M8Y8c16m16k8),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL}, */
};
DECLARE_MODES(canon_PIXMA_iP4000,2);
@@ -317,7 +317,7 @@ static const canon_mode_t canon_PIXMA_iP
{ 300, 300,CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(22_C2M2Y2K2),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,iP4200_300dpi_lum_adjustment,NULL,NULL,1},
/* Q2 - standard mode for this driver (in windows driver it's Q3) */
{ 600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(22_C3M3Y2K2k3_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
- /* { 600, 600,CANON_INK_CcMmYyK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(22_C4M4Y4K2c4m4k4),MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL}, */
+ /* { 600, 600,CANON_INK_CcMmYyK,"600x601dpi",N_("600x600 DPI HIGH"),INKSET(22_C4M4Y4K2c4m4k4),MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL}, */
};
DECLARE_MODES(canon_PIXMA_iP4200,2);
--- gutenprint/src/main/print-olympus.c.orig 2008-01-02 03:29:08.000000000 +0100
+++ gutenprint/src/main/print-olympus.c 2008-01-15 19:53:03.000000000 +0100
@@ -227,7 +227,7 @@ LIST(ink_list_t, bgr_ink_list, ink_t, bg
/* Olympus P-10 */
static const dyesub_resolution_t res_310dpi[] =
{
- { "310x310", 310, 310},
+ { "310x310dpi", 310, 310},
};
LIST(dyesub_resolution_list_t, res_310dpi_list, dyesub_resolution_t, res_310dpi);
@@ -243,9 +243,9 @@ LIST(dyesub_pagesize_list_t, p10_page_li
static const dyesub_printsize_t p10_printsize[] =
{
- { "310x310", "w288h432", 1280, 1848},
- { "310x310", "B7", 1144, 1591},
- { "310x310", "Custom", 1280, 1848},
+ { "310x310dpi", "w288h432", 1280, 1848},
+ { "310x310dpi", "B7", 1144, 1591},
+ { "310x310dpi", "Custom", 1280, 1848},
};
LIST(dyesub_printsize_list_t, p10_printsize_list, dyesub_printsize_t, p10_printsize);
@@ -284,7 +284,7 @@ LIST(laminate_list_t, p10_laminate_list,
/* Olympus P-200 series */
static const dyesub_resolution_t res_320dpi[] =
{
- { "320x320", 320, 320},
+ { "320x320dpi", 320, 320},
};
LIST(dyesub_resolution_list_t, res_320dpi_list, dyesub_resolution_t, res_320dpi);
@@ -299,8 +299,8 @@ LIST(dyesub_pagesize_list_t, p200_page_l
static const dyesub_printsize_t p200_printsize[] =
{
- { "320x320", "ISOB7", 960, 1280},
- { "320x320", "Custom", 960, 1280},
+ { "320x320dpi", "ISOB7", 960, 1280},
+ { "320x320dpi", "Custom", 960, 1280},
};
LIST(dyesub_printsize_list_t, p200_printsize_list, dyesub_printsize_t, p200_printsize);
@@ -339,8 +339,8 @@ static const char p200_adj_any[] =
/* Olympus P-300 series */
static const dyesub_resolution_t p300_res[] =
{
- { "306x306", 306, 306},
- { "153x153", 153, 153},
+ { "306x306dpi", 306, 306},
+ { "153x153dpi", 153, 153},
};
LIST(dyesub_resolution_list_t, p300_res_list, dyesub_resolution_t, p300_res);
@@ -355,10 +355,10 @@ LIST(dyesub_pagesize_list_t, p300_page_l
static const dyesub_printsize_t p300_printsize[] =
{
- { "306x306", "A6", 1024, 1376},
- { "153x153", "A6", 512, 688},
- { "306x306", "Custom", 1024, 1376},
- { "153x153", "Custom", 512, 688},
+ { "306x306dpi", "A6", 1024, 1376},
+ { "153x153dpi", "A6", 512, 688},
+ { "306x306dpi", "Custom", 1024, 1376},
+ { "153x153dpi", "Custom", 512, 688},
};
LIST(dyesub_printsize_list_t, p300_printsize_list, dyesub_printsize_t, p300_printsize);
@@ -436,7 +436,7 @@ static const char p300_adj_yellow[] =
/* Olympus P-400 series */
static const dyesub_resolution_t res_314dpi[] =
{
- { "314x314", 314, 314},
+ { "314x314dpi", 314, 314},
};
LIST(dyesub_resolution_list_t, res_314dpi_list, dyesub_resolution_t, res_314dpi);
@@ -453,10 +453,10 @@ LIST(dyesub_pagesize_list_t, p400_page_l
static const dyesub_printsize_t p400_printsize[] =
{
- { "314x314", "A4", 2400, 3200},
- { "314x314", "c8x10", 2000, 2400},
- { "314x314", "C6", 1328, 1920},
- { "314x314", "Custom", 2400, 3200},
+ { "314x314dpi", "A4", 2400, 3200},
+ { "314x314dpi", "c8x10", 2000, 2400},
+ { "314x314dpi", "C6", 1328, 1920},
+ { "314x314dpi", "Custom", 2400, 3200},
};
LIST(dyesub_printsize_list_t, p400_printsize_list, dyesub_printsize_t, p400_printsize);
@@ -572,11 +572,11 @@ LIST(dyesub_pagesize_list_t, p440_page_l
static const dyesub_printsize_t p440_printsize[] =
{
- { "314x314", "A4", 2508, 3200},
- { "314x314", "c8x10", 2000, 2508},
- { "314x314", "C6", 1328, 1920},
- { "314x314", "w255h581", 892, 2320},
- { "314x314", "Custom", 2508, 3200},
+ { "314x314dpi", "A4", 2508, 3200},
+ { "314x314dpi", "c8x10", 2000, 2508},
+ { "314x314dpi", "C6", 1328, 1920},
+ { "314x314dpi", "w255h581", 892, 2320},
+ { "314x314dpi", "Custom", 2508, 3200},
};
LIST(dyesub_printsize_list_t, p440_printsize_list, dyesub_printsize_t, p440_printsize);
@@ -666,9 +666,9 @@ LIST(dyesub_pagesize_list_t, ps100_page_
static const dyesub_printsize_t ps100_printsize[] =
{
- { "306x306", "w288h432", 1254, 1808},
- { "306x306", "B7", 1120, 1554},
- { "306x306", "Custom", 1254, 1808},
+ { "306x306dpi", "w288h432", 1254, 1808},
+ { "306x306dpi", "B7", 1120, 1554},
+ { "306x306dpi", "Custom", 1254, 1808},
};
LIST(dyesub_printsize_list_t, ps100_printsize_list, dyesub_printsize_t, ps100_printsize);
@@ -719,7 +719,7 @@ static void ps100_printer_end_func(stp_v
/* Canon CP-10 */
static const dyesub_resolution_t res_300dpi[] =
{
- { "300x300", 300, 300},
+ { "300x300dpi", 300, 300},
};
LIST(dyesub_resolution_list_t, res_300dpi_list, dyesub_resolution_t, res_300dpi);
@@ -734,8 +734,8 @@ LIST(dyesub_pagesize_list_t, cp10_page_l
static const dyesub_printsize_t cp10_printsize[] =
{
- { "300x300", "w155h244", 662, 1040},
- { "300x300", "Custom", 662, 1040},
+ { "300x300dpi", "w155h244", 662, 1040},
+ { "300x300dpi", "Custom", 662, 1040},
};
LIST(dyesub_printsize_list_t, cp10_printsize_list, dyesub_printsize_t, cp10_printsize);
@@ -754,10 +754,10 @@ LIST(dyesub_pagesize_list_t, cpx00_page_
static const dyesub_printsize_t cpx00_printsize[] =
{
- { "300x300", "Postcard", 1232, 1808},
- { "300x300", "w253h337", 1100, 1456},
- { "300x300", "w155h244", 672, 1040},
- { "300x300", "Custom", 1232, 1808},
+ { "300x300dpi", "Postcard", 1232, 1808},
+ { "300x300dpi", "w253h337", 1100, 1456},
+ { "300x300dpi", "w155h244", 672, 1040},
+ { "300x300dpi", "Custom", 1232, 1808},
};
LIST(dyesub_printsize_list_t, cpx00_printsize_list, dyesub_printsize_t, cpx00_printsize);
@@ -840,11 +840,11 @@ LIST(dyesub_pagesize_list_t, cp220_page_
static const dyesub_printsize_t cp220_printsize[] =
{
- { "300x300", "Postcard", 1232, 1808},
- { "300x300", "w253h337", 1100, 1456},
- { "300x300", "w155h244", 672, 1040},
- { "300x300", "w283h566", 1232, 2416},
- { "300x300", "Custom", 1232, 1808},
+ { "300x300dpi", "Postcard", 1232, 1808},
+ { "300x300dpi", "w253h337", 1100, 1456},
+ { "300x300dpi", "w155h244", 672, 1040},
+ { "300x300dpi", "w283h566", 1232, 2416},
+ { "300x300dpi", "Custom", 1232, 1808},
};
LIST(dyesub_printsize_list_t, cp220_printsize_list, dyesub_printsize_t, cp220_printsize);
@@ -895,7 +895,7 @@ static void es1_plane_init_func(stp_vars
/* Sony DPP-EX5, DPP-EX7 */
static const dyesub_resolution_t res_403dpi[] =
{
- { "403x403", 403, 403},
+ { "403x403dpi", 403, 403},
};
LIST(dyesub_resolution_list_t, res_403dpi_list, dyesub_resolution_t, res_403dpi);
@@ -913,8 +913,8 @@ LIST(dyesub_pagesize_list_t, dppex5_page
static const dyesub_printsize_t dppex5_printsize[] =
{
- { "403x403", "w288h432", 1664, 2466},
- { "403x403", "Custom", 1664, 2466},
+ { "403x403dpi", "w288h432", 1664, 2466},
+ { "403x403dpi", "Custom", 1664, 2466},
};
LIST(dyesub_printsize_list_t, dppex5_printsize_list, dyesub_printsize_t, dppex5_printsize);
@@ -980,9 +980,9 @@ LIST(dyesub_pagesize_list_t, updp10_page
static const dyesub_printsize_t updp10_printsize[] =
{
- { "300x300", "w288h432", 1200, 1800},
- { "300x300", "w288h387", 1200, 1600},
- { "300x300", "Custom", 1200, 1800},
+ { "300x300dpi", "w288h432", 1200, 1800},
+ { "300x300dpi", "w288h387", 1200, 1600},
+ { "300x300dpi", "Custom", 1200, 1800},
};
LIST(dyesub_printsize_list_t, updp10_printsize_list, dyesub_printsize_t, updp10_printsize);
@@ -1084,11 +1084,11 @@ LIST(dyesub_pagesize_list_t, updr100_pag
static const dyesub_printsize_t updr100_printsize[] =
{
- { "334x334", "w288h432", 1382, 2048},
- { "334x334", "B7", 1210, 1710},
- { "334x334", "w360h504", 1710, 2380},
- { "334x334", "w432h576", 2048, 2724},
- { "334x334", "Custom", 1382, 2048},
+ { "334x334dpi", "w288h432", 1382, 2048},
+ { "334x334dpi", "B7", 1210, 1710},
+ { "334x334dpi", "w360h504", 1710, 2380},
+ { "334x334dpi", "w432h576", 2048, 2724},
+ { "334x334dpi", "Custom", 1382, 2048},
};
LIST(dyesub_printsize_list_t, updr100_printsize_list, dyesub_printsize_t, updr100_printsize);
@@ -1135,7 +1135,7 @@ LIST(laminate_list_t, updr100_laminate_l
/* Sony UP-DR150 */
static const dyesub_resolution_t res_334dpi[] =
{
- { "334x334", 334, 334},
+ { "334x334dpi", 334, 334},
};
LIST(dyesub_resolution_list_t, res_334dpi_list, dyesub_resolution_t, res_334dpi);
@@ -1153,11 +1153,11 @@ LIST(dyesub_pagesize_list_t, updr150_pag
static const dyesub_printsize_t updr150_printsize[] =
{
- { "334x334", "w288h432", 1382, 2048},
- { "334x334", "B7", 1210, 1728},
- { "334x334", "w360h504", 1728, 2380},
- { "334x334", "w432h576", 2048, 2724},
- { "334x334", "Custom", 1382, 2048},
+ { "334x334dpi", "w288h432", 1382, 2048},
+ { "334x334dpi", "B7", 1210, 1728},
+ { "334x334dpi", "w360h504", 1728, 2380},
+ { "334x334dpi", "w432h576", 2048, 2724},
+ { "334x334dpi", "Custom", 1382, 2048},
};
LIST(dyesub_printsize_list_t, updr150_printsize_list, dyesub_printsize_t, updr150_printsize);
@@ -1232,10 +1232,10 @@ LIST(dyesub_pagesize_list_t, cx400_page_
static const dyesub_printsize_t cx400_printsize[] =
{
- { "310x310", "w288h387", 1268, 1658},
- { "310x310", "w288h432", 1268, 1842},
- { "310x310", "w288h504", 1268, 2208},
- { "310x310", "Custom", 1268, 1842},
+ { "310x310dpi", "w288h387", 1268, 1658},
+ { "310x310dpi", "w288h432", 1268, 1842},
+ { "310x310dpi", "w288h504", 1268, 2208},
+ { "310x310dpi", "Custom", 1268, 1842},
};
LIST(dyesub_printsize_list_t, cx400_printsize_list, dyesub_printsize_t, cx400_printsize);
@@ -1275,7 +1275,7 @@ static void cx400_printer_init_func(stp_
/* Fujifilm NX-500 */
static const dyesub_resolution_t res_306dpi[] =
{
- { "306x306", 306, 306},
+ { "306x306dpi", 306, 306},
};
LIST(dyesub_resolution_list_t, res_306dpi_list, dyesub_resolution_t, res_306dpi);
@@ -1290,8 +1290,8 @@ LIST(dyesub_pagesize_list_t, nx500_page_
static const dyesub_printsize_t nx500_printsize[] =
{
- { "306x306", "Postcard", 1024, 1518},
- { "306x306", "Custom", 1024, 1518},
+ { "306x306dpi", "Postcard", 1024, 1518},
+ { "306x306dpi", "Custom", 1024, 1518},
};
LIST(dyesub_printsize_list_t, nx500_printsize_list, dyesub_printsize_t, nx500_printsize);
@@ -1324,8 +1324,8 @@ LIST(dyesub_pagesize_list_t, kodak_dock_
static const dyesub_printsize_t kodak_dock_printsize[] =
{
- { "300x300", "w288h432", 1248, 1856},
- { "300x300", "Custom", 1248, 1856},
+ { "300x300dpi", "w288h432", 1248, 1856},
+ { "300x300dpi", "Custom", 1248, 1856},
};
LIST(dyesub_printsize_list_t, kodak_dock_printsize_list, dyesub_printsize_t, kodak_dock_printsize);
--- gutenprint/src/main/print-pcl.c.orig 2008-01-02 03:29:08.000000000 +0100
+++ gutenprint/src/main/print-pcl.c 2008-01-15 19:53:03.000000000 +0100
@@ -256,8 +256,8 @@ static const pcl_t pcl_resolutions[] =
{ "150dpi", N_("150x150 DPI"), PCL_RES_150_150, 150, 150},
{ "300dpi", N_("300x300 DPI"), PCL_RES_300_300, 300, 300},
{ "600x300dpi", N_("600x300 DPI"), PCL_RES_600_300, 600, 300},
- { "600mono", N_("600x600 DPI monochrome"), PCL_RES_600_600_MONO, 600, 600},
- { "600dpi", N_("600x600 DPI"), PCL_RES_600_600, 600, 600},
+ { "600dpi", N_("600x600 DPI monochrome"), PCL_RES_600_600_MONO, 600, 600},
+ { "601dpi", N_("600x600 DPI"), PCL_RES_600_600, 600, 600},
{ "1200x600dpi", N_("1200x600 DPI"), PCL_RES_1200_600, 1200, 600},
{ "2400x600dpi", N_("2400x600 DPI"), PCL_RES_2400_600, 2400, 600},
};
--- gutenprint/src/main/print-lexmark.c.orig 2008-01-02 03:29:08.000000000 +0100
+++ gutenprint/src/main/print-lexmark.c 2008-01-15 19:53:03.000000000 +0100
@@ -576,15 +576,15 @@ static const lexmark_res_t_array lexmark
/* name hres vres softw v_pass overs unidir resid */
{ "300x600dpi", N_ ("300 DPI x 600 DPI"), 300, 600, 0, 1, 1, 0, DPI300 },
{ "600dpi", N_ ("600 DPI"), 600, 600, 0, 1, 1, 0, DPI600 },
- { "600hq", N_ ("600 DPI high quality"), 600, 600, 1, 4, 1, 0, DPI600 },
- { "600uni", N_ ("600 DPI Unidirectional"), 600, 600, 0, 1, 1, 1, DPI600 },
+ { "602dpi", N_ ("600 DPI high quality"), 600, 600, 1, 4, 1, 0, DPI600 },
+ { "601dpi", N_ ("600 DPI Unidirectional"), 600, 600, 0, 1, 1, 1, DPI600 },
{ "1200dpi", N_ ("1200 DPI"), 1200, 1200, 1, 1, 1, 0, DPI1200},
- { "1200hq", N_ ("1200 DPI high quality"), 1200, 1200, 1, 1, 1, 0, DPI300 },
- { "1200hq2", N_ ("1200 DPI highest quality"), 1200, 1200, 1, 1, 1, 0, DPI600 },
- { "1200uni", N_ ("1200 DPI Unidirectional"), 1200, 1200, 0, 1, 1, 1, DPI1200},
+ { "1202dpi", N_ ("1200 DPI high quality"), 1200, 1200, 1, 1, 1, 0, DPI300 },
+ { "1203dpi", N_ ("1200 DPI highest quality"), 1200, 1200, 1, 1, 1, 0, DPI600 },
+ { "1201dpi", N_ ("1200 DPI Unidirectional"), 1200, 1200, 0, 1, 1, 1, DPI1200},
{ "2400x1200dpi", N_ ("2400 DPI x 1200 DPI"), 2400, 1200, 1, 1, 1, 0, DPI1200},
- { "2400x1200hq", N_ ("2400 DPI x 1200 DPI high quality"), 2400, 1200, 1, 1, 1, 0, DPI600 },
- { "2400x1200hq2", N_ ("2400 DPI x 1200 DPI highest quality"),2400, 1200, 1, 1, 1, 0, DPI300},
+ { "2400x1201dpi", N_ ("2400 DPI x 1200 DPI high quality"), 2400, 1200, 1, 1, 1, 0, DPI600 },
+ { "2400x1202dpi", N_ ("2400 DPI x 1200 DPI highest quality"),2400, 1200, 1, 1, 1, 0, DPI300},
#ifdef DEBUG
{ "testprint", N_ ("test print"), 1200, 1200, 1, 1, 1, 0, DPItest},
#endif
