Imported Upstream version 4.3.99+cvs20050901

7 files changed, 122 insertions, 83 deletions

diff --git a/src/main/escp2-inks.c b/src/main/escp2-inks.c
index 99a4a97..6b26b7f 100644
--- a/src/main/escp2-inks.c
+++ b/src/main/escp2-inks.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: escp2-inks.c,v 1.40 2005/06/26 22:07:59 rlk Exp $"
+ * "$Id: escp2-inks.c,v 1.41 2005/08/14 01:27:44 rlk Exp $"
  *
  *   Print plug-in EPSON ESC/P2 driver for the GIMP.
  *
@@ -110,8 +110,10 @@ static const escp2_dropsize_t escp2_1_5pl_1440_dropsizes =
 /* Looks like 1.5, 3.25, 6 */
 static const escp2_dropsize_t escp2_1_5pl_2880_dropsizes =
   { "1_5pl_2880", 3, { 0.25, 0.47, 1.0 } };
+static const escp2_dropsize_t escp2_1_5pl_2880_2880_dropsizes =
+  { "1_5pl_2880_2880", 2, { 0.53, 1.0 } };
 static const escp2_dropsize_t escp2_1_5pl_5760_dropsizes =
-  { "1_5pl_5760", 2, { 0.53, 1.0 } };
+  { "1_5pl_5760", 1, { 1.0 } };
 
 /* Stylus Photo R300 */
 static const escp2_dropsize_t escp2_r300_360_dropsizes =
@@ -179,6 +181,7 @@ const escp2_drop_list_t stpi_escp2_simple_drops =
   &escp2_single_dropsizes,
   &escp2_single_dropsizes,
   &escp2_single_dropsizes,
+  &escp2_single_dropsizes,
 };
 
 const escp2_drop_list_t stpi_escp2_variable_6pl_drops =
@@ -190,7 +193,8 @@ const escp2_drop_list_t stpi_escp2_variable_6pl_drops =
   &escp2_6pl_1440_dropsizes,
   &escp2_6pl_2880_dropsizes,
   &escp2_6pl_2880_dropsizes,
-  &escp2_6pl_2880_dropsizes
+  &escp2_6pl_2880_dropsizes,
+  &escp2_6pl_2880_dropsizes,
 };
 
 const escp2_drop_list_t stpi_escp2_variable_x80_6pl_drops =
@@ -203,6 +207,7 @@ const escp2_drop_list_t stpi_escp2_variable_x80_6pl_drops =
   &escp2_x80_2880_6pl_dropsizes,
   &escp2_x80_2880_6pl_dropsizes,
   &escp2_x80_2880_6pl_dropsizes,
+  &escp2_x80_2880_6pl_dropsizes,
 };
 
 const escp2_drop_list_t stpi_escp2_variable_1440_4pl_drops =
@@ -215,6 +220,7 @@ const escp2_drop_list_t stpi_escp2_variable_1440_4pl_drops =
   &escp2_4pl_2880_dropsizes,
   &escp2_4pl_2880_dropsizes,
   &escp2_4pl_2880_dropsizes,
+  &escp2_4pl_2880_dropsizes,
 };
 
 const escp2_drop_list_t stpi_escp2_variable_2880_4pl_drops =
@@ -227,6 +233,7 @@ const escp2_drop_list_t stpi_escp2_variable_2880_4pl_drops =
   &escp2_4pl_2880_dropsizes,
   &escp2_4pl_2880_dropsizes,
   &escp2_4pl_2880_dropsizes,
+  &escp2_4pl_2880_dropsizes,
 };
 
 const escp2_drop_list_t stpi_escp2_variable_3pl_drops =
@@ -239,6 +246,7 @@ const escp2_drop_list_t stpi_escp2_variable_3pl_drops =
   &escp2_3pl_2880_dropsizes,
   &escp2_3pl_2880_dropsizes,
   &escp2_3pl_2880_dropsizes,
+  &escp2_3pl_2880_dropsizes,
 };
 
 const escp2_drop_list_t stpi_escp2_variable_2pl_drops =
@@ -251,6 +259,7 @@ const escp2_drop_list_t stpi_escp2_variable_2pl_drops =
   &escp2_2pl_2880_dropsizes,
   &escp2_2pl_2880_dropsizes,
   &escp2_2pl_2880_dropsizes,
+  &escp2_2pl_2880_dropsizes,
 };
 
 const escp2_drop_list_t stpi_escp2_variable_3pl_pmg_drops =
@@ -263,6 +272,7 @@ const escp2_drop_list_t stpi_escp2_variable_3pl_pmg_drops =
   &escp2_r300_2880_dropsizes,
   &escp2_r300_2880_1440_dropsizes,
   &escp2_r300_2880_1440_dropsizes,
+  &escp2_r300_2880_1440_dropsizes,
 };
 
 const escp2_drop_list_t stpi_escp2_variable_1_5pl_drops =
@@ -274,6 +284,7 @@ const escp2_drop_list_t stpi_escp2_variable_1_5pl_drops =
   &escp2_1_5pl_1440_dropsizes,
   &escp2_1_5pl_2880_dropsizes,
   &escp2_1_5pl_2880_dropsizes,
+  &escp2_1_5pl_2880_2880_dropsizes,
   &escp2_1_5pl_5760_dropsizes,
 };
 
@@ -286,6 +297,7 @@ const escp2_drop_list_t stpi_escp2_variable_2000p_drops =
   &escp2_2000p_dropsizes,
   &escp2_2000p_dropsizes,
   &escp2_2000p_dropsizes,
+  &escp2_2000p_dropsizes,
   &escp2_2000p_dropsizes
 };
 
@@ -299,6 +311,7 @@ const escp2_drop_list_t stpi_escp2_variable_ultrachrome_drops =
   &escp2_ultrachrome_2880_dropsizes,
   &escp2_ultrachrome_2880_dropsizes,
   &escp2_ultrachrome_2880_dropsizes,
+  &escp2_ultrachrome_2880_dropsizes,
 };
 
 const escp2_drop_list_t stpi_escp2_variable_3pl_pigment_drops =
@@ -311,6 +324,7 @@ const escp2_drop_list_t stpi_escp2_variable_3pl_pigment_drops =
   &escp2_3pl_pigment_2880_dropsizes,
   &escp2_3pl_pigment_5760_dropsizes,
   &escp2_3pl_pigment_5760_dropsizes,
+  &escp2_3pl_pigment_5760_dropsizes,
 };
 
 const escp2_drop_list_t stpi_escp2_variable_3pl_pigment_c66_drops =
@@ -323,6 +337,7 @@ const escp2_drop_list_t stpi_escp2_variable_3pl_pigment_c66_drops =
   &escp2_3pl_pigment_c66_2880_dropsizes,
   &escp2_3pl_pigment_c66_5760_dropsizes,
   &escp2_3pl_pigment_c66_5760_dropsizes,
+  &escp2_3pl_pigment_c66_5760_dropsizes,
 };
 
 const escp2_drop_list_t stpi_escp2_spro10000_drops =
@@ -334,5 +349,6 @@ const escp2_drop_list_t stpi_escp2_spro10000_drops =
   &escp2_spro10000_dropsizes,
   &escp2_spro10000_dropsizes,
   &escp2_spro10000_dropsizes,
+  &escp2_spro10000_dropsizes,
   &escp2_spro10000_dropsizes
 };
diff --git a/src/main/escp2-papers.c b/src/main/escp2-papers.c
index 718247c..24a6e92 100644
--- a/src/main/escp2-papers.c
+++ b/src/main/escp2-papers.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: escp2-papers.c,v 1.79 2005/08/13 20:29:29 rlk Exp $"
+ * "$Id: escp2-papers.c,v 1.80 2005/08/14 14:55:22 rleigh Exp $"
  *
  *   Print plug-in EPSON ESC/P2 driver for the GIMP.
  *
@@ -786,6 +786,10 @@ static const paper_adjustment_t r800_photo_adjustments[] =
     r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
   { "BackFilm", 0.83, .75, 1, .02, 1.4, .882, 1, .300, 1, 1, 1.0,
     r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
+  { "Matte", 0.92, .4, 1, .02, 1.4, .882, 1, .300, 1, 1, 1.0,
+    r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
+  { "MatteHeavy", 0.92, .4, 1, .02, 1.4, .882, 1, .300, 1, 1, 1.0,
+    r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
   { "Glossy", 0.92, 0.4, 1, .02, 1.4, .882, 1, .300, 1, 1, 1.0,
     r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
   { "GlossyHeavy", 0.92, 0.4, 1, .02, 1.4, .882, 1, .300, 1, 1, 1.0,
@@ -806,6 +810,8 @@ static const paper_adjustment_t r800_photo_adjustments[] =
     r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
   { "WaterColorRadiant", 0.92, .4, 1, .02, 1.4, .882, 1, .300, 1, 1, 1.0,
     r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
+  { "ArchivalMatte", 0.92, .4, 1, .02, 1.4, .882, 1, .300, 1, 1, 1.0,
+    r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
   { "GlossyPaper", 0.83, 1.0, 1, .02, 1.4, .882, 1, .300, 1, 1, 1.0,
     r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
   { "Ilford", 0.83, 1.0, 1, .02, 1.4, .882, 1, .300, 1, 1, 1.0,
@@ -850,6 +856,8 @@ static const paper_adjustment_t r800_matte_adjustments[] =
     r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
   { "Luster", 0.72, .8, .5, .025, .5, .882, 1, .300, .6, 1, 0.92,
     r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
+  { "ArchivalMatte", 0.92, 0.4, .5, .025, .5, .882, 1, .300, .6, 1, 1.0,
+    r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj },
   { "WaterColorRadiant", 0.92, 0.4, .5, .025, .5, .882, 1, .300, .6, 1, 1.0,
     r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj },
   { "GlossyPaper", 0.83, 0.5, .5, .025, .5, .882, 1, .300, .6, 1, 1.0,
diff --git a/src/main/escp2-resolutions.c b/src/main/escp2-resolutions.c
index 17535c2..011e2ef 100644
--- a/src/main/escp2-resolutions.c
+++ b/src/main/escp2-resolutions.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: escp2-resolutions.c,v 1.27 2005/06/29 01:42:34 rlk Exp $"
+ * "$Id: escp2-resolutions.c,v 1.28 2005/08/14 01:27:44 rlk Exp $"
  *
  *   Print plug-in EPSON ESC/P2 driver for the GIMP.
  *
@@ -141,6 +141,13 @@ static const res_t r_2880x2880sw =
 { "2880x2880sw",   N_("2880 x 2880 DPI"),
   2880, 2880,  2880, 2880, 1, 0, 1};
 
+static const res_t r_5760x2880mw =
+{ "5760x2880mw",   N_("5760 x 2880 DPI"),
+  5760, 2880,  5760, 2880, 0, 1, 1};
+static const res_t r_5760x2880sw =
+{ "5760x2880sw",   N_("5760 x 2880 DPI"),
+  5760, 2880,  5760, 2880, 1, 0, 1};
+
 
 
 const res_t *const stpi_escp2_720dpi_reslist[] =
@@ -296,6 +303,8 @@ const res_t *const stpi_escp2_superfine_reslist[] =
 
   &r_2880x2880sw,
 
+  &r_5760x2880sw,
+
   NULL
 };
 
diff --git a/src/main/print-canon.c b/src/main/print-canon.c
index 2f52ee2..a0d2dcb 100644
--- a/src/main/print-canon.c
+++ b/src/main/print-canon.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-canon.c,v 1.162 2005/08/01 08:54:04 faust3 Exp $"
+ * "$Id: print-canon.c,v 1.163 2005/08/25 23:40:40 rlk Exp $"
  *
  *   Print plug-in CANON BJL driver for the GIMP.
  *
@@ -1391,7 +1391,7 @@ typedef struct {
 
 static const paper_t canon_paper_list[] = {
   { "Plain",		N_ ("Plain Paper"),                0x00, 0.50, 0.25, 0.500, 0, 0, 0 },
-  { "Plain PIXMA",	N_ ("Plain Paper PIXMA"),          0x00, 0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PlainPIXMA",	N_ ("Plain Paper PIXMA"),          0x00, 0.78, 0.25, 0.500, 0, 0, 0 },
   { "Transparency",	N_ ("Transparencies"),             0x02, 1.00, 1.00, 0.900, 0, 0, 0 },
   { "BackPrint",	N_ ("Back Print Film"),            0x03, 1.00, 1.00, 0.900, 0, 0, 0 },
   { "Fabric",		N_ ("Fabric Sheets"),              0x04, 0.50, 0.25, 0.500, 0, 0, 0 },
diff --git a/src/main/print-escp2-data.c b/src/main/print-escp2-data.c
index aa32b58..7d7191e 100644
--- a/src/main/print-escp2-data.c
+++ b/src/main/print-escp2-data.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-escp2-data.c,v 1.177 2005/06/26 22:08:01 rlk Exp $"
+ * "$Id: print-escp2-data.c,v 1.178 2005/08/14 01:27:44 rlk Exp $"
  *
  *   Print plug-in EPSON ESC/P2 driver for the GIMP.
  *
@@ -40,87 +40,88 @@
  *  5: 2880x720 or 1440x1440
  *  6: 2880x1440
  *  7: 2880x2880
+ *  8: 5760x2880
  */
 
-/*   0     1     2     3     4     5     6     7 */
+/*   0     1     2     3     4     5     6     7     8 */
 
 static const escp2_dot_size_t g1_dotsizes =
-{   -2,   -2,   -2,   -2,   -1,   -1,   -1,   -1 };
+{   -2,   -2,   -2,   -2,   -1,   -1,   -1,   -1,   -1 };
 
 static const escp2_dot_size_t g2_dotsizes =
-{   -2,   -2,   -2,   -2,   -1,   -1,   -1,   -1 };
+{   -2,   -2,   -2,   -2,   -1,   -1,   -1,   -1,   -1 };
 
 static const escp2_dot_size_t g3_dotsizes =
-{    3,    3,    2,    1,    1,   -1,   -1,   -1 };
+{    3,    3,    2,    1,    1,   -1,   -1,   -1,   -1 };
 
 static const escp2_dot_size_t c6pl_dotsizes =
-{ 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10 };
+{ 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10 };
 
 static const escp2_dot_size_t c4pl_dotsizes =
-{ 0x12, 0x12, 0x12, 0x11, 0x10, 0x10, 0x10, 0x10 };
+{ 0x12, 0x12, 0x12, 0x11, 0x10, 0x10, 0x10, 0x10, 0x10 };
 
 static const escp2_dot_size_t c4pl_pigment_dotsizes =
-{ 0x12, 0x12, 0x12, 0x11, 0x11, 0x10, 0x10, 0x10 };
+{ 0x12, 0x12, 0x12, 0x11, 0x11, 0x10, 0x10, 0x10, 0x10 };
 
 static const escp2_dot_size_t c3pl_dotsizes =
-{ 0x11, 0x11, 0x11, 0x10, 0x10, 0x10, 0x10, 0x10 };
+{ 0x11, 0x11, 0x11, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10 };
 
 static const escp2_dot_size_t c3pl_pigment_dotsizes =
-{ 0x10, 0x10, 0x10, 0x11, 0x12, 0x12, 0x12, 0x12 };
+{ 0x10, 0x10, 0x10, 0x11, 0x12, 0x12, 0x12, 0x12, 0x12 };
 
 static const escp2_dot_size_t p3pl_dotsizes =
-{ 0x10, 0x10, 0x10, 0x11, 0x12, 0x12, 0x12, 0x12 };
+{ 0x10, 0x10, 0x10, 0x11, 0x12, 0x12, 0x12, 0x12, 0x12 };
 
 static const escp2_dot_size_t p1_5pl_dotsizes =
-{ 0x10, 0x10, 0x10, 0x11, 0x12, 0x13, 0x13, 0x13 };
+{ 0x10, 0x10, 0x10, 0x11, 0x12, 0x13, 0x13, 0x13, 0x13 };
 
 static const escp2_dot_size_t c2pl_dotsizes =
-{ 0x12, 0x12, 0x12, 0x11, 0x13,   -1, 0x10, 0x10 };
+{ 0x12, 0x12, 0x12, 0x11, 0x13,   -1, 0x10, 0x10, 0x10 };
 
 static const escp2_dot_size_t c1_8pl_dotsizes =
-{ 0x10, 0x10, 0x10, 0x10, 0x11, 0x12, 0x12, 0x13 };
+{ 0x10, 0x10, 0x10, 0x10, 0x11, 0x12, 0x12, 0x13, 0x13 };
 
 static const escp2_dot_size_t sc440_dotsizes =
-{    3,    3,    2,    1,   -1,   -1,   -1,   -1 };
+{    3,    3,    2,    1,   -1,   -1,   -1,   -1,   -1 };
 
 static const escp2_dot_size_t sc480_dotsizes =
-{ 0x13, 0x13, 0x13, 0x10, 0x10, 0x10, 0x10, 0x10 };
+{ 0x13, 0x13, 0x13, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10 };
 
 static const escp2_dot_size_t sc600_dotsizes =
-{    4,    4,    3,    2,    1,   -1,   -1,   -1 };
+{    4,    4,    3,    2,    1,   -1,   -1,   -1,   -1 };
 
 static const escp2_dot_size_t sc640_dotsizes =
-{    3,    3,    2,    1,    1,   -1,   -1,   -1 };
+{    3,    3,    2,    1,    1,   -1,   -1,   -1,   -1 };
 
 static const escp2_dot_size_t sc660_dotsizes =
-{    3,    3,    0,    0,    0,   -1,   -1,   -1 };
+{    3,    3,    0,    0,    0,   -1,   -1,   -1,   -1 };
 
 static const escp2_dot_size_t sc670_dotsizes =
-{ 0x12, 0x12, 0x12, 0x11, 0x11,   -1,   -1,   -1 };
+{ 0x12, 0x12, 0x12, 0x11, 0x11,   -1,   -1,   -1,   -1 };
 
 static const escp2_dot_size_t sp700_dotsizes =
-{    3,    3,    2,    1,    4,   -1,   -1,   -1 };
+{    3,    3,    2,    1,    4,   -1,   -1,   -1,   -1 };
 
 static const escp2_dot_size_t sp720_dotsizes =
-{ 0x12, 0x12, 0x11, 0x11, 0x11,   -1,   -1,   -1 };
+{ 0x12, 0x12, 0x11, 0x11, 0x11,   -1,   -1,   -1,   -1 };
 
 static const escp2_dot_size_t sp2000_dotsizes =
-{ 0x11, 0x11, 0x11, 0x10, 0x10,   -1,   -1,   -1 };
+{ 0x11, 0x11, 0x11, 0x10, 0x10,   -1,   -1,   -1,   -1 };
 
 static const escp2_dot_size_t spro_dye_dotsizes =
-{    3,    3,    3,    1,    1,   -1,   -1,   -1 };
+{    3,    3,    3,    1,    1,   -1,   -1,   -1,   -1 };
 
 static const escp2_dot_size_t spro_pigment_dotsizes =
-{    3,    3,    2,    1,    1,   -1,   -1,   -1 };
+{    3,    3,    2,    1,    1,   -1,   -1,   -1,   -1 };
 
 static const escp2_dot_size_t spro10000_dotsizes =
-{    4, 0x11, 0x11, 0x10, 0x10,   -1,   -1,   -1 };
+{    4, 0x11, 0x11, 0x10, 0x10,   -1,   -1,   -1,   -1 };
 
 static const escp2_dot_size_t spro5000_dotsizes =
-{    3,    3,    2,    1,    4,   -1,   -1,   -1 };
+{    3,    3,    2,    1,    4,   -1,   -1,   -1,   -1 };
 
 static const escp2_dot_size_t spro_c4pl_pigment_dotsizes =
-{ 0x11, 0x11, 0x11, 0x10, 0x10,   -1,    5,    5 };
+{ 0x11, 0x11, 0x11, 0x10, 0x10,   -1,    5,    5,    5 };
 
 /*
  * Bits are for:
@@ -133,24 +134,25 @@ static const escp2_dot_size_t spro_c4pl_pigment_dotsizes =
  *  5: 2880x720 or 1440x1440
  *  6: 2880x1440
  *  7: 2880x2880
+ *  8: 5760x2880
  */
 
-/*   0     1     2     3     4     5     6     7 */
+/*   0     1     2     3     4     5     6     7     8 */
 
 static const escp2_bits_t variable_bits =
-{    2,    2,    2,    2,    2,    2,    2,    2 };
+{    2,    2,    2,    2,    2,    2,    2,    2,    2 };
 
 static const escp2_bits_t stp950_bits =
-{    2,    2,    2,    2,    2,    2,    1,    1 };
+{    2,    2,    2,    2,    2,    2,    1,    1,    1 };
 
 static const escp2_bits_t ultrachrome_bits =
-{    2,    2,    2,    2,    2,    1,    1,    1 };
+{    2,    2,    2,    2,    2,    1,    1,    1,    1 };
 
 static const escp2_bits_t standard_bits =
-{    1,    1,    1,    1,    1,    1,    1,    1 };
+{    1,    1,    1,    1,    1,    1,    1,    1,    1 };
 
 static const escp2_bits_t c1_8_bits =
-{    2,    2,    2,    2,    2,    1,    1,    1 };
+{    2,    2,    2,    2,    2,    1,    1,    1,    1 };
 
 /*
  * Base resolutions are for:
@@ -163,36 +165,37 @@ static const escp2_bits_t c1_8_bits =
  *  5: 2880x720 or 1440x1440
  *  6: 2880x1440
  *  7: 2880x2880
+ *  8: 5760x2880
  */
 
-/*   0     1     2     3     4     5     6     7 */
+/*   0     1     2     3     4     5     6     7     8 */
 
 static const escp2_base_resolutions_t standard_base_res =
-{  720,  720,  720,  720,  720,  720,  720,  720 };
+{  720,  720,  720,  720,  720,  720,  720,  720,  720 };
 
 static const escp2_base_resolutions_t g3_base_res =
-{  720,  720,  720,  720,  360,  360,  360,  360 };
+{  720,  720,  720,  720,  360,  360,  360,  360,  360 };
 
 static const escp2_base_resolutions_t variable_base_res =
-{  360,  360,  360,  360,  360,  360,  360,  360 };
+{  360,  360,  360,  360,  360,  360,  360,  360,  360 };
 
 static const escp2_base_resolutions_t stp950_base_res =
-{  360,  360,  360,  360,  360,  720,  720,  720 };
+{  360,  360,  360,  360,  360,  720,  720,  720,  720 };
 
 static const escp2_base_resolutions_t ultrachrome_base_res =
-{  360,  360,  360,  360,  360,  720,  720,  720 };
+{  360,  360,  360,  360,  360,  720,  720,  720,  720 };
 
 static const escp2_base_resolutions_t c1_8_base_res =
-{  360,  360,  720,  720,  720, 1440, 1440, 1440 };
+{  360,  360,  720,  720,  720, 1440, 1440, 1440, 1440 };
 
 static const escp2_base_resolutions_t c1_5_base_res =
-{  360,  360,  720,  720,  720,  720,  720,  720 };
+{  360,  360,  720,  720,  720,  720,  720,  720,  720 };
 
 static const escp2_base_resolutions_t stc900_base_res =
-{  360,  360,  360,  360,  180,  180,  360,  360 };
+{  360,  360,  360,  360,  180,  180,  360,  360,  360 };
 
 static const escp2_base_resolutions_t pro_base_res =
-{ 2880, 2880, 2880, 2880, 2880, 2880, 2880, 2880 };
+{ 2880, 2880, 2880, 2880, 2880, 2880, 2880, 2880, 2880 };
 
 /*
  * Densities are for:
@@ -205,78 +208,79 @@ static const escp2_base_resolutions_t pro_base_res =
  *  5: 2880x720 or 1440x1440
  *  6: 2880x1440
  *  7: 2880x2880
+ *  8: 5760x2880
  */
 
 /*  0    1     2       3    4      5      6      7 */
 
 static const escp2_densities_t g1_densities =
-{ 2.6, 1.3,  1.3,  0.568, 0.0,   0.0,   0.0,   0.0   };
+{ 2.6, 1.3,  1.3,  0.568, 0.0,   0.0,   0.0,   0.0,   0.0   };
 
 static const escp2_densities_t g3_densities =
-{ 2.6, 1.3,  0.65, 0.775, 0.388, 0.0,   0.0,   0.0,  };
+{ 2.6, 1.3,  0.65, 0.775, 0.388, 0.0,   0.0,   0.0,   0.0   };
 
 static const escp2_densities_t c6pl_densities =
-{ 4.0, 2.0,  1.0,  0.568, 0.568, 0.568, 0.0,   0.0   };
+{ 4.0, 2.0,  1.0,  0.568, 0.568, 0.568, 0.0,   0.0,   0.0   };
 
 static const escp2_densities_t c4pl_2880_densities =
-{ 2.6, 1.3,  0.65, 0.650, 0.650, 0.650, 0.32,  0.0   };
+{ 2.6, 1.3,  0.65, 0.650, 0.650, 0.650, 0.32,  0.0,   0.0   };
 
 static const escp2_densities_t c4pl_densities =
-{ 2.6, 1.3,  0.65, 0.568, 0.523, 0.792, 0.396, 0.0   };
+{ 2.6, 1.3,  0.65, 0.568, 0.523, 0.792, 0.396, 0.0,   0.0   };
 
 static const escp2_densities_t c4pl_pigment_densities =
-{ 2.3, 1.15, 0.58, 0.766, 0.388, 0.958, 0.479, 0.0   };
+{ 2.3, 1.15, 0.58, 0.766, 0.388, 0.958, 0.479, 0.0,   0.0   };
 
 static const escp2_densities_t c3pl_pigment_densities =
-{ 2.4, 1.2,  0.60, 0.600, 0.512, 0.512, 0.512, 0.0   };
+{ 2.4, 1.2,  0.60, 0.600, 0.512, 0.512, 0.512, 0.0,   0.0   };
 
 static const escp2_densities_t c3pl_pigment_c66_densities =
-{ 2.8, 1.4,  0.70, 0.600, 0.512, 0.512, 0.512, 0.0   };
+{ 2.8, 1.4,  0.70, 0.600, 0.512, 0.512, 0.512, 0.0,   0.0   };
 
 static const escp2_densities_t c3pl_densities =
-{ 2.6, 1.3,  0.65, 0.730, 0.7,   0.91,  0.455, 0.0   };
+{ 2.6, 1.3,  0.65, 0.730, 0.7,   0.91,  0.455, 0.0,   0.0   };
 
 static const escp2_densities_t p3pl_densities =
-{ 4.0, 2.0,  1.00, 0.815, 0.788, 0.821, 0.680, 0.340 };
+{ 4.0, 2.0,  1.00, 0.815, 0.788, 0.821, 0.680, 0.340, 0.0   };
 
 static const escp2_densities_t p1_5pl_densities =
-{ 2.8, 1.4,  1.00, 1.000, 0.869, 0.942, 0.471, 0.500 };
+{ 2.8, 1.4,  1.00, 1.000, 0.869, 0.942, 0.471, 0.500, 0.530 };
 
 static const escp2_densities_t c2pl_densities =
-{ 2.0, 1.0,  0.5,  0.650, 0.650, 0.0,   0.650, 0.325 };
+{ 2.0, 1.0,  0.5,  0.650, 0.650, 0.0,   0.650, 0.325, 0.0   };
 
 static const escp2_densities_t c1_8pl_densities =
-{ 2.3, 1.15, 0.57, 0.650, 0.650, 0.0,   0.650, 0.360 };
+{ 2.3, 1.15, 0.57, 0.650, 0.650, 0.0,   0.650, 0.360, 0.0   };
 
 static const escp2_densities_t sc1500_densities =
-{ 2.6, 1.3,  1.3,  0.631, 0.0,   0.0,   0.0,   0.0   };
+{ 2.6, 1.3,  1.3,  0.631, 0.0,   0.0,   0.0,   0.0,   0.0   };
 
 static const escp2_densities_t sc440_densities =
-{ 4.0, 2.0,  1.0,  0.900, 0.45,  0.0,   0.0,   0.0   };
+{ 4.0, 2.0,  1.0,  0.900, 0.45,  0.0,   0.0,   0.0,   0.0   };
 
 static const escp2_densities_t sc480_densities =
-{ 2.8, 1.4,  0.7,  0.710, 0.710, 0.546, 0.0,   0.0   };
+{ 2.8, 1.4,  0.7,  0.710, 0.710, 0.546, 0.0,   0.0,   0.0   };
 
 static const escp2_densities_t sc660_densities =
-{ 4.0, 2.0,  1.0,  0.646, 0.323, 0.0,   0.0,   0.0   };
+{ 4.0, 2.0,  1.0,  0.646, 0.323, 0.0,   0.0,   0.0,   0.0   };
 
 static const escp2_densities_t sc980_densities =
-{ 2.6, 1.3,  0.65, 0.511, 0.49,  0.637, 0.455, 0.0   };
+{ 2.6, 1.3,  0.65, 0.511, 0.49,  0.637, 0.455, 0.0,   0.0   };
 
 static const escp2_densities_t sp700_densities =
-{ 2.6, 1.3,  1.3,  0.775, 0.55,  0.0,   0.0,   0.0   };
+{ 2.6, 1.3,  1.3,  0.775, 0.55,  0.0,   0.0,   0.0,   0.0   };
 
 static const escp2_densities_t sp2000_densities =
-{ 2.6, 1.3,  0.65, 0.852, 0.438, 0.219, 0.0,   0.0   };
+{ 2.6, 1.3,  0.65, 0.852, 0.438, 0.219, 0.0,   0.0,   0.0   };
 
 static const escp2_densities_t spro_dye_densities =
-{ 2.6, 1.3,  1.3,  0.775, 0.388, 0.275, 0.0,   0.0   };
+{ 2.6, 1.3,  1.3,  0.775, 0.388, 0.275, 0.0,   0.0,   0.0   };
 
 static const escp2_densities_t spro_pigment_densities =
-{ 3.0, 1.5,  0.78, 0.775, 0.388, 0.194, 0.0,   0.0   };
+{ 3.0, 1.5,  0.78, 0.775, 0.388, 0.194, 0.0,   0.0,   0.0   };
 
 static const escp2_densities_t spro10000_densities =
-{ 2.6, 1.3,  0.65, 0.431, 0.216, 0.392, 0.0,   0.0   };
+{ 2.6, 1.3,  0.65, 0.431, 0.216, 0.392, 0.0,   0.0,   0.0   };
 
 
 static const input_slot_t standard_roll_feed_input_slots[] =
@@ -1741,7 +1745,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     180, 1, 2, 180, 1, 2, 180, 1, 2, 8,
-    360, 14400, -1, 2880, 2880, 360, 180, 0, 1, 0, 190, 0, 0, 0,
+    360, 28800, -1, 5760, 2880, 360, 180, 0, 1, 0, 190, 0, 0, 0,
     INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
     9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 595, 842,
     4, 15, 0, 0,
@@ -1792,7 +1796,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     180, 1, 2, 180, 1, 2, 180, 1, 2, 8,
-    360, 14400, -1, 2880, 2880, 360, 180, 0, 1, 0, 190, 0, 0, 0,
+    360, 28800, -1, 5760, 2880, 360, 180, 0, 1, 0, 190, 0, 0, 0,
     INCH(13), INCH(1200), INCH(2), INCH(2),
     9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 595, 842,
     4, 15, 0, 0,
diff --git a/src/main/print-escp2.c b/src/main/print-escp2.c
index 041bdf4..8b8344b 100644
--- a/src/main/print-escp2.c
+++ b/src/main/print-escp2.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-escp2.c,v 1.341 2005/07/03 22:13:37 rlk Exp $"
+ * "$Id: print-escp2.c,v 1.343 2005/08/14 14:55:22 rleigh Exp $"
  *
  *   Print plug-in EPSON ESC/P2 driver for the GIMP.
  *
@@ -849,6 +849,7 @@ compute_internal_resid(int hres, int vres)
       1440 * 1440,
       2880 * 1440,
       2880 * 2880,
+      5760 * 2880,
     };
   int total_resolution = hres * vres;
   int i;
@@ -2140,7 +2141,7 @@ adjust_print_quality(stp_vars_t *v, stp_image_t *image)
 
 
   if (!stp_check_curve_parameter(v, "HueMap", STP_PARAMETER_ACTIVE) &&
-      pt->hue_adjustment)
+      pt && pt->hue_adjustment)
     {
       adjustment = stp_curve_create_from_string(pt->hue_adjustment);
       stp_set_curve_parameter(v, "HueMap", adjustment);
@@ -2148,7 +2149,7 @@ adjust_print_quality(stp_vars_t *v, stp_image_t *image)
       stp_curve_destroy(adjustment);
     }
   if (!stp_check_curve_parameter(v, "SatMap", STP_PARAMETER_ACTIVE) &&
-      pt->sat_adjustment)
+      pt && pt->sat_adjustment)
     {
       adjustment = stp_curve_create_from_string(pt->sat_adjustment);
       stp_set_curve_parameter(v, "SatMap", adjustment);
@@ -2156,7 +2157,7 @@ adjust_print_quality(stp_vars_t *v, stp_image_t *image)
       stp_curve_destroy(adjustment);
     }
   if (!stp_check_curve_parameter(v, "LumMap", STP_PARAMETER_ACTIVE) &&
-      pt->lum_adjustment)
+      pt && pt->lum_adjustment)
     {
       adjustment = stp_curve_create_from_string(pt->lum_adjustment);
       stp_set_curve_parameter(v, "LumMap", adjustment);
diff --git a/src/main/print-escp2.h b/src/main/print-escp2.h
index 2e0df38..0982996 100644
--- a/src/main/print-escp2.h
+++ b/src/main/print-escp2.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-escp2.h,v 1.94 2005/06/14 02:49:10 rlk Exp $"
+ * "$Id: print-escp2.h,v 1.95 2005/08/14 01:27:44 rlk Exp $"
  *
  *   Print plug-in EPSON ESC/P2 driver for the GIMP.
  *
@@ -53,7 +53,8 @@ typedef unsigned long model_featureset_t;
 #define RES_2880_720	 5
 #define RES_2880_1440	 6
 #define RES_2880_2880	 7
-#define RES_N		 8
+#define RES_5760_2880	 8
+#define RES_N		 9
 
 /*
  ****************************************************************
@@ -704,5 +705,5 @@ extern void stpi_escp2_terminate_page(stp_vars_t *v);
 
 #endif /* GUTENPRINT_INTERNAL_ESCP2_H */
 /*
- * End of "$Id: print-escp2.h,v 1.94 2005/06/14 02:49:10 rlk Exp $".
+ * End of "$Id: print-escp2.h,v 1.95 2005/08/14 01:27:44 rlk Exp $".
  */