diff options
Diffstat (limited to 'src/main')
-rw-r--r-- | src/main/Makefile.in | 15 | ||||
-rw-r--r-- | src/main/dither-main.c | 13 | ||||
-rw-r--r-- | src/main/escp2-channels.c | 6 | ||||
-rw-r--r-- | src/main/escp2-driver.c | 31 | ||||
-rw-r--r-- | src/main/escp2-papers.c | 84 | ||||
-rw-r--r-- | src/main/generic-options.c | 8 | ||||
-rw-r--r-- | src/main/path.c | 6 | ||||
-rw-r--r-- | src/main/print-canon.c | 14 | ||||
-rw-r--r-- | src/main/print-color.c | 10 | ||||
-rw-r--r-- | src/main/print-escp2-data.c | 319 | ||||
-rw-r--r-- | src/main/print-escp2.c | 202 | ||||
-rw-r--r-- | src/main/print-escp2.h | 11 | ||||
-rw-r--r-- | src/main/print-lexmark.c | 12 | ||||
-rw-r--r-- | src/main/print-list.c | 4 | ||||
-rw-r--r-- | src/main/print-olympus.c | 10 | ||||
-rw-r--r-- | src/main/print-pcl.c | 52 | ||||
-rw-r--r-- | src/main/print-ps.c | 58 | ||||
-rw-r--r-- | src/main/print-vars.c | 12 | ||||
-rw-r--r-- | src/main/print-weave.c | 27 | ||||
-rw-r--r-- | src/main/printers.xml | 102 | ||||
-rw-r--r-- | src/main/sequence.c | 4 |
21 files changed, 588 insertions, 412 deletions
diff --git a/src/main/Makefile.in b/src/main/Makefile.in index b387ad5..917af77 100644 --- a/src/main/Makefile.in +++ b/src/main/Makefile.in @@ -195,6 +195,8 @@ BUILD_GENPPD_STATIC_FALSE = @BUILD_GENPPD_STATIC_FALSE@ BUILD_GENPPD_STATIC_TRUE = @BUILD_GENPPD_STATIC_TRUE@ BUILD_GHOSTSCRIPT_FALSE = @BUILD_GHOSTSCRIPT_FALSE@ BUILD_GHOSTSCRIPT_TRUE = @BUILD_GHOSTSCRIPT_TRUE@ +BUILD_GIMP2_AS_GUTENPRINT_FALSE = @BUILD_GIMP2_AS_GUTENPRINT_FALSE@ +BUILD_GIMP2_AS_GUTENPRINT_TRUE = @BUILD_GIMP2_AS_GUTENPRINT_TRUE@ BUILD_GIMP2_FALSE = @BUILD_GIMP2_FALSE@ BUILD_GIMP2_TRUE = @BUILD_GIMP2_TRUE@ BUILD_GIMP_FALSE = @BUILD_GIMP_FALSE@ @@ -264,6 +266,7 @@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMSGFMT = @GMSGFMT@ GNUCFLAGS = @GNUCFLAGS@ +GREP = @GREP@ GTK2_CFLAGS = @GTK2_CFLAGS@ GTK2_LIBS = @GTK2_LIBS@ GTK_CFLAGS = @GTK_CFLAGS@ @@ -359,13 +362,10 @@ VERSION = @VERSION@ WHICH_PPDS = @WHICH_PPDS@ XGETTEXT = @XGETTEXT@ YACC = @YACC@ -ac_ct_AR = @ac_ct_AR@ +YFLAGS = @YFLAGS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ am__leading_dot = @am__leading_dot@ am__tar = @am__tar@ am__untar = @am__untar@ @@ -383,6 +383,9 @@ cups_exec_prefix = @cups_exec_prefix@ cups_prefix = @cups_prefix@ cups_sbindir = @cups_sbindir@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ gimp2_plug_indir = @gimp2_plug_indir@ gimp_plug_indir = @gimp_plug_indir@ @@ -400,17 +403,21 @@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ diff --git a/src/main/dither-main.c b/src/main/dither-main.c index 62d6082..759c17a 100644 --- a/src/main/dither-main.c +++ b/src/main/dither-main.c @@ -1,5 +1,5 @@ /* - * "$Id: dither-main.c,v 1.51 2005/12/29 04:07:46 rlk Exp $" + * "$Id: dither-main.c,v 1.52 2006/05/28 16:59:04 rlk Exp $" * * Dither routine entrypoints * @@ -41,14 +41,13 @@ static const stpi_dither_algorithm_t dither_algos[] = { - /* Note to translators: "EvenTone" is the proper name, rather than a */ + /* TRANSLATORS: "EvenTone" is the proper name, rather than a */ /* descriptive name, of this algorithm. */ { "None", N_ ("Default"), -1 }, { "EvenTone", N_ ("EvenTone"), D_EVENTONE }, { "HybridEvenTone", N_ ("Hybrid EvenTone"), D_HYBRID_EVENTONE }, - /* - * Placeholders for future implementation of EvenBetter Screening - * Translators: EvenTone, EvenBetter, and UniTone are proper + /* Placeholders for future implementation of EvenBetter Screening */ + /* TRANSLATORS: EvenTone, EvenBetter, and UniTone are proper * names, not descriptive. */ { "EBS", N_ ("EvenBetter"), D_INVALID }, @@ -145,7 +144,7 @@ stp_dither_describe_parameter(const stp_vars_t *v, const char *name, const stpi_dither_algorithm_t *dt = &dither_algos[i]; if (dt->id != D_INVALID) stp_string_list_add_string(description->bounds.str, - dt->name, dt->text); + dt->name, gettext(dt->text)); } description->deflt.str = stp_string_list_param(description->bounds.str, 0)->name; @@ -180,7 +179,7 @@ stpi_set_dither_function(stp_vars_t *v) { for (i = 0; i < num_dither_algos; i++) { - if (!strcmp(algorithm, _(dither_algos[i].name))) + if (!strcmp(algorithm, gettext(dither_algos[i].name))) { d->stpi_dither_type = dither_algos[i].id; break; diff --git a/src/main/escp2-channels.c b/src/main/escp2-channels.c index 6f258ba..e12edbf 100644 --- a/src/main/escp2-channels.c +++ b/src/main/escp2-channels.c @@ -1,5 +1,5 @@ /* - * "$Id: escp2-channels.c,v 1.61 2006/01/31 03:09:48 rlk Exp $" + * "$Id: escp2-channels.c,v 1.62 2006/06/01 23:49:33 rlk Exp $" * * Print plug-in EPSON ESC/P2 driver for the GIMP. * @@ -671,7 +671,7 @@ DECLARE_INK_CHANNEL(f360_photo2_black); static const physical_subchannel_t photo3_black_subchannels[] = { { 0, 0, 0, "BlackDensity", NULL }, - { 0, 1, 0, "BlackDensity", "GrayTransition" }, + { 0, 1, 0, "BlackDensity", "DarkGrayTransition" }, { 0, 3, 0, "BlackDensity", "LightGrayTransition" } }; @@ -680,7 +680,7 @@ DECLARE_INK_CHANNEL(photo3_black); static const physical_subchannel_t f360_photo3_black_subchannels[] = { { 0, 0, 1, "BlackDensity", NULL }, - { 0, 1, 0, "BlackDensity", "GrayTransition" }, + { 0, 1, 0, "BlackDensity", "DarkGrayTransition" }, { 0, 3, 1, "BlackDensity", "LightGrayTransition" } }; diff --git a/src/main/escp2-driver.c b/src/main/escp2-driver.c index 845a7a1..24ef1c1 100644 --- a/src/main/escp2-driver.c +++ b/src/main/escp2-driver.c @@ -1,5 +1,5 @@ /* - * "$Id: escp2-driver.c,v 1.28 2006/04/30 21:29:52 rlk Exp $" + * "$Id: escp2-driver.c,v 1.30 2006/07/22 20:28:13 rlk Exp $" * * Print plug-in EPSON ESC/P2 driver for the GIMP. * @@ -113,6 +113,7 @@ print_debug_params(stp_vars_t *v) print_remote_int_param(v, "Page_width", pd->page_width); print_remote_int_param(v, "Page_height", pd->page_height); print_remote_int_param(v, "Page_true_height", pd->page_true_height); + print_remote_int_param(v, "Page_extra_height", pd->page_extra_height); print_remote_int_param(v, "Image_left", pd->image_left); print_remote_int_param(v, "Image_top", pd->image_top); print_remote_int_param(v, "Image_width", pd->image_width); @@ -340,10 +341,29 @@ escp2_set_printhead_speed(stp_vars_t *v) unidirectional = 1; else if (direction && strcmp(direction, "Bidirectional") == 0) unidirectional = 0; - else if (pd->res->hres >= 720 && pd->res->vres >= 720) - unidirectional = 1; + else if (pd->res->printed_hres * pd->res->printed_vres * + pd->res->vertical_passes >= pd->bidirectional_upper_limit) + { + stp_dprintf(STP_DBG_ESCP2, v, + "Setting unidirectional: hres %d vres %d passes %d total %d limit %d\n", + pd->res->printed_hres, pd->res->printed_vres, + pd->res->vertical_passes, + (pd->res->printed_hres * pd->res->printed_vres * + pd->res->vertical_passes), + pd->bidirectional_upper_limit); + unidirectional = 1; + } else - unidirectional = 0; + { + stp_dprintf(STP_DBG_ESCP2, v, + "Setting bidirectional: hres %d vres %d passes %d total %d limit %d\n", + pd->res->printed_hres, pd->res->printed_vres, + pd->res->vertical_passes, + (pd->res->printed_hres * pd->res->printed_vres * + pd->res->vertical_passes), + pd->bidirectional_upper_limit); + unidirectional = 0; + } if (unidirectional) { stp_send_command(v, "\033U", "c", 1); @@ -397,7 +417,8 @@ escp2_set_form_factor(stp_vars_t *v) if (pd->advanced_command_set) { int w = pd->page_width * pd->page_management_units / 72; - int h = pd->page_true_height * pd->page_management_units / 72; + int h = (pd->page_true_height + pd->page_extra_height) * + pd->page_management_units / 72; if (stp_get_boolean_parameter(v, "FullBleed")) /* Make the page 160/360" wider for full bleed printing. */ diff --git a/src/main/escp2-papers.c b/src/main/escp2-papers.c index 6a71ac1..c32e51f 100644 --- a/src/main/escp2-papers.c +++ b/src/main/escp2-papers.c @@ -1,5 +1,5 @@ /* - * "$Id: escp2-papers.c,v 1.97 2006/04/13 12:10:04 rlk Exp $" + * "$Id: escp2-papers.c,v 1.99 2006/05/31 23:15:22 rlk Exp $" * * Print plug-in EPSON ESC/P2 driver for the GIMP. * @@ -911,45 +911,45 @@ DECLARE_PAPER_ADJUSTMENTS(ultrachrome_k3_photo); static const paper_adjustment_t ultrachrome_k3_matte_adjustments[] = { - { "Plain", 0.72, .1, 1, 0, 1.25, 1, .95, .9, .6, 1, 1.0, + { "Plain", 0.72, .1, 1, 0, 1.25, 1, .95, .9, 1, 1, 1.0, ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj }, - { "PlainFast", 0.72, .1, 1, 0, 1.25, 1, .95, .9, .6, 1, 1.0, + { "PlainFast", 0.72, .1, 1, 0, 1.25, 1, .95, .9, 1, 1, 1.0, ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj }, - { "Postcard", 0.72, .1, 1, 0, 1.25, 1, .95, .9, .6, 1, 1.0, + { "Postcard", 0.72, .1, 1, 0, 1.25, 1, .95, .9, 1, 1, 1.0, ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj }, - { "GlossyFilm", 0.83, .5, 1, 0.00, 1.25, 1, .95, .9, .6, 1, 1.0, + { "GlossyFilm", 0.83, .5, 1, 0.00, 1.25, 1, .95, .9, 1, 1, 1.0, ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj }, - { "Transparency", 0.83, .5, 1, 0.00, 1.25, 1, .95, .9, .6, 1, 1.0, + { "Transparency", 0.83, .5, 1, 0.00, 1.25, 1, .95, .9, 1, 1, 1.0, ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj }, - { "Envelope", 0.72, .1, 1, 0, 1.25, 1, .95, .9, .6, 1, 1.0, + { "Envelope", 0.72, .1, 1, 0, 1.25, 1, .95, .9, 1, 1, 1.0, ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj }, - { "BackFilm", 0.83, .5, 1, 0.00, 1.25, 1, .95, .9, .6, 1, 1.0, + { "BackFilm", 0.83, .5, 1, 0.00, 1.25, 1, .95, .9, 1, 1, 1.0, ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj }, - { "Matte", 0.92, 0.5, 1, 0.00, 1.25, 1, .95, .9, .6, 1, 1.0, + { "Matte", 0.92, 0.5, 1, 0.00, 1.25, 1, .95, .9, 1, 1, 1.0, ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj }, - { "MatteHeavy", 0.92, 0.5, 1, .00, 1.25, 1, .95, .9, .6, 1, 1.0, + { "MatteHeavy", 0.92, 0.5, 1, .00, 1.25, 1, .95, .9, 1, 1, 1.0, ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj }, - { "Inkjet", 0.72, .3, 1, .00, 1.25, 1, .95, .9, .6, 1, 1.0, + { "Inkjet", 0.72, .3, 1, .00, 1.25, 1, .95, .9, 1, 1, 1.0, ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj }, - { "Coated", 0.83, .4, 1, .00, 1.25, 1, .95, .9, .6, 1, 1.0, + { "Coated", 0.83, .4, 1, .00, 1.25, 1, .95, .9, 1, 1, 1.0, ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj }, - { "Photo", 1.0, 0.5, 1, 0.00, 1.25, 1, .95, .9, .6, 1, 1.0, + { "Photo", 1.0, 0.5, 1, 0.00, 1.25, 1, .95, .9, 1, 1, 1.0, ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj }, - { "GlossyPhoto", 0.72, 1, 1, .00, 1.25, 1, .95, .9, .6, 1, .92, + { "GlossyPhoto", 0.72, 1, 1, .00, 1.25, 1, .95, .9, 1, 1, .92, ultra_k3_glossy_hue_adj, ultra_k3_glossy_lum_adj, ultra_k3_glossy_sat_adj }, - { "Semigloss", 0.72, .8, 1, .00, 1.25, 1, .95, .9, .6, 1, .92, + { "Semigloss", 0.72, .8, 1, .00, 1.25, 1, .95, .9, 1, 1, .92, ultra_k3_glossy_hue_adj, ultra_k3_glossy_lum_adj, ultra_k3_glossy_sat_adj }, - { "Luster", 0.72, .8, 1, .00, 1.25, 1, .95, .9, .6, 1, .92, + { "Luster", 0.72, .8, 1, .00, 1.25, 1, .95, .9, 1, 1, .92, ultra_k3_glossy_hue_adj, ultra_k3_glossy_lum_adj, ultra_k3_glossy_sat_adj }, - { "WaterColorRadiant", 0.92, 0.4, 1, .00, 1.25, 1, .95, .9, .6, 1, 1.0, + { "WaterColorRadiant", 0.92, 0.4, 1, .00, 1.25, 1, .95, .9, 1, 1, 1.0, ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj }, - { "GlossyPaper", 0.83, 0.5, 1, 0.00, 1.25, 1, .95, .9, .6, 1, 1.0, + { "GlossyPaper", 0.83, 0.5, 1, 0.00, 1.25, 1, .95, .9, 1, 1, 1.0, ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj }, - { "Ilford", 0.83, 0.5, 1, 0.00, 1.25, 1, .95, .9, .6, 1, 1.0, + { "Ilford", 0.83, 0.5, 1, 0.00, 1.25, 1, .95, .9, 1, 1, 1.0, ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj }, - { "ColorLife", 0.83, 0.5, 1, 0.00, 1.25, 1, .95, .9, .6, 1, 1.0, + { "ColorLife", 0.83, 0.5, 1, 0.00, 1.25, 1, .95, .9, 1, 1, 1.0, ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj }, - { "Other", 0.72, .1, .4, 0, 1.25, 1, .95, .9, .6, 1, 1.0, + { "Other", 0.72, .1, .4, 0, 1.25, 1, .95, .9, 1, 1, 1.0, ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj }, }; @@ -1011,47 +1011,47 @@ DECLARE_PAPER_ADJUSTMENTS(r800_photo); static const paper_adjustment_t r800_matte_adjustments[] = { - { "Plain", 0.72, .1, .5, .025, .5, .882, 1, .250, .6, 1, 1.0, + { "Plain", 0.72, .1, .5, .025, .999, .882, 1, .250, 1, 1, 1.0, r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj }, - { "PlainFast", 0.72, .1, .5, .025, .5, .882, 1, .250, .6, 1, 1.0, + { "PlainFast", 0.72, .1, .5, .025, .999, .882, 1, .250, 1, 1, 1.0, r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj }, - { "Postcard", 0.72, .1, .5, .025, .5, .882, 1, .250, .6, 1, 1.0, + { "Postcard", 0.72, .1, .5, .025, .999, .882, 1, .250, 1, 1, 1.0, r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj }, - { "GlossyFilm", 0.83, .5, .5, .025, .5, .882, 1, .250, .6, 1, 1.0, + { "GlossyFilm", 0.83, .5, .5, .025, .999, .882, 1, .250, 1, 1, 1.0, r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj }, - { "Transparency", 0.83, .5, .5, .025, .5, .882, 1, .250, .6, 1, 1.0, + { "Transparency", 0.83, .5, .5, .025, .999, .882, 1, .250, 1, 1, 1.0, r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj }, - { "Envelope", 0.72, .1, .5, .025, .5, .882, 1, .250, .6, 1, 1.0, + { "Envelope", 0.72, .1, .5, .025, .999, .882, 1, .250, 1, 1, 1.0, r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj }, - { "BackFilm", 0.83, .5, .5, .025, .5, .882, 1, .250, .6, 1, 1.0, + { "BackFilm", 0.83, .5, .5, .025, .999, .882, 1, .250, 1, 1, 1.0, r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj }, - { "Matte", 0.92, 0.4, .5, .025, .5, .882, 1, .250, .6, 1, 1.0, + { "Matte", 0.92, 0.4, .5, .025, .999, .882, 1, .250, 1, 1, 1.0, r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj }, - { "MatteHeavy", 0.92, 0.4, .4, .01, .5, .882, 1, .250, .6, 1, 1.0, + { "MatteHeavy", 0.92, 0.4, .5, .025, .999, .882, 1, .250, 1, 1, 1.0, r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj }, - { "Inkjet", 0.72, .3, .5, .025, .5, .882, 1, .250, .6, 1, 1.0, + { "Inkjet", 0.72, .3, .5, .025, .999, .882, 1, .250, 1, 1, 1.0, r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj }, - { "Coated", 0.83, .4, .5, .025, .5, .882, 1, .250, .6, 1, 1.0, + { "Coated", 0.83, .4, .5, .025, .999, .882, 1, .250, 1, 1, 1.0, r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj }, - { "Photo", 1.0, 0.5, .5, .025, .5, .882, 1, .250, .6, 1, 1.0, + { "Photo", 1.0, 0.5, .5, .025, .999, .882, 1, .250, 1, 1, 1.0, r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj }, - { "GlossyPhoto", 0.546, 1, .5, .025, .5, .882, 1, .250, .6, 1, 0.92, + { "GlossyPhoto", 0.546, 1, .5, .025, .999, .882, 1, .250, 1, 1, 0.92, r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj }, - { "Semigloss", 0.546, .8, .5, .025, .5, .882, 1, .250, .6, 1, 0.92, + { "Semigloss", 0.546, .8, .5, .025, .999, .882, 1, .250, 1, 1, 0.92, r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj }, - { "Luster", 0.546, .8, .5, .025, .5, .882, 1, .250, .6, 1, 0.92, + { "Luster", 0.546, .8, .5, .025, .999, .882, 1, .250, 1, 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, .250, .6, 1, 1.0, + { "ArchivalMatte", 0.92, 0.4, .5, .025, .999, .882, 1, .250, 1, 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, .250, .6, 1, 1.0, + { "WaterColorRadiant", 0.92, 0.4, .5, .025, .999, .882, 1, .250, 1, 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, .250, .6, 1, 1.0, + { "GlossyPaper", 0.83, 0.5, .5, .025, .999, .882, 1, .250, 1, 1, 1.0, r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj }, - { "Ilford", 0.83, 0.5, .5, .025, .5, .882, 1, .250, .6, 1, 1.0, + { "Ilford", 0.83, 0.5, .5, .025, .999, .882, 1, .250, 1, 1, 1.0, r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj }, - { "ColorLife", 0.83, 0.5, .5, .025, .5, .882, 1, .250, .6, 1, 1.0, + { "ColorLife", 0.83, 0.5, .5, .025, .999, .882, 1, .250, 1, 1, 1.0, r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj }, - { "Other", 0.72, .1, .5, .025, .5, .882, 1, .250, .6, 1, 1.0, + { "Other", 0.72, .1, .5, .025, .999, .882, 1, .250, 1, 1, 1.0, r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj }, }; diff --git a/src/main/generic-options.c b/src/main/generic-options.c index 25bc373..fc9746c 100644 --- a/src/main/generic-options.c +++ b/src/main/generic-options.c @@ -1,5 +1,5 @@ /* - * "$Id: generic-options.c,v 1.9 2004/11/22 13:31:40 rlk Exp $" + * "$Id: generic-options.c,v 1.10 2006/05/28 16:59:04 rlk Exp $" * * Copyright 2003 Robert Krawitz (rlk@alum.mit.edu) * @@ -215,7 +215,7 @@ stpi_describe_generic_parameter(const stp_vars_t *v, const char *name, { const stpi_quality_t *qual = stpi_get_quality_by_index(i); stp_string_list_add_string(description->bounds.str, qual->name, - qual->text); + gettext(qual->text)); } description->deflt.str = "Standard"; #else @@ -232,7 +232,7 @@ stpi_describe_generic_parameter(const stp_vars_t *v, const char *name, { const stpi_image_type_t *itype = stpi_get_image_type_by_index(i); stp_string_list_add_string(description->bounds.str, itype->name, - itype->text); + gettext(itype->text)); } description->deflt.str = "TextGraphics"; } @@ -243,7 +243,7 @@ stpi_describe_generic_parameter(const stp_vars_t *v, const char *name, { const stpi_job_mode_t *itype = stpi_get_job_mode_by_index(i); stp_string_list_add_string(description->bounds.str, itype->name, - itype->text); + gettext(itype->text)); } description->deflt.str = "Page"; } diff --git a/src/main/path.c b/src/main/path.c index d59c625..03ad06e 100644 --- a/src/main/path.c +++ b/src/main/path.c @@ -1,5 +1,5 @@ /* - * "$Id: path.c,v 1.18 2005/10/18 02:08:17 rlk Exp $" + * "$Id: path.c,v 1.19 2006/07/07 21:31:02 rleigh Exp $" * * Gutenprint path functions - split and search paths. * @@ -49,8 +49,8 @@ static int dirent_sort(const void *a, const void *b) { - return strcoll ((*(const struct dirent **) a)->d_name, - (*(const struct dirent **) b)->d_name); + return strcoll ((*(const struct dirent * const *) a)->d_name, + (*(const struct dirent * const *) b)->d_name); } diff --git a/src/main/print-canon.c b/src/main/print-canon.c index 090e9f1..5104c40 100644 --- a/src/main/print-canon.c +++ b/src/main/print-canon.c @@ -1,5 +1,5 @@ /* - * "$Id: print-canon.c,v 1.173 2006/05/12 22:43:23 rlk Exp $" + * "$Id: print-canon.c,v 1.174 2006/05/28 16:59:04 rlk Exp $" * * Print plug-in CANON BJL driver for the GIMP. * @@ -2001,7 +2001,7 @@ canon_parameters(const stp_vars_t *v, const char *name, if (stp_string_list_count(description->bounds.str) == 0) description->deflt.str = pt->name; stp_string_list_add_string(description->bounds.str, - pt->name, pt->text); + pt->name, gettext(pt->text)); } } } @@ -2021,14 +2021,14 @@ canon_parameters(const stp_vars_t *v, const char *name, while (res->x > 0) { if (xx == res->x && yy == res->y) { stp_string_list_add_string(description->bounds.str, - res->name, _(res->text)); + res->name, gettext(res->text)); stp_deprintf(STP_DBG_CANON,"supports mode '%s'\n", res->name); if (xx >= 300 && yy >= 300 && description->deflt.str == NULL) description->deflt.str = res->name; if (t == 1) { stp_string_list_add_string(description->bounds.str, - res->name_dmt, _(res->text_dmt)); + res->name_dmt, gettext(res->text_dmt)); stp_deprintf(STP_DBG_CANON,"supports mode '%s'\n", res->name_dmt); } @@ -2086,7 +2086,7 @@ canon_parameters(const stp_vars_t *v, const char *name, for (i = 0; i < count; i ++) stp_string_list_add_string(description->bounds.str, canon_paper_list[i].name, - _(canon_paper_list[i].text)); + gettext(canon_paper_list[i].text)); } else if (strcmp(name, "InputSlot") == 0) { @@ -2096,7 +2096,7 @@ canon_parameters(const stp_vars_t *v, const char *name, for (i = 0; i < count; i ++) stp_string_list_add_string(description->bounds.str, media_sources[i].name, - _(media_sources[i].text)); + gettext(media_sources[i].text)); } else if (strcmp(name, "PrintingMode") == 0) { @@ -2133,7 +2133,7 @@ canon_parameters(const stp_vars_t *v, const char *name, for (i=0; i < NUM_DUPLEX; i++) { stp_string_list_add_string(description->bounds.str, - duplex_types[i].name,_(duplex_types[i].text)); + duplex_types[i].name,gettext(duplex_types[i].text)); } } else diff --git a/src/main/print-color.c b/src/main/print-color.c index 43eedc4..733789b 100644 --- a/src/main/print-color.c +++ b/src/main/print-color.c @@ -1,5 +1,5 @@ /* - * "$Id: print-color.c,v 1.134 2005/12/30 20:31:35 rlk Exp $" + * "$Id: print-color.c,v 1.135 2006/05/28 16:59:04 rlk Exp $" * * Gutenprint color management module - traditional Gutenprint algorithm. * @@ -1547,7 +1547,7 @@ stpi_color_traditional_describe_parameter(const stp_vars_t *v, for (j = 0; j < color_correction_count; j++) stp_string_list_add_string (description->bounds.str, color_corrections[j].name, - _(color_corrections[j].text)); + gettext(color_corrections[j].text)); description->deflt.str = stp_string_list_param(description->bounds.str, 0)->name; } @@ -1575,14 +1575,14 @@ stpi_color_traditional_describe_parameter(const stp_vars_t *v, stp_string_list_add_string (description->bounds.str, color_descriptions[j].name, - _(color_descriptions[j].name)); + gettext(color_descriptions[j].name)); stp_parameter_description_destroy(&desc); } else stp_string_list_add_string (description->bounds.str, color_descriptions[j].name, - _(color_descriptions[j].name)); + gettext(color_descriptions[j].name)); } description->deflt.str = stp_string_list_param(description->bounds.str, 0)->name; @@ -1594,7 +1594,7 @@ stpi_color_traditional_describe_parameter(const stp_vars_t *v, if (color_descriptions[j].output) stp_string_list_add_string (description->bounds.str, color_descriptions[j].name, - _(color_descriptions[j].name)); + gettext(color_descriptions[j].name)); description->deflt.str = stp_string_list_param(description->bounds.str, 0)->name; } diff --git a/src/main/print-escp2-data.c b/src/main/print-escp2-data.c index e5c33d7..43f496b 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.199 2006/05/06 21:30:59 rlk Exp $" + * "$Id: print-escp2-data.c,v 1.202 2006/07/22 20:28:13 rlk Exp $" * * Print plug-in EPSON ESC/P2 driver for the GIMP. * @@ -28,6 +28,7 @@ #include "gutenprint-internal.h" #include <gutenprint/gutenprint-intl-internal.h> #include "print-escp2.h" +#include <limits.h> /* * Dot sizes are for: @@ -704,8 +705,8 @@ static const quality_t p1_5_qualities[] = { "Standard", N_("Standard"), 0, 0, 0, 0, 720, 360 }, { "High", N_("High"), 0, 0, 0, 0, 720, 720 }, { "Photo", N_("Photo"), 1440, 720, 1440, 720, 1440, 720 }, - { "HighPhoto", N_("Super Photo"), 1440, 1440, 1440, 1440, 1440, 1440 }, - { "UltraPhoto", N_("Ultra Photo"), 1440, 2880, 1440, 2880, 1440, 2880 }, + { "HighPhoto", N_("Super Photo"), 1440, 1440, 2880, 1440, 1440, 1440 }, + { "UltraPhoto", N_("Ultra Photo"), 2880, 2880, 2880, 2880, 2880, 2880 }, { "Best", N_("Best"), 720, 360, 0, 0, -1, -1 }, }; @@ -875,9 +876,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] = MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO | MODEL_PACKET_MODE_NO), 15, 1, 4, 15, 1, 4, 15, 1, 4, 4, - 360, 14400, -1, 720, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, + 360, 14400, -1, 720, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, 720 * 720, INCH(17 / 2), INCH(44), INCH(2), INCH(2), - 9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, + 9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0, 1, 7, 0, 0, g1_dotsizes, g1_densities, &stpi_escp2_simple_drops, stpi_escp2_720dpi_reslist, &stpi_escp2_standard_inkgroup, @@ -892,9 +893,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] = MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO | MODEL_PACKET_MODE_NO), 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, - 360, 14400, -1, 720, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, + 360, 14400, -1, 720, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, 720 * 720, INCH(17 / 2), INCH(44), INCH(2), INCH(2), - 9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, + 9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0, 1, 7, 0, 0, g2_dotsizes, g1_densities, &stpi_escp2_simple_drops, stpi_escp2_sc500_reslist, &stpi_escp2_standard_inkgroup, @@ -909,9 +910,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] = MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO | MODEL_PACKET_MODE_NO), 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, - 360, 14400, -1, 720, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, + 360, 14400, -1, 720, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, 720 * 720, INCH(17), INCH(44), INCH(2), INCH(2), - 9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, + 9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0, 1, 7, 0, 0, g1_dotsizes, sc1500_densities, &stpi_escp2_simple_drops, stpi_escp2_sc500_reslist, &stpi_escp2_cmy_inkgroup, @@ -926,9 +927,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] = MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO | MODEL_PACKET_MODE_NO), 32, 1, 4, 32, 1, 4, 32, 1, 4, 4, - 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 8, 1, + 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 8, 1, 720 * 720, INCH(17 / 2), INCH(44), INCH(2), INCH(2), - 8, 9, 0, 30, 8, 9, 0, 30, 8, 9, 0, 0, 8, 9, 0, 0, -1, -1, 0, 0, + 8, 9, 0, 30, 8, 9, 0, 30, 8, 9, 0, 0, 8, 9, 0, 0, -1, -1, 0, 0, 0, 1, 7, 0, 0, sc600_dotsizes, g3_densities, &stpi_escp2_simple_drops, stpi_escp2_g3_reslist, &stpi_escp2_standard_inkgroup, @@ -943,9 +944,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] = MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO | MODEL_PACKET_MODE_NO), 64, 1, 2, 64, 1, 2, 64, 1, 2, 4, - 360, 14400, -1, 1440, 720, 180, 180, 0, 1, 4, 0, 0, 0, 0, 1, + 360, 14400, -1, 1440, 720, 180, 180, 0, 1, 4, 0, 0, 0, 0, 1, 720 * 720, INCH(17 / 2), INCH(44), INCH(2), INCH(2), - 8, 9, 9, 40, 8, 9, 9, 40, 8, 9, 0, 0, 8, 9, 0, 0, -1, -1, 0, 0, + 8, 9, 9, 40, 8, 9, 9, 40, 8, 9, 0, 0, 8, 9, 0, 0, -1, -1, 0, 0, 0, 1, 7, 0, 0, g3_dotsizes, g3_densities, &stpi_escp2_simple_drops, stpi_escp2_g3_reslist, &stpi_escp2_standard_inkgroup, @@ -960,9 +961,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] = MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO | MODEL_PACKET_MODE_NO), 64, 1, 2, 64, 1, 2, 64, 1, 2, 4, - 360, 14400, -1, 1440, 720, 180, 180, 0, 1, 4, 0, 0, 0, 0, 1, + 360, 14400, -1, 1440, 720, 180, 180, 0, 1, 4, 0, 0, 0, 0, 1, 720 * 720, INCH(17 / 2), INCH(44), INCH(2), INCH(2), - 9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, + 9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0, 1, 7, 0, 0, g3_dotsizes, g3_densities, &stpi_escp2_simple_drops, stpi_escp2_g3_reslist, &stpi_escp2_standard_inkgroup, @@ -977,9 +978,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] = MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO | MODEL_PACKET_MODE_NO), 64, 1, 2, 64, 1, 2, 64, 1, 2, 4, - 360, 14400, -1, 1440, 720, 180, 180, 0, 1, 4, 0, 0, 0, 0, 1, + 360, 14400, -1, 1440, 720, 180, 180, 0, 1, 4, 0, 0, 0, 0, 1, 720 * 720, INCH(17), INCH(44), INCH(2), INCH(2), - 8, 9, 9, 40, 8, 9, 9, 40, 8, 9, 0, 0, 8, 9, 0, 0, -1, -1, 0, 0, + 8, 9, 9, 40, 8, 9, 9, 40, 8, 9, 0, 0, 8, 9, 0, 0, -1, -1, 0, 0, 0, 1, 7, 0, 0, g3_dotsizes, g3_densities, &stpi_escp2_simple_drops, stpi_escp2_g3_reslist, &stpi_escp2_standard_inkgroup, @@ -996,9 +997,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] = MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO | MODEL_PACKET_MODE_NO), 32, 1, 4, 32, 1, 4, 32, 1, 4, 6, - 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 8, 1, + 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 8, 1, 720 * 720, INCH(17 / 2), INCH(44), INCH(2), INCH(2), - 9, 9, 0, 30, 9, 9, 0, 30, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, + 9, 9, 0, 30, 9, 9, 0, 30, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0, 1, 15, 0, 0, /* Is it really 15 pairs??? */ sp700_dotsizes, sp700_densities, &stpi_escp2_simple_drops, stpi_escp2_g3_reslist, &stpi_escp2_photo_gen1_inkgroup, @@ -1013,9 +1014,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] = MODEL_SEND_ZERO_ADVANCE_NO | MODEL_SUPPORTS_INK_CHANGE_NO | MODEL_PACKET_MODE_NO), 32, 1, 4, 32, 1, 4, 32, 1, 4, 6, - 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 8, 1, + 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 8, 1, 720 * 720, INCH(118 / 10), INCH(44), INCH(2), INCH(2), - 9, 9, 0, 30, 9, 9, 0, 30, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, + 9, 9, 0, 30, 9, 9, 0, 30, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0, 1, 7, 0, 0, sp700_dotsizes, sp700_densities, &stpi_escp2_simple_drops, stpi_escp2_g3_reslist, &stpi_escp2_photo_gen1_inkgroup, @@ -1030,9 +1031,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] = MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO | MODEL_PACKET_MODE_NO), 32, 1, 4, 32, 1, 4, 32, 1, 4, 6, - 360, 14400, -1, 720, 720, 90, 90, 0, 1, 0, 0, 0, 0, 8, 1, + 360, 14400, -1, 720, 720, 90, 90, 0, 1, 0, 0, 0, 0, 8, 1, 720 * 720, INCH(17 / 2), INCH(44), INCH(2), INCH(2), - 9, 9, 0, 30, 9, 9, 0, 30, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, + 9, 9, 0, 30, 9, 9, 0, 30, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0, 1, 7, 0, 0, sp700_dotsizes, sp700_densities, &stpi_escp2_simple_drops, stpi_escp2_g3_720dpi_reslist, &stpi_escp2_photo_gen1_inkgroup, @@ -1049,9 +1050,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] = MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO | MODEL_PACKET_MODE_NO), 21, 1, 4, 21, 1, 4, 21, 1, 4, 4, - 360, 14400, -1, 720, 720, 90, 90, 0, 1, 0, 0, 0, 0, 8, 1, + 360, 14400, -1, 720, 720, 90, 90, 0, 1, 0, 0, 0, 0, 8, 1, 720 * 720, INCH(17 / 2), INCH(44), INCH(2), INCH(2), - 9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, + 9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0, 1, 15, 0, 0, sc440_dotsizes, sc440_densities, &stpi_escp2_simple_drops, stpi_escp2_g3_720dpi_reslist, &stpi_escp2_standard_inkgroup, @@ -1066,9 +1067,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] = MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO | MODEL_PACKET_MODE_NO), 32, 1, 4, 32, 1, 4, 32, 1, 4, 4, - 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 8, 1, + 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 8, 1, 720 * 720, INCH(17 / 2), INCH(44), INCH(2), INCH(2), - 9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, + 9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0, 1, 15, 0, 0, sc640_dotsizes, sc440_densities, &stpi_escp2_simple_drops, stpi_escp2_sc640_reslist, &stpi_escp2_standard_inkgroup, @@ -1083,9 +1084,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] = MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO | MODEL_PACKET_MODE_NO), 48, 1, 3, 144, 1, 1, 144, 1, 1, 4, - 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, + 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, 720 * 720, INCH(17 / 2), INCH(44), INCH(2), INCH(2), - 9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, + 9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0, 3, 15, 0, 0, c6pl_dotsizes, c6pl_densities, &stpi_escp2_variable_6pl_drops, stpi_escp2_1440dpi_reslist, &stpi_escp2_standard_inkgroup, @@ -1100,9 +1101,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] = MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO | MODEL_PACKET_MODE_YES), 96, 1, 2, 192, 1, 1, 192, 1, 1, 4, - 360, 14400, -1, 1440, 720, 180, 180, 0, 1, 0, 0, 0, 0, 0, 1, + 360, 14400, -1, 1440, 720, 180, 180, 0, 1, 0, 0, 0, 0, 0, 1, 720 * 720, INCH(17 / 2), INCH(44), INCH(2), INCH(2), - 9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, + 9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0, 3, 15, 0, 0, c3pl_dotsizes, c3pl_densities, &stpi_escp2_variable_3pl_drops, stpi_escp2_1440dpi_reslist, &stpi_escp2_standard_inkgroup, @@ -1117,9 +1118,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] = MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO | MODEL_PACKET_MODE_YES), 48, 1, 3, 48, 1, 3, 48, 1, 3, 6, - 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, + 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, 720 * 720, INCH(17 / 2), INCH(44), INCH(2), INCH(2), - 9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, + 9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0, 3, 15, 0, 0, c6pl_dotsizes, c6pl_densities, &stpi_escp2_variable_6pl_drops, stpi_escp2_1440dpi_reslist, &stpi_escp2_photo_gen1_inkgroup, @@ -1134,9 +1135,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] = MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO | MODEL_PACKET_MODE_YES), 48, 1, 3, 48, 1, 3, 48, 1, 3, 6, - 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, + 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, 720 * 720, INCH(13), INCH(44), INCH(2), INCH(2), - 9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, + 9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0, 3, 15, 0, 0, c6pl_dotsizes, c6pl_densities, &stpi_escp2_variable_6pl_drops, stpi_escp2_1440dpi_reslist, &stpi_escp2_photo_gen1_inkgroup, @@ -1151,9 +1152,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] = MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO | MODEL_PACKET_MODE_YES), 48, 1, 3, 144, 1, 1, 144, 1, 1, 4, - 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, + 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, 720 * 720, INCH(17 / 2), INCH(44), INCH(2), INCH(2), - 9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, + 9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0, 3, 15, 0, 0, c4pl_dotsizes, c4pl_densities, &stpi_escp2_variable_1440_4pl_drops, stpi_escp2_1440dpi_reslist, &stpi_escp2_standard_inkgroup, @@ -1168,9 +1169,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] = MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO | MODEL_PACKET_MODE_YES), 48, 1, 3, 144, 1, 1, 144, 1, 1, 4, - 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, + 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, 720 * 720, INCH(13), INCH(44), INCH(2), INCH(2), - 9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, + 9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0, 3, 15, 0, 0, c4pl_dotsizes, c4pl_densities, &stpi_escp2_variable_1440_4pl_drops, stpi_escp2_1440dpi_reslist, &stpi_escp2_standard_inkgroup, @@ -1185,9 +1186,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] = MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO | MODEL_PACKET_MODE_YES), 32, 1, 4, 32, 1, 4, 32, 1, 4, 4, - 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 8, 1, + 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 8, 1, 720 * 720, INCH(17 / 2), INCH(44), INCH(2), INCH(2), - 9, 9, 9, 9, 9, 9, 9, 26, 9, 9, 9, 0, 9, 9, 9, 0, -1, -1, 0, 0, + 9, 9, 9, 9, 9, 9, 9, 26, 9, 9, 9, 0, 9, 9, 9, 0, -1, -1, 0, 0, 0, 1, 15, 0, 0, sc660_dotsizes, sc660_densities, &stpi_escp2_simple_drops, stpi_escp2_sc640_reslist, &stpi_escp2_standard_inkgroup, @@ -1202,9 +1203,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] = MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO | MODEL_PACKET_MODE_YES), 48, 1, 3, 144, 1, 1, 144, 1, 1, 4, - 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, + 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, 720 * 720, INCH(17 / 2), INCH(44), INCH(2), INCH(2), - 9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, + 9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0, 3, 15, 0, 0, c4pl_dotsizes, c4pl_densities, &stpi_escp2_variable_1440_4pl_drops, stpi_escp2_1440dpi_reslist, &stpi_escp2_standard_inkgroup, @@ -1219,9 +1220,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] = MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO | MODEL_PACKET_MODE_YES), 32, 1, 4, 32, 1, 4, 32, 1, 4, 6, - 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, + 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, 720 * 720, INCH(17 / 2), INCH(44), INCH(2), INCH(2), - 9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, + 9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0, 3, 15, 0, 0, sp720_dotsizes, c6pl_densities, &stpi_escp2_variable_6pl_drops, stpi_escp2_1440dpi_reslist, &stpi_escp2_photo_gen1_inkgroup, @@ -1236,9 +1237,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] = MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_YES | MODEL_PACKET_MODE_YES), 15, 15, 3, 48, 48, 3, 48, 48, 3, 4, - 360, 14400, 360, 720, 720, 90, 90, 0, 1, 0, 0, -99, 0, 0, 1, + 360, 14400, 360, 720, 720, 90, 90, 0, 1, 0, 0, -99, 0, 0, 1, 720 * 720, INCH(17 / 2), INCH(1200), INCH(2), INCH(2), - 9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, + 9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0, 3, 15, 0, 0, sc480_dotsizes, sc480_densities, &stpi_escp2_variable_x80_6pl_drops, stpi_escp2_720dpi_soft_reslist, &stpi_escp2_x80_inkgroup, @@ -1253,9 +1254,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] = MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO | MODEL_PACKET_MODE_YES), 48, 1, 3, 48, 1, 3, 48, 1, 3, 6, - 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 97, 0, 0, 0, 1, + 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 97, 0, 0, 0, 1, 720 * 720, INCH(17 / 2), INCH(1200), INCH(2), INCH(2), - 9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, + 9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0, 3, 15, 0, 0, c4pl_dotsizes, c4pl_densities, &stpi_escp2_variable_1440_4pl_drops, stpi_escp2_1440dpi_reslist, &stpi_escp2_photo_gen2_inkgroup, @@ -1270,9 +1271,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] = MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO | MODEL_PACKET_MODE_YES), 48, 1, 3, 48, 1, 3, 48, 1, 3, 6, - 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 97, 0, 0, 0, 1, + 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 97, 0, 0, 0, 1, 720 * 720, INCH(13), INCH(1200), INCH(2), INCH(2), - 9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, + 9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0, 3, 15, 0, 0, c4pl_dotsizes, c4pl_densities, &stpi_escp2_variable_1440_4pl_drops, stpi_escp2_1440dpi_reslist, &stpi_escp2_photo_gen2_inkgroup, @@ -1287,9 +1288,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] = MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO | MODEL_PACKET_MODE_NO), 64, 1, 2, 64, 1, 2, 64, 1, 2, 4, - 360, 14400, -1, 1440, 720, 180, 180, 0, 1, 4, 0, 0, 0, 0, 1, + 360, 14400, -1, 1440, 720, 180, 180, 0, 1, 4, 0, 0, 0, 0, 1, 720 * 720, INCH(17), INCH(44), INCH(2), INCH(2), - 8, 9, 9, 40, 8, 9, 9, 40, 8, 9, 0, 0, 8, 9, 0, 0, -1, -1, 0, 0, + 8, 9, 9, 40, 8, 9, 9, 40, 8, 9, 0, 0, 8, 9, 0, 0, -1, -1, 0, 0, 0, 1, 7, 0, 0, g3_dotsizes, g3_densities, &stpi_escp2_simple_drops, stpi_escp2_g3_reslist, &stpi_escp2_standard_inkgroup, @@ -1304,9 +1305,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] = MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO | MODEL_PACKET_MODE_YES), 32, 1, 4, 64, 1, 2, 64, 1, 2, 4, - 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, + 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, 720 * 720, INCH(17 / 2), INCH(1200), INCH(2), INCH(2), - 9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, + 9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0, 3, 15, 0, 0, sc670_dotsizes, c6pl_densities, &stpi_escp2_variable_6pl_drops, stpi_escp2_1440dpi_reslist, &stpi_escp2_standard_inkgroup, @@ -1321,9 +1322,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] = MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO | MODEL_PACKET_MODE_YES), 48, 1, 3, 144, 1, 1, 144, 1, 1, 6, - 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, + 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, 720 * 720, INCH(13), INCH(1200), INCH(2), INCH(2), - 9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, + 9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0, 2, 15, 0, 0, sp2000_dotsizes, sp2000_densities, &stpi_escp2_variable_2000p_drops, stpi_escp2_1440dpi_reslist, &stpi_escp2_photo_pigment_inkgroup, @@ -1338,9 +1339,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] = MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO | MODEL_PACKET_MODE_NO), 64, 1, 2, 64, 1, 2, 64, 1, 2, 6, - 360, 14400, -1, 1440, 720, 180, 180, 0, 1, 0, 0, 0, 0, 4, 1, + 360, 14400, -1, 1440, 720, 180, 180, 0, 1, 0, 0, 0, 0, 4, 1, 720 * 720, INCH(13), INCH(44), INCH(2), INCH(2), - 9, 9, 0, 30, 9, 9, 0, 30, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, + 9, 9, 0, 30, 9, 9, 0, 30, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0, 1, 7, 0, 0, spro5000_dotsizes, sp700_densities, &stpi_escp2_simple_drops, stpi_escp2_1440dpi_reslist, &stpi_escp2_photo_gen1_inkgroup, @@ -1355,9 +1356,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] = MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO | MODEL_PACKET_MODE_NO), 1, 1, 1, 1, 1, 1, 1, 1, 1, 6, - 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, + 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, 720 * 720, INCH(24), INCH(1200), INCH(7), INCH(7), - 9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 9, 9, 9, 9, 9, 9, -1, -1, 0, 0, + 9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 9, 9, 9, 9, 9, 9, -1, -1, 0, 0, 0, 1, 7, 0, 0, spro_dye_dotsizes, spro_dye_densities, &stpi_escp2_simple_drops, stpi_escp2_pro_reslist, &stpi_escp2_photo_gen1_inkgroup, @@ -1372,9 +1373,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] = MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO | MODEL_PACKET_MODE_NO), 1, 1, 1, 1, 1, 1, 1, 1, 1, 6, - 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, + 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, 720 * 720, INCH(24), INCH(1200), INCH(7), INCH(7), - 9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 9, 9, 9, 9, 9, 9, -1, -1, 0, 0, + 9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 9, 9, 9, 9, 9, 9, -1, -1, 0, 0, 0, 1, 7, 0, 0, spro_pigment_dotsizes, spro_pigment_densities, &stpi_escp2_simple_drops, stpi_escp2_pro_reslist, &stpi_escp2_photo_pigment_inkgroup, @@ -1389,9 +1390,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] = MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO | MODEL_PACKET_MODE_NO), 1, 1, 1, 1, 1, 1, 1, 1, 1, 6, - 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, + 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, 720 * 720, INCH(44), INCH(1200), INCH(7), INCH(7), - 9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 9, 9, 9, 9, 9, 9, -1, -1, 0, 0, + 9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 9, 9, 9, 9, 9, 9, -1, -1, 0, 0, 0, 1, 7, 0, 0, spro_dye_dotsizes, spro_dye_densities, &stpi_escp2_simple_drops, stpi_escp2_pro_reslist, &stpi_escp2_photo_gen1_inkgroup, @@ -1406,9 +1407,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] = MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO | MODEL_PACKET_MODE_NO), 1, 1, 1, 1, 1, 1, 1, 1, 1, 6, - 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, + 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, 720 * 720, INCH(44), INCH(1200), INCH(7), INCH(7), - 9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 9, 9, 9, 9, 9, 9, -1, -1, 0, 0, + 9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 9, 9, 9, 9, 9, 9, -1, -1, 0, 0, 0, 1, 7, 0, 0, spro_pigment_dotsizes, spro_pigment_densities, &stpi_escp2_simple_drops, stpi_escp2_pro_reslist, &stpi_escp2_photo_pigment_inkgroup, @@ -1423,9 +1424,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] = MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO | MODEL_PACKET_MODE_YES), 48, 1, 3, 144, 1, 1, 144, 1, 1, 4, - 360, 14400, -1, 2880, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, + 360, 14400, -1, 2880, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, 720 * 720, INCH(17 / 2), INCH(1200), INCH(2), INCH(2), - 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, + 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0, 3, 15, 0, 0, c4pl_dotsizes, c4pl_2880_densities, &stpi_escp2_variable_2880_4pl_drops, stpi_escp2_2880dpi_reslist, &stpi_escp2_standard_inkgroup, @@ -1440,9 +1441,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] = MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO | MODEL_PACKET_MODE_YES), 48, 1, 3, 144, 1, 1, 144, 1, 1, 4, - 360, 14400, -1, 2880, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, + 360, 14400, -1, 2880, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, 720 * 720, INCH(17 / 2), INCH(1200), INCH(2), INCH(2), - 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, + 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0, 3, 15, 0, 0, c4pl_dotsizes, c4pl_2880_densities, &stpi_escp2_variable_2880_4pl_drops, stpi_escp2_2880dpi_reslist, &stpi_escp2_standard_inkgroup, @@ -1457,9 +1458,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] = MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO | MODEL_PACKET_MODE_YES), 96, 1, 2, 192, 1, 1, 192, 1, 1, 4, - 360, 14400, -1, 2880, 720, 180, 180, 38, 1, 0, 0, 0, 0, 0, 1, + 360, 14400, -1, 2880, 720, 180, 180, 38, 1, 0, 0, 0, 0, 0, 1, 720 * 720, INCH(17 / 2), INCH(1200), INCH(2), INCH(2), - 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, + 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0, 3, 15, 0, 0, c3pl_dotsizes, sc980_densities, &stpi_escp2_variable_3pl_drops, stpi_escp2_2880dpi_reslist, &stpi_escp2_standard_inkgroup, @@ -1474,9 +1475,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] = MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO | MODEL_PACKET_MODE_YES), 48, 1, 3, 48, 1, 3, 48, 1, 3, 6, - 360, 14400, -1, 2880, 720, 90, 90, 0, 1, 0, 55, 0, 0, 0, 1, + 360, 14400, -1, 2880, 720, 90, 90, 0, 1, 0, 55, 0, 0, 0, 1, 720 * 720, 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, -1, -1, 0, 0, + 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0, 3, 15, 0, 0, c4pl_dotsizes, c4pl_2880_densities, &stpi_escp2_variable_2880_4pl_drops, stpi_escp2_2880dpi_reslist, &stpi_escp2_photo_gen2_inkgroup, @@ -1491,9 +1492,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] = MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO | MODEL_PACKET_MODE_YES), 48, 1, 3, 48, 1, 3, 48, 1, 3, 6, - 360, 14400, -1, 2880, 720, 90, 90, 0, 1, 0, 55, 0, 0, 0, 1, + 360, 14400, -1, 2880, 720, 90, 90, 0, 1, 0, 55, 0, 0, 0, 1, 720 * 720, 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, -1, -1, 0, 0, + 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0, 3, 15, 0, 0, c4pl_dotsizes, c4pl_2880_densities, &stpi_escp2_variable_2880_4pl_drops, stpi_escp2_2880dpi_reslist, &stpi_escp2_photo_gen2_inkgroup, @@ -1508,9 +1509,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] = MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO | MODEL_PACKET_MODE_YES), 48, 1, 3, 48, 1, 3, 48, 1, 3, 6, - 360, 14400, -1, 2880, 720, 90, 90, 0, 1, 0, 55, 0, 0, 0, 1, + 360, 14400, -1, 2880, 720, 90, 90, 0, 1, 0, 55, 0, 0, 0, 1, 720 * 720, INCH(13), INCH(1200), INCH(2), INCH(2), - 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, + 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0, 3, 15, 0, 0, c4pl_dotsizes, c4pl_2880_densities, &stpi_escp2_variable_2880_4pl_drops, stpi_escp2_2880dpi_reslist, &stpi_escp2_photo_gen2_inkgroup, @@ -1525,9 +1526,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] = MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_YES | MODEL_PACKET_MODE_YES), 15, 15, 3, 48, 48, 3, 48, 48, 3, 4, - 360, 14400, 360, 1440, 720, 90, 90, 0, 1, 0, 0, -99, 0, 0, 1, + 360, 14400, 360, 1440, 720, 90, 90, 0, 1, 0, 0, -99, 0, 0, 1, 720 * 720, INCH(17 / 2), INCH(1200), INCH(2), INCH(2), - 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, + 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0, 3, 15, 0, 0, sc480_dotsizes, sc480_densities, &stpi_escp2_variable_x80_6pl_drops, stpi_escp2_1440dpi_reslist, &stpi_escp2_x80_inkgroup, @@ -1542,9 +1543,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] = MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO | MODEL_PACKET_MODE_NO), 16, 1, 4, 16, 1, 4, 16, 1, 4, 4, - 360, 14400, -1, 720, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, + 360, 14400, -1, 720, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, 720 * 720, INCH(13), INCH(1200), INCH(2), INCH(2), - 9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, + 9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0, 1, 7, 0, 0, g1_dotsizes, g1_densities, &stpi_escp2_simple_drops, stpi_escp2_720dpi_reslist, &stpi_escp2_standard_inkgroup, @@ -1559,9 +1560,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] = MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO | MODEL_PACKET_MODE_NO), 1, 1, 1, 1, 1, 1, 1, 1, 1, 6, - 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, + 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, 720 * 720, INCH(13), INCH(1200), INCH(2), INCH(2), - 9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, + 9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0, 1, 7, 0, 0, spro_pigment_dotsizes, spro_pigment_densities, &stpi_escp2_simple_drops, stpi_escp2_pro_reslist, &stpi_escp2_photo_pigment_inkgroup, @@ -1576,9 +1577,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] = MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO | MODEL_PACKET_MODE_NO), 1, 1, 1, 1, 1, 1, 1, 1, 1, 6, - 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, + 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, 720 * 720, INCH(44), INCH(1200), INCH(7), INCH(7), - 9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 9, 9, 9, 9, 9, 9, -1, -1, 0, 0, + 9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 9, 9, 9, 9, 9, 9, -1, -1, 0, 0, 0, 1, 7, 0, 0, spro10000_dotsizes, spro10000_densities, &stpi_escp2_spro10000_drops, stpi_escp2_pro_reslist, &stpi_escp2_photo_gen2_inkgroup, @@ -1593,9 +1594,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] = MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_YES | MODEL_PACKET_MODE_YES), 15, 15, 3, 48, 48, 3, 48, 48, 3, 4, - 360, 14400, -1, 720, 720, 90, 90, 0, 1, 0, 0, -99, 0, 0, 1, + 360, 14400, -1, 720, 720, 90, 90, 0, 1, 0, 0, -99, 0, 0, 1, 720 * 720, INCH(17 / 2), INCH(1200), INCH(2), INCH(2), - 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, + 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0, 3, 15, 0, 0, sc480_dotsizes, sc480_densities, &stpi_escp2_variable_x80_6pl_drops, stpi_escp2_720dpi_soft_reslist, &stpi_escp2_x80_inkgroup, @@ -1610,9 +1611,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] = MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_YES | MODEL_PACKET_MODE_YES), 15, 15, 3, 48, 48, 3, 48, 48, 3, 4, - 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, -99, 0, 0, 1, + 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, -99, 0, 0, 1, 720 * 720, INCH(17 / 2), INCH(1200), INCH(2), INCH(2), - 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, + 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0, 3, 15, 0, 0, sc480_dotsizes, sc480_densities, &stpi_escp2_variable_x80_6pl_drops, stpi_escp2_1440dpi_reslist, &stpi_escp2_x80_inkgroup, @@ -1627,9 +1628,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] = MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO | MODEL_PACKET_MODE_YES), 60, 60, 2, 180, 180, 2, 180, 180, 2, 4, - 360, 14400, -1, 2880, 1440, 360, 180, 0, 1, 0, 0, -240, 0, 0, 1, + 360, 14400, -1, 2880, 1440, 360, 180, 0, 1, 0, 0, -240, 0, 0, 1, 720 * 720, 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, -1, -1, 0, 0, + 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0, 4, 15, 0, 0, c3pl_pigment_dotsizes, c3pl_pigment_densities, &stpi_escp2_variable_3pl_pigment_drops, stpi_escp2_2880_1440dpi_reslist, &stpi_escp2_c80_inkgroup, @@ -1644,9 +1645,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] = MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO | MODEL_PACKET_MODE_NO), 16, 1, 4, 16, 1, 4, 16, 1, 4, 4, - 360, 14400, -1, 720, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, + 360, 14400, -1, 720, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, 720 * 720, INCH(17 / 2), INCH(44), INCH(2), INCH(2), - 9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, + 9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0, 1, 7, 0, 0, g1_dotsizes, g1_densities, &stpi_escp2_simple_drops, stpi_escp2_720dpi_reslist, &stpi_escp2_standard_inkgroup, @@ -1661,9 +1662,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] = MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO | MODEL_PACKET_MODE_YES), 96, 96, 2, 96, 96, 2, 24, 24, 1, 6, - 360, 14400, -1, 2880, 1440, 360, 180, 0, 1, 0, 190, 0, 0, 0, 1, + 360, 14400, -1, 2880, 1440, 360, 180, 0, 1, 0, 190, 0, 0, 0, 1, 1440 * 1440, 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, 0, 0, + 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 0, 0, 0, 4, 15, 0, 0, c2pl_dotsizes, c2pl_densities, &stpi_escp2_variable_2pl_drops, stpi_escp2_superfine_reslist, &stpi_escp2_f360_photo_inkgroup, @@ -1678,9 +1679,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] = MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO | MODEL_PACKET_MODE_YES), 96, 96, 2, 96, 96, 2, 192, 192, 1, 7, - 360, 14400, -1, 2880, 1440, 360, 180, 0, 1, 0, 190, 0, 0, 0, 1, + 360, 14400, -1, 2880, 1440, 360, 180, 0, 1, 0, 190, 0, 0, 0, 1, 1440 * 1440, INCH(13), INCH(1200), INCH(2), INCH(2), - 9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 0, 0, + 9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 0, 0, 0, 4, 15, 0, 0, c4pl_pigment_dotsizes, c4pl_pigment_densities, &stpi_escp2_variable_ultrachrome_drops, stpi_escp2_superfine_reslist, &stpi_escp2_f360_ultrachrome_inkgroup, @@ -1695,9 +1696,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] = MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO | MODEL_PACKET_MODE_YES), 1, 1, 1, 1, 1, 1, 1, 1, 1, 7, - 360, 14400, -1, 2880, 1440, 360, 180, 0, 1, 0, 0, 0, 0, 0, 1, + 360, 14400, -1, 2880, 1440, 360, 180, 0, 1, 0, 0, 0, 0, 0, 1, 1440 * 1440, INCH(24), INCH(1200), INCH(7), INCH(7), - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, -1, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, -1, 0, 0, 0, 3, 15, 0, 0, spro_c4pl_pigment_dotsizes, c4pl_pigment_densities, &stpi_escp2_variable_ultrachrome_drops, stpi_escp2_pro_reslist, &stpi_escp2_ultrachrome_inkgroup, @@ -1712,9 +1713,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] = MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO | MODEL_PACKET_MODE_YES), 1, 1, 1, 1, 1, 1, 1, 1, 1, 7, - 360, 14400, -1, 2880, 1440, 360, 180, 0, 1, 0, 0, 0, 0, 0, 1, + 360, 14400, -1, 2880, 1440, 360, 180, 0, 1, 0, 0, 0, 0, 0, 1, 1440 * 1440, INCH(44), INCH(1200), INCH(7), INCH(7), - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, -1, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, -1, 0, 0, 0, 3, 15, 0, 0, spro_c4pl_pigment_dotsizes, c4pl_pigment_densities, &stpi_escp2_variable_ultrachrome_drops, stpi_escp2_pro_reslist, &stpi_escp2_ultrachrome_inkgroup, @@ -1729,9 +1730,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] = MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO | MODEL_PACKET_MODE_YES), 48, 1, 3, 48, 1, 3, 48, 1, 3, 6, - 360, 14400, -1, 2880, 1440, 90, 90, 0, 1, 0, 55, 0, 0, 0, 1, + 360, 14400, -1, 2880, 1440, 90, 90, 0, 1, 0, 55, 0, 0, 0, 1, 720 * 720, 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, -1, -1, 0, 0, + 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0, 3, 15, 0, 0, c4pl_dotsizes, c4pl_2880_densities, &stpi_escp2_variable_2880_4pl_drops, stpi_escp2_2880_1440dpi_reslist, &stpi_escp2_photo_gen2_inkgroup, @@ -1746,9 +1747,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] = MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO | MODEL_PACKET_MODE_YES), 48, 1, 3, 48, 1, 3, 48, 1, 3, 6, - 360, 14400, -1, 2880, 1440, 90, 90, 0, 1, 0, 55, 0, 0, 0, 1, + 360, 14400, -1, 2880, 1440, 90, 90, 0, 1, 0, 55, 0, 0, 0, 1, 720 * 720, 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, -1, -1, 0, 0, + 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0, 3, 15, 0, 0, c4pl_dotsizes, c4pl_2880_densities, &stpi_escp2_variable_2880_4pl_drops, stpi_escp2_2880_1440dpi_reslist, &stpi_escp2_photo_gen2_inkgroup, @@ -1763,9 +1764,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] = MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO | MODEL_PACKET_MODE_YES), 48, 1, 3, 144, 1, 1, 144, 1, 1, 4, - 360, 14400, -1, 2880, 1440, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, + 360, 14400, -1, 2880, 1440, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, 720 * 720, INCH(17 / 2), INCH(1200), INCH(2), INCH(2), - 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, + 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0, 3, 15, 0, 0, c4pl_dotsizes, c4pl_2880_densities, &stpi_escp2_variable_2880_4pl_drops, stpi_escp2_2880_1440dpi_reslist, &stpi_escp2_standard_inkgroup, @@ -1780,9 +1781,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] = MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO | MODEL_PACKET_MODE_YES), 96, 96, 2, 96, 96, 2, 24, 24, 1, 6, - 360, 14400, -1, 2880, 1440, 360, 180, 0, 1, 0, 190, 0, 0, 0, 1, + 360, 14400, -1, 2880, 1440, 360, 180, 0, 1, 0, 190, 0, 0, 0, 1, 1440 * 1440, 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, 0, 0, + 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 0, 0, 0, 4, 15, 0, 0, c2pl_dotsizes, c2pl_densities, &stpi_escp2_variable_2pl_drops, stpi_escp2_superfine_reslist, &stpi_escp2_f360_photo7_japan_inkgroup, @@ -1797,9 +1798,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] = MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO | MODEL_PACKET_MODE_YES), 32, 1, 4, 32, 1, 4, 32, 1, 4, 6, - 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, + 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, 720 * 720, INCH(13), INCH(44), INCH(2), INCH(2), - 9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, + 9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0, 3, 15, 0, 0, sp720_dotsizes, c6pl_densities, &stpi_escp2_variable_6pl_drops, stpi_escp2_1440dpi_reslist, &stpi_escp2_photo_gen1_inkgroup, @@ -1814,9 +1815,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] = MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO | MODEL_PACKET_MODE_YES), 59, 60, 2, 180, 180, 2, 180, 180, 2, 4, - 360, 14400, -1, 2880, 1440, 360, 180, 0, 1, 0, 0, -240, 0, 0, 1, + 360, 14400, -1, 2880, 1440, 360, 180, 0, 1, 0, 0, -240, 0, 0, 1, 720 * 720, 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, -1, -1, 0, 0, + 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0, 4, 15, 0, 0, c3pl_pigment_dotsizes, c3pl_pigment_densities, &stpi_escp2_variable_3pl_pigment_drops, stpi_escp2_2880_1440dpi_reslist, &stpi_escp2_c82_inkgroup, @@ -1831,9 +1832,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] = MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO | MODEL_PACKET_MODE_YES), 15, 15, 3, 48, 48, 3, 48, 48, 3, 4, - 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, -99, 0, 0, 1, + 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, -99, 0, 0, 1, 720 * 720, INCH(17 / 2), INCH(1200), INCH(2), INCH(2), - 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, + 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0, 3, 15, 0, 0, c4pl_dotsizes, c4pl_densities, &stpi_escp2_variable_x80_6pl_drops, stpi_escp2_1440dpi_reslist, &stpi_escp2_x80_inkgroup, @@ -1848,9 +1849,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] = MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO | MODEL_PACKET_MODE_YES), 180, 180, 2, 360, 360, 1, 360, 360, 1, 7, - 360, 14400, -1, 2880, 2880, 720, 360, 0, 1, 0, 190, 0, 0, 0, 1, + 360, 14400, -1, 2880, 2880, 720, 360, 0, 1, 0, 190, 0, 0, 0, 1, 1440 * 1440, 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, -1, -1, 0, 0, + 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0, 4, 15, 0, 0, c1_8pl_dotsizes, c1_8pl_densities, &stpi_escp2_variable_2pl_drops, stpi_escp2_superfine_reslist, &stpi_escp2_f360_photo7_japan_inkgroup, @@ -1865,9 +1866,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] = MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO | MODEL_PACKET_MODE_YES), 90, 90, 2, 90, 90, 2, 90, 90, 2, 6, - 360, 14400, -1, 2880, 2880, 720, 360, 0, 1, 0, 190, 0, 0, 0, 1, + 360, 14400, -1, 2880, 2880, 720, 360, 0, 1, 0, 190, 0, 0, 0, 1, 1440 * 1440, 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, -1, -1, 0, 0, + 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0, 4, 15, 0, 0, c1_8pl_dotsizes, c1_8pl_densities, &stpi_escp2_variable_2pl_drops, stpi_escp2_superfine_reslist, &stpi_escp2_photo_gen2_inkgroup, @@ -1882,9 +1883,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] = MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_YES | MODEL_PACKET_MODE_YES), 15, 15, 3, 48, 48, 3, 48, 48, 3, 4, - 360, 14400, -1, 2880, 720, 90, 90, 0, 1, 0, 0, -99, 0, 0, 1, + 360, 14400, -1, 2880, 720, 90, 90, 0, 1, 0, 0, -99, 0, 0, 1, 720 * 720, INCH(17 / 2), INCH(1200), INCH(2), INCH(2), - 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, + 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0, 3, 15, 0, 0, c4pl_dotsizes, c4pl_densities, &stpi_escp2_variable_x80_6pl_drops, stpi_escp2_1440dpi_reslist, &stpi_escp2_x80_inkgroup, @@ -1899,9 +1900,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] = MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO | MODEL_PACKET_MODE_YES), 59, 60, 2, 180, 180, 2, 180, 180, 2, 4, - 360, 14400, -1, 2880, 1440, 360, 180, 0, 1, 0, 0, -240, 0, 0, 1, + 360, 14400, -1, 2880, 1440, 360, 180, 0, 1, 0, 0, -240, 0, 0, 1, 720 * 720, 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, -1, -1, 0, 0, + 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0, 4, 15, 0, 0, c3pl_pigment_dotsizes, c3pl_pigment_densities, &stpi_escp2_variable_3pl_pigment_drops, stpi_escp2_2880_1440dpi_reslist, &stpi_escp2_c82_inkgroup, @@ -1916,9 +1917,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] = MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO | MODEL_PACKET_MODE_YES), 29, 30, 3, 90, 90, 3, 90, 90, 3, 4, - 360, 14400, -1, 2880, 1440, 360, 120, 0, 1, 0, 0, -180, 0, 0, 1, + 360, 14400, -1, 2880, 1440, 360, 120, 0, 1, 0, 0, -180, 0, 0, 1, 1440 * 720, 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, -1, -1, 0, 0, + 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0, 4, 15, 0, 0, c3pl_pigment_dotsizes, c3pl_pigment_densities, &stpi_escp2_variable_3pl_pigment_drops, stpi_escp2_2880_1440dpi_reslist, &stpi_escp2_c64_inkgroup, @@ -1933,9 +1934,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] = MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO | MODEL_PACKET_MODE_YES), 48, 1, 3, 48, 1, 3, 48, 1, 3, 6, - 360, 14400, -1, 2880, 720, 90, 90, 0, 1, 0, 55, 0, 0, 0, 1, + 360, 14400, -1, 2880, 720, 90, 90, 0, 1, 0, 55, 0, 0, 0, 1, 720 * 720, 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, 399, 394, 595, 842, + 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 399, 394, 595, 842, 0, 3, 15, 0, 0, c4pl_dotsizes, c4pl_2880_densities, &stpi_escp2_variable_2880_4pl_drops, stpi_escp2_2880dpi_reslist, &stpi_escp2_photo_gen2_inkgroup, @@ -1950,9 +1951,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] = MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO | MODEL_PACKET_MODE_YES), 90, 1, 3, 90, 1, 3, 90, 1, 3, 6, - 360, 14400, -1, 2880, 1440, 360, 120, 0, 1, 0, 190, 0, 0, 0, 1, + 360, 14400, -1, 2880, 1440, 360, 120, 0, 1, 0, 190, 0, 0, 0, 1, 1440 * 1440, 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, + 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 595, 842, 0, 4, 15, 0, 0, p3pl_dotsizes, p3pl_densities, &stpi_escp2_variable_3pl_pmg_drops, stpi_escp2_superfine_reslist, &stpi_escp2_photo_gen3_inkgroup, @@ -1967,9 +1968,9 @@ 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, 28800, -1, 1440, 2880, 360, 180, 0, 1, 0, 190, 0, 0, 0, 8, + 360, 28800, -1, 1440, 2880, 360, 180, 0, 1, 0, 190, 0, 0, 0, 8, 2880 * 1440, 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, + 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 595, 842, 11, 4, 15, 0, 0, p1_5pl_dotsizes, p1_5pl_densities, &stpi_escp2_variable_1_5pl_drops, stpi_escp2_r2400_reslist, &stpi_escp2_cmykrb_inkgroup, @@ -1984,9 +1985,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] = MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO | MODEL_PACKET_MODE_YES), 90, 1, 3, 90, 1, 3, 90, 1, 3, 4, - 360, 14400, -1, 1440, 1440, 360, 120, 0, 1, 0, 190, 0, 0, 0, 8, + 360, 14400, -1, 1440, 1440, 360, 120, 0, 1, 0, 190, 0, 0, 0, 8, 1440 * 1440, 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, + 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 595, 842, 0, 4, 15, 0, 0, p3pl_dotsizes, p3pl_densities, &stpi_escp2_variable_3pl_pmg_drops, stpi_escp2_cx3650_reslist, &stpi_escp2_cx3650_inkgroup, @@ -2001,9 +2002,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] = MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO | MODEL_PACKET_MODE_YES), 29, 30, 3, 90, 90, 3, 90, 90, 3, 4, - 360, 14400, -1, 2880, 1440, 360, 120, 0, 1, 0, 0, -180, 0, 0, 1, + 360, 14400, -1, 2880, 1440, 360, 120, 0, 1, 0, 0, -180, 0, 0, 1, 1440 * 720, 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, -1, -1, 0, 0, + 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0, 4, 15, 0, 0, c3pl_pigment_dotsizes, c3pl_pigment_c66_densities, &stpi_escp2_variable_3pl_pigment_c66_drops, stpi_escp2_2880_1440dpi_reslist, &stpi_escp2_c64_inkgroup, @@ -2018,9 +2019,9 @@ 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, 28800, -1, 1440, 2880, 360, 180, 0, 1, 0, 190, 0, 0, 0, 8, + 360, 28800, -1, 1440, 2880, 360, 180, 0, 1, 0, 190, 0, 0, 0, 8, 2880 * 1440, 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, + 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 595, 842, 11, 4, 15, 0, 0, p1_5pl_dotsizes, p1_5pl_densities, &stpi_escp2_variable_1_5pl_drops, stpi_escp2_r2400_reslist, &stpi_escp2_cmykrb_inkgroup, @@ -2035,9 +2036,9 @@ 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, 1440, 2880, 360, 180, 0, 1, 0, 190, 0, 0, 0, 8, + 360, 14400, -1, 1440, 2880, 360, 180, 0, 1, 0, 190, 0, 0, 0, 8, 2880 * 1440, 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, + 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 595, 842, 11, 4, 15, 0, 0, p1_5pl_dotsizes, p1_5pl_densities, &stpi_escp2_variable_1_5pl_drops, stpi_escp2_r2400_reslist, &stpi_escp2_photo_gen3_inkgroup, @@ -2052,9 +2053,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] = MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO | MODEL_PACKET_MODE_YES), 59, 60, 2, 180, 180, 2, 180, 180, 2, 4, - 360, 14400, -1, 2880, 2880, 360, 180, 0, 1, 0, 0, -240, 0, 0, 1, + 360, 14400, -1, 2880, 2880, 360, 180, 0, 1, 0, 0, -240, 0, 0, 1, 1440 * 720, 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, -1, -1, 0, 0, + 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0, 4, 15, 0, 0, c3pl_pigment_dotsizes, c3pl_pigment_densities, &stpi_escp2_variable_3pl_pigment_drops, stpi_escp2_2880_1440dpi_reslist, &stpi_escp2_c82_inkgroup, @@ -2069,9 +2070,9 @@ 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, 6, - 360, 28800, -1, 5760, 2880, 360, 180, 0, 1, 0, 190, 0, 0, 0, 1, + 360, 28800, -1, 5760, 2880, 360, 180, 0, 1, 0, 190, 0, 0, 0, 1, 1440 * 1440, 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, 263, 595, 842, + 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 263, 595, 842, 0, 4, 15, 0, 0, p1_5pl_dotsizes, p1_5pl_densities, &stpi_escp2_variable_1_5pl_drops, stpi_escp2_superfine_reslist, &stpi_escp2_photo_gen3_inkgroup, @@ -2086,9 +2087,9 @@ 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, 1440, 2880, 360, 180, 0, 1, 0, 190, 0, 0, 0, 8, + 360, 14400, -1, 1440, 2880, 360, 180, 0, 1, 0, 190, 0, 0, 0, 8, 1440 * 1440, 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, + 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 595, 842, 0, 4, 15, 0, 0, p3_5pl_dotsizes, p3_5pl_densities, &stpi_escp2_variable_r2400_drops, stpi_escp2_r2400_reslist, &stpi_escp2_f360_ultrachrome_k3_inkgroup, @@ -2103,9 +2104,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] = MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO | MODEL_PACKET_MODE_YES), 29, 30, 3, 90, 90, 3, 90, 90, 3, 4, - 360, 14400, -1, 2880, 1440, 360, 120, 0, 1, 0, 0, -180, 0, 0, 1, + 360, 14400, -1, 2880, 1440, 360, 120, 0, 1, 0, 0, -180, 0, 0, 1, 1440 * 720, 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, -1, -1, 0, 0, + 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0, 4, 15, 0, 0, c3pl_pigment_dotsizes, c3pl_pigment_c66_densities, &stpi_escp2_variable_3pl_pigment_c66_drops, stpi_escp2_2880_1440dpi_reslist, &stpi_escp2_c64_inkgroup, @@ -2120,9 +2121,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] = MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO | MODEL_PACKET_MODE_YES), 90, 1, 3, 90, 1, 3, 90, 1, 3, 6, - 360, 28800, -1, 5760, 1440, 1440, 720, 0, 1, 0, 0, 0, 0, 0, 1, + 360, 28800, -1, 5760, 1440, 1440, 720, 0, 1, 0, 0, 0, 0, 0, 1, 1440 * 1440, INCH(4), 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, + 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 595, 842, 0, 4, 15, 0, 0, picturemate_dotsizes, picturemate_densities, &stpi_escp2_variable_picturemate_drops, stpi_escp2_picturemate_reslist, &stpi_escp2_picturemate_inkgroup, @@ -2137,9 +2138,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] = MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO | MODEL_PACKET_MODE_YES), 90, 90, 3, 90, 90, 3, 90, 90, 3, 4, - 360, 14400, -1, 5760, 1440, 360, 120, 0, 1, 0, 190, 0, 0, 0, 1, + 360, 14400, -1, 5760, 1440, 360, 120, 0, 1, 0, 190, 0, 0, 0, 1, 1440 * 1440, 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, -1, -1, 0, 0, + 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0, 4, 15, 0, 0, c3pl_pigment_dotsizes, c3pl_pigment_c66_densities, &stpi_escp2_variable_3pl_pigment_c66_drops, stpi_escp2_superfine_reslist, &stpi_escp2_c64_inkgroup, @@ -2154,9 +2155,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] = MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO | MODEL_PACKET_MODE_YES), 90, 90, 3, 90, 90, 3, 90, 90, 3, 4, - 360, 14400, -1, 5760, 1440, 360, 120, 0, 1, 0, 190, 0, 0, 0, 1, + 360, 14400, -1, 5760, 1440, 360, 120, 0, 1, 0, 190, 0, 0, 0, 1, 1440 * 1440, 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, 0, 0, + 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 0, 0, 0, 4, 15, 0, 0, c2pl_dotsizes, c2pl_densities, &stpi_escp2_variable_2pl_drops, stpi_escp2_superfine_reslist, &stpi_escp2_c64_inkgroup, @@ -2171,9 +2172,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] = MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO | MODEL_PACKET_MODE_YES), 90, 90, 3, 90, 90, 3, 90, 90, 3, 6, - 360, 14400, -1, 5760, 1440, 360, 120, 0, 1, 0, 190, 0, 0, 0, 1, + 360, 14400, -1, 5760, 1440, 360, 120, 0, 1, 0, 190, 0, 0, 0, 1, 1440 * 1440, 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, 0, 0, + 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 0, 0, 0, 4, 15, 0, 0, c2pl_dotsizes, c2pl_densities, &stpi_escp2_variable_2pl_drops, stpi_escp2_superfine_reslist, &stpi_escp2_photo_gen3_inkgroup, @@ -2188,9 +2189,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] = MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO | MODEL_PACKET_MODE_YES), 90, 1, 3, 90, 1, 3, 90, 1, 3, 4, - 360, 14400, -1, 2880, 1440, 360, 120, 0, 1, 0, 190, 0, 0, 0, 1, + 360, 14400, -1, 2880, 1440, 360, 120, 0, 1, 0, 190, 0, 0, 0, 1, 1440 * 1440, 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, + 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 595, 842, 0, 4, 15, 0, 0, p3pl_dotsizes, p3pl_densities, &stpi_escp2_variable_3pl_pmg_drops, stpi_escp2_superfine_reslist, &stpi_escp2_c64_inkgroup, diff --git a/src/main/print-escp2.c b/src/main/print-escp2.c index 42b7c62..d97634b 100644 --- a/src/main/print-escp2.c +++ b/src/main/print-escp2.c @@ -1,5 +1,5 @@ /* - * "$Id: print-escp2.c,v 1.350 2006/04/30 21:29:53 rlk Exp $" + * "$Id: print-escp2.c,v 1.354 2006/07/22 20:28:14 rlk Exp $" * * Print plug-in EPSON ESC/P2 driver for the GIMP. * @@ -386,6 +386,7 @@ static const stp_parameter_t the_parameters[] = PARAMETER_INT(zero_margin_offset), PARAMETER_INT(extra_720dpi_separation), PARAMETER_INT(horizontal_position_alignment), + PARAMETER_INT(bidirectional_upper_limit), PARAMETER_INT(physical_channels), PARAMETER_INT(left_margin), PARAMETER_INT(right_margin), @@ -399,6 +400,7 @@ static const stp_parameter_t the_parameters[] = PARAMETER_INT(cd_y_offset), PARAMETER_INT(cd_page_width), PARAMETER_INT(cd_page_height), + PARAMETER_INT(page_extra_height), PARAMETER_RAW(preinit_sequence), PARAMETER_RAW(postinit_remote_sequence) }; @@ -498,6 +500,14 @@ static const float_param_t float_parameters[] = }, { { + "DarkGrayTransition", N_("Gray Transition"), N_("Advanced Ink Adjustment"), + N_("Gray Transition"), + STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT, + STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, -1, 1, 0 + }, 0.0, 5.0, 1.0, 1 + }, + { + { "LightGrayTransition", N_("Light Gray Transition"), N_("Advanced Ink Adjustment"), N_("Light Gray Transition"), STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT, @@ -657,6 +667,7 @@ DEF_SIMPLE_ACCESSOR(cd_x_offset, int) DEF_SIMPLE_ACCESSOR(cd_y_offset, int) DEF_SIMPLE_ACCESSOR(cd_page_width, int) DEF_SIMPLE_ACCESSOR(cd_page_height, int) +DEF_SIMPLE_ACCESSOR(page_extra_height, int) DEF_SIMPLE_ACCESSOR(extra_feed, unsigned) DEF_SIMPLE_ACCESSOR(pseudo_separation_rows, int) DEF_SIMPLE_ACCESSOR(base_separation, int) @@ -667,6 +678,7 @@ DEF_SIMPLE_ACCESSOR(max_black_resolution, int) DEF_SIMPLE_ACCESSOR(zero_margin_offset, int) DEF_SIMPLE_ACCESSOR(extra_720dpi_separation, int) DEF_SIMPLE_ACCESSOR(horizontal_position_alignment, unsigned) +DEF_SIMPLE_ACCESSOR(bidirectional_upper_limit, int) DEF_SIMPLE_ACCESSOR(physical_channels, int) DEF_SIMPLE_ACCESSOR(alignment_passes, int) DEF_SIMPLE_ACCESSOR(alignment_choices, int) @@ -970,44 +982,40 @@ get_resolution_bounds_by_paper_type(const stp_vars_t *v, *max_y = 720; break; } + stp_dprintf(STP_DBG_ESCP2, v, + "Paper %s class %d: min_x %d min_y %d max_x %d max_y %d\n", + paper->text, paper->paper_class, *min_x, *min_y, + *max_x, *max_y); } } static int verify_resolution_by_paper_type(const stp_vars_t *v, const res_t *res) { - const paper_t *paper = get_media_type(v); - if (paper) + unsigned min_x = 0; + unsigned min_y = 0; + unsigned max_x = 0; + unsigned max_y = 0; + get_resolution_bounds_by_paper_type(v, &max_x, &max_y, &min_x, &min_y); + if ((max_x == 0 || res->printed_hres <= max_x) && + (max_y == 0 || res->printed_vres <= max_y) && + (min_x == 0 || res->printed_hres >= min_x) && + (min_y == 0 || res->printed_vres >= min_y)) + { + stp_dprintf(STP_DBG_ESCP2, v, + "Resolution %s (%d, %d) GOOD (%d, %d, %d, %d)\n", + res->name, res->printed_hres, res->printed_vres, + min_x, min_y, max_x, max_y); + return 1; + } + else { - switch (paper->paper_class) - { - case PAPER_PLAIN: - if (res->printed_vres > 720 || res->hres > 720) - return 0; - break; - case PAPER_GOOD: - if (res->printed_vres < 180 || res->hres < 360 || - res->printed_vres > 720 || res->hres > 1440) - return 0; - break; - case PAPER_PHOTO: - if (res->printed_vres < 360 || - (res->hres < 720 && res->hres < escp2_max_hres(v))) - return 0; - break; - case PAPER_PREMIUM_PHOTO: - if (res->printed_vres < 720 || - (res->hres < 720 && res->hres < escp2_max_hres(v))) - return 0; - break; - case PAPER_TRANSPARENCY: - if (res->printed_vres < 360 || res->hres < 360 || - res->printed_vres > 720 || res->hres > 720) - return 0; - break; - } + stp_dprintf(STP_DBG_ESCP2, v, + "Resolution %s (%d, %d) BAD (%d, %d, %d, %d)\n", + res->name, res->printed_hres, res->printed_vres, + min_x, min_y, max_x, max_y); + return 0; } - return 1; } static int @@ -1042,6 +1050,37 @@ verify_resolution(const stp_vars_t *v, const res_t *res) return 0; } +static void +get_printer_resolution_bounds(const stp_vars_t *v, + unsigned *max_x, unsigned *max_y, + unsigned *min_x, unsigned *min_y) +{ + int i = 0; + const res_t *const *res = escp2_reslist(v); + *max_x = 0; + *max_y = 0; + *min_x = 0; + *min_y = 0; + while (res[i]) + { + if (verify_resolution(v, res[i])) + { + if (res[i]->printed_hres * res[i]->vertical_passes > *max_x) + *max_x = res[i]->printed_hres * res[i]->vertical_passes; + if (res[i]->printed_vres > *max_y) + *max_y = res[i]->printed_vres; + if (*min_x == 0 || + res[i]->printed_hres * res[i]->vertical_passes < *min_x) + *min_x = res[i]->printed_hres * res[i]->vertical_passes; + if (*min_y == 0 || res[i]->printed_vres < *min_y) + *min_y = res[i]->printed_vres; + } + i++; + } + stp_dprintf(STP_DBG_ESCP2, v, + "Printer bounds: %d %d %d %d\n", *min_x, *min_y, *max_x, *max_y); +} + static int printer_supports_rollfeed(const stp_vars_t *v) { @@ -1300,6 +1339,8 @@ find_default_resolution(const stp_vars_t *v, const quality_t *q, i--; while (i >= 0) { + stp_dprintf(STP_DBG_ESCP2, v, "Checking resolution %s %d...", + res[i]->name, i); if (verify_resolution(v, res[i]) && verify_resolution_by_paper_type(v, res[i])) return res[i]; @@ -1346,7 +1387,28 @@ find_default_resolution(const stp_vars_t *v, const quality_t *q, if (verify_resolution(v, res[i]) && res[i]->printed_vres == desired_vres && res[i]->printed_hres == desired_hres) - return res[i]; + { + stp_dprintf(STP_DBG_ESCP2, v, + "Found desired resolution w/o oversample: %s %d: %d * %d, %d\n", + res[i]->name, i, res[i]->printed_hres, + res[i]->vertical_passes, res[i]->printed_vres); + return res[i]; + } + i++; + } + i = 0; + while (res[i]) + { + if (verify_resolution(v, res[i]) && + res[i]->printed_vres == desired_vres && + res[i]->printed_hres * res[i]->vertical_passes == desired_hres) + { + stp_dprintf(STP_DBG_ESCP2, v, + "Found desired resolution: %s %d: %d * %d, %d\n", + res[i]->name, i, res[i]->printed_hres, + res[i]->vertical_passes, res[i]->printed_vres); + return res[i]; + } i++; } i = 0; @@ -1355,9 +1417,17 @@ find_default_resolution(const stp_vars_t *v, const quality_t *q, if (verify_resolution(v, res[i]) && (q->min_vres == 0 || res[i]->printed_vres >= q->min_vres) && (q->max_vres == 0 || res[i]->printed_vres <= q->max_vres) && - (q->min_hres == 0 || res[i]->printed_hres >= q->min_hres) && - (q->max_hres == 0 || res[i]->printed_hres <= q->max_hres)) - return res[i]; + (q->min_hres == 0 || + res[i]->printed_hres * res[i]->vertical_passes >=q->min_hres) && + (q->max_hres == 0 || + res[i]->printed_hres * res[i]->vertical_passes <= q->max_hres)) + { + stp_dprintf(STP_DBG_ESCP2, v, + "Found acceptable resolution: %s %d: %d * %d, %d\n", + res[i]->name, i, res[i]->printed_hres, + res[i]->vertical_passes, res[i]->printed_vres); + return res[i]; + } i++; } } @@ -1368,10 +1438,10 @@ find_default_resolution(const stp_vars_t *v, const quality_t *q, while (res[i]) { if (verify_resolution(v, res[i]) && - res[i]->vres >= desired_vres && - res[i]->hres >= desired_hres && - res[i]->vres <= 2 * desired_vres && - res[i]->hres <= 2 * desired_hres) + res[i]->printed_vres >= desired_vres && + res[i]->printed_hres * res[i]->vertical_passes >= desired_hres && + res[i]->printed_vres <= 2 * desired_vres && + res[i]->printed_hres * res[i]->vertical_passes <= 2 * desired_hres) return res[i]; i++; } @@ -1383,13 +1453,23 @@ find_default_resolution(const stp_vars_t *v, const quality_t *q, static int verify_quality(const stp_vars_t *v, const quality_t *q) { - if ((q->max_vres == 0 || escp2_min_vres(v) <= q->max_vres) && - (q->max_hres == 0 || escp2_min_hres(v) <= q->max_hres) && - (q->min_vres == 0 || escp2_max_vres(v) >= q->min_vres) && - (q->min_hres == 0 || escp2_max_hres(v) >= q->min_hres)) - return 1; + unsigned max_x, max_y, min_x, min_y; + get_printer_resolution_bounds(v, &max_x, &max_y, &min_x, &min_y); + if ((q->max_vres == 0 || min_y <= q->max_vres) && + (q->min_vres == 0 || max_y >= q->min_vres) && + (q->max_hres == 0 || min_x <= q->max_hres) && + (q->min_hres == 0 || max_x >= q->min_hres)) + { + stp_dprintf(STP_DBG_ESCP2, v, "Quality %s OK: %d %d %d %d\n", + q->text, q->min_hres, q->min_vres, q->max_hres, q->max_vres); + return 1; + } else - return 0; + { + stp_dprintf(STP_DBG_ESCP2, v, "Quality %s not OK: %d %d %d %d\n", + q->text, q->min_hres, q->min_vres, q->max_hres, q->max_vres); + return 0; + } } static const res_t * @@ -1466,7 +1546,7 @@ escp2_parameters(const stp_vars_t *v, const char *name, const stp_papersize_t *pt = stp_get_papersize_by_index(i); if (verify_papersize(v, pt)) stp_string_list_add_string(description->bounds.str, - pt->name, pt->text); + pt->name, gettext(pt->text)); } } description->deflt.str = @@ -1512,7 +1592,7 @@ escp2_parameters(const stp_vars_t *v, const char *name, const quality_t *q = &(quals->qualities[i]); if (verify_quality(v, q)) stp_string_list_add_string(description->bounds.str, q->name, - _(q->text)); + gettext(q->text)); if (strcmp(q->name, "Standard") == 0) has_standard_quality = 1; } @@ -1533,7 +1613,7 @@ escp2_parameters(const stp_vars_t *v, const char *name, { if (verify_resolution(v, res[i])) stp_string_list_add_string(description->bounds.str, - res[i]->name, _(res[i]->text)); + res[i]->name, gettext(res[i]->text)); i++; } } @@ -1550,7 +1630,7 @@ escp2_parameters(const stp_vars_t *v, const char *name, if (verify_inktype(v, inks->inknames[i])) stp_string_list_add_string(description->bounds.str, inks->inknames[i]->name, - _(inks->inknames[i]->text)); + gettext(inks->inknames[i]->text)); description->deflt.str = "None"; } else @@ -1568,7 +1648,7 @@ escp2_parameters(const stp_vars_t *v, const char *name, { stp_string_list_add_string(description->bounds.str, inks->inklists[i]->name, - _(inks->inklists[i]->text)); + gettext(inks->inklists[i]->text)); if (strcmp(inks->inklists[i]->name, "None") == 0) has_default_choice = 1; } @@ -1588,7 +1668,7 @@ escp2_parameters(const stp_vars_t *v, const char *name, for (i = 0; i < nmediatypes; i++) stp_string_list_add_string(description->bounds.str, p->papers[i].name, - _(p->papers[i].text)); + gettext(p->papers[i].text)); description->deflt.str = stp_string_list_param(description->bounds.str, 0)->name; } @@ -1605,7 +1685,7 @@ escp2_parameters(const stp_vars_t *v, const char *name, for (i = 0; i < ninputslots; i++) stp_string_list_add_string(description->bounds.str, slots->slots[i].name, - _(slots->slots[i].text)); + gettext(slots->slots[i].text)); description->deflt.str = stp_string_list_param(description->bounds.str, 0)->name; } @@ -1641,7 +1721,7 @@ escp2_parameters(const stp_vars_t *v, const char *name, for (i = 0; i < nprinter_weaves; i++) stp_string_list_add_string(description->bounds.str, printer_weaves->printer_weaves[i].name, - _(printer_weaves->printer_weaves[i].text)); + gettext(printer_weaves->printer_weaves[i].text)); } else description->is_active = 0; @@ -1724,8 +1804,9 @@ escp2_parameters(const stp_vars_t *v, const char *name, } else if (strcmp(name, "GrayTransition") == 0) set_gray_transition_parameter(v, description, 2); - else if (strcmp(name, "LightGrayTransition") == 0) - set_gray_transition_parameter(v, description, 2); + else if (strcmp(name, "DarkGrayTransition") == 0 || + strcmp(name, "LightGrayTransition") == 0) + set_gray_transition_parameter(v, description, 3); else if (strcmp(name, "Gray1Transition") == 0 || strcmp(name, "Gray2Transition") == 0 || strcmp(name, "Gray3Transition") == 0) @@ -1769,7 +1850,7 @@ escp2_parameters(const stp_vars_t *v, const char *name, for (i = 0; i < channel_names->count; i++) stp_string_list_add_string (description->bounds.str, - channel_names->names[i], channel_names->names[i]); + channel_names->names[i], gettext(channel_names->names[i])); description->deflt.str = stp_string_list_param(description->bounds.str, 0)->name; } @@ -2733,6 +2814,7 @@ setup_head_parameters(stp_vars_t *v) pd->separation_rows = escp2_separation_rows(v); pd->pseudo_separation_rows = escp2_pseudo_separation_rows(v); pd->extra_720dpi_separation = escp2_extra_720dpi_separation(v); + pd->bidirectional_upper_limit = escp2_bidirectional_upper_limit(v); if (pd->horizontal_passes == 0) pd->horizontal_passes = 1; @@ -2776,6 +2858,13 @@ setup_page(stp_vars_t *v) safe and print 16 mm */ stp_default_media_size(v, &n, &(pd->page_true_height)); + pd->page_extra_height = escp2_page_extra_height(v); + if (pd->page_extra_height > 0 && + escp2_has_cap(v, MODEL_XZEROMARGIN, MODEL_XZEROMARGIN_YES) && + (!(input_slot->is_cd) && stp_get_boolean_parameter(v, "FullBleed"))) + pd->page_extra_height += + escp2_nozzles(v) * escp2_nozzle_separation(v) * 72 / + escp2_base_separation(v); internal_imageable_area(v, 0, 0, &pd->page_left, &pd->page_right, &pd->page_bottom, &pd->page_top); /* Don't use full bleed mode if the paper itself has a margin */ @@ -2789,6 +2878,7 @@ setup_page(stp_vars_t *v) int top_center = escp2_cd_y_offset(v) + stp_get_dimension_parameter(v, "CDYAdjustment"); pd->page_true_height = pd->page_bottom - pd->page_top; + pd->page_extra_height = 0; stp_set_left(v, stp_get_left(v) - pd->page_left); stp_set_top(v, stp_get_top(v) - pd->page_top); pd->page_right -= pd->page_left; diff --git a/src/main/print-escp2.h b/src/main/print-escp2.h index 9ad648f..1fd76b3 100644 --- a/src/main/print-escp2.h +++ b/src/main/print-escp2.h @@ -1,5 +1,5 @@ /* - * "$Id: print-escp2.h,v 1.103 2006/05/06 21:30:59 rlk Exp $" + * "$Id: print-escp2.h,v 1.105 2006/07/22 20:28:14 rlk Exp $" * * Print plug-in EPSON ESC/P2 driver for the GIMP. * @@ -457,6 +457,9 @@ typedef struct escp2_printer short extra_720dpi_separation; short horizontal_position_alignment; /* Horizontal alignment */ /* for good performance */ + int bidirectional_upper_limit; /* Highest total resolution */ + /* for bidirectional printing */ + /* in auto mode */ /*****************************************************************************/ /* Paper size limits */ int max_paper_width; /* Maximum paper width, in points */ @@ -492,6 +495,8 @@ typedef struct escp2_printer short cd_y_offset; /* Center of CD (vertical offset) */ short cd_page_width; /* Width of "page" when printing to CD */ short cd_page_height; /* Height of "page" when printing to CD */ + /* Extra height for form factor command */ + short page_extra_height; /* Extra height (lie to set form factor) */ /*****************************************************************************/ /* Parameters for escputil */ short alignment_passes; @@ -658,6 +663,7 @@ typedef struct int separation_rows; /* Row separation scaling */ int pseudo_separation_rows; /* Special row separation for some printers */ int extra_720dpi_separation; /* Special separation needed at 720 DPI */ + int bidirectional_upper_limit; /* Max total resolution for auto-bidi */ /* weave parameters */ int horizontal_passes; /* Number of horizontal passes required @@ -675,6 +681,7 @@ typedef struct int page_width; /* Page width (points) */ int page_height; /* Page height (points) */ int page_true_height; /* Physical page height (points) */ + int page_extra_height; /* Extra height for set_form_factor */ int cd_x_offset; /* CD X offset (micro units) */ int cd_y_offset; /* CD Y offset (micro units) */ int cd_outer_radius; /* CD radius (micro units) */ @@ -721,5 +728,5 @@ extern void stpi_escp2_terminate_page(stp_vars_t *v); #endif /* GUTENPRINT_INTERNAL_ESCP2_H */ /* - * End of "$Id: print-escp2.h,v 1.103 2006/05/06 21:30:59 rlk Exp $". + * End of "$Id: print-escp2.h,v 1.105 2006/07/22 20:28:14 rlk Exp $". */ diff --git a/src/main/print-lexmark.c b/src/main/print-lexmark.c index 0f6faa6..5028b37 100644 --- a/src/main/print-lexmark.c +++ b/src/main/print-lexmark.c @@ -1,6 +1,6 @@ /* - * "$Id: print-lexmark.c,v 1.153 2006/05/12 00:56:09 rlk Exp $" + * "$Id: print-lexmark.c,v 1.154 2006/05/28 16:59:05 rlk Exp $" * * Print plug-in Lexmark driver for the GIMP. * @@ -1208,7 +1208,7 @@ lexmark_parameters(const stp_vars_t *v, const char *name, if (stp_string_list_count(description->bounds.str) == 0) description->deflt.str = pt->name; stp_string_list_add_string(description->bounds.str, - pt->name, pt->text); + pt->name, gettext(pt->text)); } } } @@ -1225,7 +1225,7 @@ lexmark_parameters(const stp_vars_t *v, const char *name, if (stp_string_list_count(description->bounds.str) == 0) description->deflt.str = res->name; stp_string_list_add_string(description->bounds.str, - res->name, _(res->text)); + res->name, gettext(res->text)); res++; } } @@ -1236,7 +1236,7 @@ lexmark_parameters(const stp_vars_t *v, const char *name, for (i = 0; caps->ink_types[i].name != NULL; i++) stp_string_list_add_string(description->bounds.str, caps->ink_types[i].name, - _(caps->ink_types[i].text)); + gettext(caps->ink_types[i].text)); } else if (strcmp(name, "MediaType") == 0) { @@ -1245,7 +1245,7 @@ lexmark_parameters(const stp_vars_t *v, const char *name, for (i = 0; i < paper_type_count; i++) stp_string_list_add_string(description->bounds.str, lexmark_paper_list[i].name, - _(lexmark_paper_list[i].text)); + gettext(lexmark_paper_list[i].text)); } else if (strcmp(name, "InputSlot") == 0) { @@ -1254,7 +1254,7 @@ lexmark_parameters(const stp_vars_t *v, const char *name, for (i = 0; i < sizeof(media_sources) / sizeof(stp_param_string_t); i++) stp_string_list_add_string(description->bounds.str, media_sources[i].name, - _(media_sources[i].name)); + gettext(media_sources[i].name)); } else if (strcmp(name, "InkChannels") == 0) { diff --git a/src/main/print-list.c b/src/main/print-list.c index f3d0a4b..9483007 100644 --- a/src/main/print-list.c +++ b/src/main/print-list.c @@ -1,5 +1,5 @@ /* - * "$Id: print-list.c,v 1.23 2005/06/30 02:11:49 rlk Exp $" + * "$Id: print-list.c,v 1.24 2006/07/07 21:31:02 rleigh Exp $" * * Gutenprint list functions. A doubly-linked list implementation, * with callbacks for freeing, sorting, and retrieving nodes by name @@ -234,7 +234,7 @@ stp_list_get_end(const stp_list_t *list) return list->end; } -static stp_list_t * +static inline stp_list_t * deconst_list(const stp_list_t *list) { return (stp_list_t *) list; diff --git a/src/main/print-olympus.c b/src/main/print-olympus.c index 24c6a2c..c5ad531 100644 --- a/src/main/print-olympus.c +++ b/src/main/print-olympus.c @@ -1,5 +1,5 @@ /* - * "$Id: print-olympus.c,v 1.58 2006/04/17 02:06:19 rlk Exp $" + * "$Id: print-olympus.c,v 1.59 2006/05/28 16:59:05 rlk Exp $" * * Print plug-in Olympus driver for the GIMP. * @@ -1483,7 +1483,7 @@ olympus_parameters(const stp_vars_t *v, const char *name, text = (p->item[i].text ? p->item[i].text : pt->text); stp_string_list_add_string(description->bounds.str, - p->item[i].name, text); + p->item[i].name, gettext(text)); if (! default_specified && pt && pt->width > 0 && pt->height > 0) { description->deflt.str = p->item[i].name; @@ -1514,7 +1514,7 @@ olympus_parameters(const stp_vars_t *v, const char *name, { sprintf(res_text, "%s DPI", r->item[i].name); stp_string_list_add_string(description->bounds.str, - r->item[i].name, _(res_text)); + r->item[i].name, gettext(res_text)); } if (r->n_items < 1) description->is_active = 0; @@ -1526,7 +1526,7 @@ olympus_parameters(const stp_vars_t *v, const char *name, description->bounds.str = stp_string_list_create(); for (i = 0; i < caps->inks->n_items; i++) stp_string_list_add_string(description->bounds.str, - caps->inks->item[i].name, caps->inks->item[i].name); + caps->inks->item[i].name, gettext(caps->inks->item[i].name)); description->deflt.str = stp_string_list_param(description->bounds.str, 0)->name; if (caps->inks->n_items < 2) @@ -1543,7 +1543,7 @@ olympus_parameters(const stp_vars_t *v, const char *name, { const laminate_t *l = &(llist->item[i]); stp_string_list_add_string(description->bounds.str, - l->name, l->text); + l->name, gettext(l->text)); } description->deflt.str = stp_string_list_param(description->bounds.str, 0)->name; diff --git a/src/main/print-pcl.c b/src/main/print-pcl.c index 1feaacf..f1afc25 100644 --- a/src/main/print-pcl.c +++ b/src/main/print-pcl.c @@ -1,5 +1,5 @@ /* - * "$Id: print-pcl.c,v 1.142 2006/05/12 00:53:18 rlk Exp $" + * "$Id: print-pcl.c,v 1.144 2006/07/07 13:11:42 rlk Exp $" * * Print plug-in HP PCL driver for the GIMP. * @@ -1018,6 +1018,19 @@ static const pcl_cap_t pcl_model_capabilities[] = emptylist, laserjet_papersources, }, + /* Some laser printers don't have expanded A4 margins */ + { 22, + 17 * 72 / 2, 14 * 72, + 1, 1, /* Min paper size */ + PCL_RES_150_150 | PCL_RES_300_300, + {12, 12, 18, 18}, + {12, 12, 18, 18}, /* Check/Fix */ + PCL_COLOR_NONE, + PCL_PRINTER_LJ, + ljsmall_papersizes, + emptylist, + laserjet_papersources, + }, /* LaserJet III series */ { 3, 17 * 72 / 2, 14 * 72, @@ -1031,6 +1044,19 @@ static const pcl_cap_t pcl_model_capabilities[] = emptylist, laserjet_papersources, }, + /* Some laser printers don't have expanded A4 margins */ + { 32, + 17 * 72 / 2, 14 * 72, + 1, 1, /* Min paper size */ + PCL_RES_150_150 | PCL_RES_300_300, + {12, 12, 18, 18}, + {12, 12, 18, 18}, /* Check/Fix */ + PCL_COLOR_NONE, + PCL_PRINTER_LJ | PCL_PRINTER_TIFF | PCL_PRINTER_BLANKLINE, + ljsmall_papersizes, + emptylist, + laserjet_papersources, + }, /* LaserJet 4L */ { 4, 17 * 72 / 2, 14 * 72, @@ -1085,6 +1111,20 @@ static const pcl_cap_t pcl_model_capabilities[] = emptylist, laserjet_papersources, }, + /* Some laser printers don't have expanded A4 margins */ + { 62, + 17 * 72 / 2, 14 * 72, + 1, 1, /* Min paper size */ + PCL_RES_150_150 | PCL_RES_300_300 | PCL_RES_600_600, + {12, 12, 18, 18}, + {12, 12, 18, 18}, /* Check/Fix */ + PCL_COLOR_NONE, + PCL_PRINTER_LJ | PCL_PRINTER_NEW_ERG | PCL_PRINTER_TIFF | PCL_PRINTER_BLANKLINE | + PCL_PRINTER_DUPLEX, + ljsmall_papersizes, + emptylist, + laserjet_papersources, + }, /* LaserJet 5Si */ { 7, 13 * 72, 19 * 72, @@ -1336,7 +1376,7 @@ static const char * pcl_val_to_text(int code, /* I: Code */ for (i=0; i<num_options; i++) { if (code == options[i].pcl_code) { - string=options[i].pcl_text; + string=gettext(options[i].pcl_text); break; } } @@ -1578,7 +1618,7 @@ pcl_parameters(const stp_vars_t *v, const char *name, const stp_papersize_t *pt = stp_get_papersize_by_index(i); if (strlen(pt->name) > 0 && pcl_papersize_valid(pt, model)) stp_string_list_add_string(description->bounds.str, - pt->name, pt->text); + pt->name, gettext(pt->text)); } description->deflt.str = stp_string_list_param(description->bounds.str, 0)->name; @@ -1650,9 +1690,9 @@ pcl_parameters(const stp_vars_t *v, const char *name, { description->deflt.str = ink_types[0].name; stp_string_list_add_string(description->bounds.str, - ink_types[0].name,_(ink_types[0].text)); + ink_types[0].name,gettext(ink_types[0].text)); stp_string_list_add_string(description->bounds.str, - ink_types[1].name,_(ink_types[1].text)); + ink_types[1].name,gettext(ink_types[1].text)); } else description->is_active = 0; @@ -1683,7 +1723,7 @@ pcl_parameters(const stp_vars_t *v, const char *name, for (i=0; i < NUM_DUPLEX; i++) { stp_string_list_add_string(description->bounds.str, - duplex_types[i].name,_(duplex_types[i].text)); + duplex_types[i].name,gettext(duplex_types[i].text)); } } else diff --git a/src/main/print-ps.c b/src/main/print-ps.c index d85dd94..702d2d7 100644 --- a/src/main/print-ps.c +++ b/src/main/print-ps.c @@ -1,5 +1,5 @@ /* - * "$Id: print-ps.c,v 1.84 2006/04/17 02:06:19 rlk Exp $" + * "$Id: print-ps.c,v 1.87 2006/06/04 18:06:34 rleigh Exp $" * * Print plug-in Adobe PostScript driver for the GIMP. * @@ -34,6 +34,7 @@ #include "gutenprint-internal.h" #include <time.h> #include <string.h> +#include <math.h> #ifdef HAVE_LIMITS_H #include <limits.h> #endif @@ -159,6 +160,8 @@ ps_parameters_internal(const stp_vars_t *v, const char *name, stp_fill_parameter_settings(description, &(the_parameters[i])); break; } + if (strcmp(name, "PPDFile") == 0) + return; if (strcmp(name, "PrintingMode") == 0) { @@ -183,7 +186,7 @@ ps_parameters_internal(const stp_vars_t *v, const char *name, const stp_papersize_t *pt = stp_get_papersize_by_index(i); if (strlen(pt->name) > 0) stp_string_list_add_string - (description->bounds.str, pt->name, pt->text); + (description->bounds.str, pt->name, gettext(pt->text)); } description->deflt.str = stp_string_list_param(description->bounds.str, 0)->name; @@ -230,9 +233,9 @@ static void ps_parameters(const stp_vars_t *v, const char *name, stp_parameter_t *description) { - setlocale(LC_ALL, "C"); + char *locale = setlocale(LC_ALL, "C"); ps_parameters_internal(v, name, description); - setlocale(LC_ALL, ""); + setlocale(LC_ALL, locale); } /* @@ -260,8 +263,8 @@ ps_media_size_internal(const stp_vars_t *v, /* I */ != NULL) { sscanf(dimensions, "%f%f", &fwidth, &fheight); - *width = fwidth; - *height = fheight; + *width = (int) fwidth; + *height = (int) fheight; stp_dprintf(STP_DBG_PS, v, "dimensions '%s' %f %f %d %d\n", dimensions, fwidth, fheight, *width, *height); } @@ -272,9 +275,9 @@ ps_media_size_internal(const stp_vars_t *v, /* I */ static void ps_media_size(const stp_vars_t *v, int *width, int *height) { - setlocale(LC_ALL, "C"); + char *locale = setlocale(LC_ALL, "C"); ps_media_size_internal(v, width, height); - setlocale(LC_ALL, ""); + setlocale(LC_ALL, locale); } /* @@ -304,13 +307,16 @@ ps_imageable_area_internal(const stp_vars_t *v, /* I */ "ImageableArea", pagesize, NULL)) != NULL) { - stp_dprintf(STP_DBG_PS, v, "area = \'%s\'\n", area); - if (sscanf(area, "%f%f%f%f", &fleft, &fbottom, &fright, &ftop) == 4) + int status = sscanf(area, "%f%f%f%f", &fleft, &fbottom, &fright, &ftop); + stp_dprintf(STP_DBG_PS, v, + "area = \'%s\' status = %d l %f r %f b %f t %f h %d w %d\n", + area, status, fleft, fright, fbottom, ftop, width, height); + if (status) { - *left = (int)fleft; - *right = (int)fright; - *bottom = height - (int)fbottom; - *top = height - (int)ftop; + *left = (int) ceil((double) fleft); + *right = (int) floor((double) fright); + *bottom = (int) floor((double) height - fbottom); + *top = (int) ceil((double) height - ftop); if (use_max_area) { if (*left > 0) @@ -344,9 +350,9 @@ ps_imageable_area(const stp_vars_t *v, /* I */ int *bottom, /* O - Bottom position in points */ int *top) /* O - Top position in points */ { - setlocale(LC_ALL, "C"); + char *locale = setlocale(LC_ALL, "C"); ps_imageable_area_internal(v, 0, left, right, bottom, top); - setlocale(LC_ALL, ""); + setlocale(LC_ALL, locale); } static void @@ -356,9 +362,9 @@ ps_maximum_imageable_area(const stp_vars_t *v, /* I */ int *bottom, /* O - Bottom position in points */ int *top) /* O - Top position in points */ { - setlocale(LC_ALL, "C"); + char *locale = setlocale(LC_ALL, "C"); ps_imageable_area_internal(v, 1, left, right, bottom, top); - setlocale(LC_ALL, ""); + setlocale(LC_ALL, locale); } static void @@ -391,9 +397,9 @@ ps_describe_resolution_internal(const stp_vars_t *v, int *x, int *y) static void ps_describe_resolution(const stp_vars_t *v, int *x, int *y) { - setlocale(LC_ALL, "C"); + char *locale = setlocale(LC_ALL, "C"); ps_describe_resolution_internal(v, x, y); - setlocale(LC_ALL, ""); + setlocale(LC_ALL, locale); } static const char * @@ -454,6 +460,7 @@ ps_print_internal(const stp_vars_t *v, stp_image_t *image) int image_height, image_width; stp_vars_t *nv = stp_vars_create_copy(v); + char *locale; if (!resolution) resolution = ""; if (!media_size) @@ -638,11 +645,11 @@ ps_print_internal(const stp_vars_t *v, stp_image_t *image) always be printed with a decimal point rather than the locale-specific setting. */ - setlocale(LC_ALL, "C"); + locale = setlocale(LC_ALL, "C"); stp_zprintf(v, "%.3f %.3f scale\n", (double)out_width / ((double)image_width), (double)out_height / ((double)image_height)); - setlocale(LC_ALL, ""); + setlocale(LC_ALL, locale); stp_channel_reset(nv); stp_channel_add(nv, 0, 0, 1.0); @@ -766,10 +773,9 @@ ps_print_internal(const stp_vars_t *v, stp_image_t *image) static int ps_print(const stp_vars_t *v, stp_image_t *image) { - int status; - setlocale(LC_ALL, "C"); - status = ps_print_internal(v, image); - setlocale(LC_ALL, ""); + char *locale = setlocale(LC_ALL, "C"); + int status = ps_print_internal(v, image); + setlocale(LC_ALL, locale); return status; } diff --git a/src/main/print-vars.c b/src/main/print-vars.c index 5c3d621..c2b1d27 100644 --- a/src/main/print-vars.c +++ b/src/main/print-vars.c @@ -1,5 +1,5 @@ /* - * "$Id: print-vars.c,v 1.74 2005/10/26 01:28:35 rlk Exp $" + * "$Id: print-vars.c,v 1.75 2006/06/25 00:25:14 rlk Exp $" * * Print plug-in driver utility functions for the GIMP. * @@ -144,8 +144,14 @@ create_vars_list(void) static void copy_to_raw(stp_raw_t *raw, const void *data, size_t bytes) { - char *ndata = stp_malloc(bytes + 1); - memcpy(ndata, data, bytes); + char *ndata = NULL; + if (data) + { + ndata = stp_malloc(bytes + 1); + memcpy(ndata, data, bytes); + } + else + bytes = 0; ndata[bytes] = '\0'; raw->data = (void *) ndata; raw->bytes = bytes; diff --git a/src/main/print-weave.c b/src/main/print-weave.c index e33e737..ba008b0 100644 --- a/src/main/print-weave.c +++ b/src/main/print-weave.c @@ -1,5 +1,5 @@ /* - * "$Id: print-weave.c,v 1.64 2006/03/26 01:07:07 rlk Exp $" + * "$Id: print-weave.c,v 1.65 2006/07/07 22:34:43 rleigh Exp $" * * Softweave calculator for Gutenprint. * @@ -1164,7 +1164,7 @@ stp_initialize_weave(stp_vars_t *v, } static void -weave_parameters_by_row(const stp_vars_t *v, const stpi_softweave_t *sw, +weave_parameters_by_row(const stp_vars_t *v, stpi_softweave_t *sw, int row, int vertical_subpass, stp_weave_t *w) { int jetsused; @@ -1173,7 +1173,6 @@ weave_parameters_by_row(const stp_vars_t *v, const stpi_softweave_t *sw, * Conceptually, this does not modify the softweave state. We cache * the results, but this cache is considered hidden. */ - stpi_softweave_t *wsw = (stpi_softweave_t *) sw; vertical_subpass /= sw->repeat_count; if (sw->rcache == row && sw->vcache == vertical_subpass) @@ -1182,8 +1181,8 @@ weave_parameters_by_row(const stp_vars_t *v, const stpi_softweave_t *sw, w->pass = (w->pass * sw->repeat_count) + sub_repeat_count; return; } - wsw->rcache = row; - wsw->vcache = vertical_subpass; + sw->rcache = row; + sw->vcache = vertical_subpass; w->row = row; stpi_calculate_row_parameters(sw->weaveparm, row, vertical_subpass, @@ -1193,7 +1192,7 @@ weave_parameters_by_row(const stp_vars_t *v, const stpi_softweave_t *sw, w->physpassstart = w->logicalpassstart + sw->separation * w->missingstartrows; w->physpassend = w->physpassstart + sw->separation * (jetsused - 1); - memcpy(&(wsw->wcache), w, sizeof(stp_weave_t)); + memcpy(&(sw->wcache), w, sizeof(stp_weave_t)); w->pass = (w->pass * sw->repeat_count) + sub_repeat_count; stp_dprintf(STP_DBG_ROWS, v, "row %d, jet %d of pass %d " "(pos %d, start %d, end %d, missing rows %d)\n", @@ -1205,14 +1204,14 @@ void stp_weave_parameters_by_row(const stp_vars_t *v, int row, int vertical_subpass, stp_weave_t *w) { - const stpi_softweave_t *sw = + stpi_softweave_t *sw = (stpi_softweave_t *) stp_get_component_data(v, "Weave"); weave_parameters_by_row(v, sw, row, vertical_subpass, w); } static stp_lineoff_t * -stpi_get_lineoffsets(const stp_vars_t *v, const stpi_softweave_t *sw, +stpi_get_lineoffsets(const stp_vars_t *v, stpi_softweave_t *sw, int row, int subpass, int offset) { stp_weave_t w; @@ -1221,7 +1220,7 @@ stpi_get_lineoffsets(const stp_vars_t *v, const stpi_softweave_t *sw, } static stp_lineactive_t * -stpi_get_lineactive(const stp_vars_t *v, const stpi_softweave_t *sw, +stpi_get_lineactive(const stp_vars_t *v, stpi_softweave_t *sw, int row, int subpass, int offset) { stp_weave_t w; @@ -1230,7 +1229,7 @@ stpi_get_lineactive(const stp_vars_t *v, const stpi_softweave_t *sw, } static stp_linecount_t * -stpi_get_linecount(const stp_vars_t *v, const stpi_softweave_t *sw, +stpi_get_linecount(const stp_vars_t *v, stpi_softweave_t *sw, int row, int subpass, int offset) { stp_weave_t w; @@ -1239,7 +1238,7 @@ stpi_get_linecount(const stp_vars_t *v, const stpi_softweave_t *sw, } static stp_linebufs_t * -stpi_get_linebases(const stp_vars_t *v, const stpi_softweave_t *sw, +stpi_get_linebases(const stp_vars_t *v, stpi_softweave_t *sw, int row, int subpass, int offset) { stp_weave_t w; @@ -1248,7 +1247,7 @@ stpi_get_linebases(const stp_vars_t *v, const stpi_softweave_t *sw, } static stp_linebounds_t * -stpi_get_linebounds(const stp_vars_t *v, const stpi_softweave_t *sw, +stpi_get_linebounds(const stp_vars_t *v, stpi_softweave_t *sw, int row, int subpass, int offset) { stp_weave_t w; @@ -1257,7 +1256,7 @@ stpi_get_linebounds(const stp_vars_t *v, const stpi_softweave_t *sw, } static stp_pass_t * -stpi_get_pass_by_row(stp_vars_t *v, const stpi_softweave_t *sw, +stpi_get_pass_by_row(stp_vars_t *v, stpi_softweave_t *sw, int row, int subpass,int offset) { stp_weave_t w; @@ -1306,7 +1305,7 @@ stp_get_pass_by_pass(const stp_vars_t *v, int pass) } static void -check_linebases(stp_vars_t *v, const stpi_softweave_t *sw, +check_linebases(stp_vars_t *v, stpi_softweave_t *sw, int row, int cpass, int head_offset, int color) { stp_linebufs_t *bufs = diff --git a/src/main/printers.xml b/src/main/printers.xml index 81d197b..c9e444e 100644 --- a/src/main/printers.xml +++ b/src/main/printers.xml @@ -4,7 +4,7 @@ XML description of printers known to libgutenprint This file was originally generated. It should be edited by hand. - "$Id: printers.xml,v 1.144 2006/03/12 22:22:12 rlk Exp $" + "$Id: printers.xml,v 1.146 2006/07/07 13:11:42 rlk Exp $" --> <gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0" @@ -675,68 +675,68 @@ <printer name="IBM Infoprint 12" driver="ibm-infoprint_12" manufacturer="IBM" model="6" parameters="pcl_laser_params" /> <printer name="IBM Page Printer 3112" driver="ibm-pp_3112" manufacturer="IBM" model="6" parameters="pcl_laser_params" /> <printer name="Infotec 4651 MF" driver="infotec-4651_mf" manufacturer="Infotec" model="6" parameters="pcl_laser_params" /> - <printer name="Kyocera F-1010" driver="kyocera-f-1010" manufacturer="Kyocera" model="2" parameters="pcl_laser_params" /> - <printer name="Kyocera FS-600 - KPDL-2" driver="kyocera-fs-600_kpdl-2" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" /> - <printer name="Kyocera FS-600" driver="kyocera-fs-600" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" /> - <printer name="Kyocera FS-680" driver="kyocera-fs-680" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" /> - <printer name="Kyocera FS-800" driver="kyocera-fs-800" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" /> - <printer name="Kyocera FS-1000" driver="kyocera-fs-1000" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" /> - <printer name="Kyocera FS-1000+" driver="kyocera-fs-1000plus" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" /> - <printer name="Kyocera FS-1010" driver="kyocera-fs-1010" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" /> - <printer name="Kyocera FS-1050" driver="kyocera-fs-1050" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" /> - <printer name="Kyocera FS-1200" driver="kyocera-fs-1200" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" /> - <printer name="Kyocera FS-1600" driver="kyocera-fs-1600" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" /> - <printer name="Kyocera FS-1600+" driver="kyocera-fs-1600plus" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" /> - <printer name="Kyocera FS-1700" driver="kyocera-fs-1700" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" /> - <printer name="Kyocera FS-1700+" driver="kyocera-fs-1700plus" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" /> - <printer name="Kyocera FS-1750" driver="kyocera-fs-1750" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" /> - <printer name="Kyocera FS-1800" driver="kyocera-fs-1800" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" /> - <printer name="Kyocera FS-1800+" driver="kyocera-fs-1800plus" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" /> - <printer name="Kyocera FS-1900" driver="kyocera-fs-1900" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" /> - <printer name="Kyocera FS-3500" driver="kyocera-fs-3500" manufacturer="Kyocera" model="3" parameters="pcl_laser_params" /> - <printer name="Kyocera FS-3600" driver="kyocera-fs-3600" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" /> - <printer name="Kyocera FS-3600+" driver="kyocera-fs-3600plus" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" /> - <printer name="Kyocera FS-3700" driver="kyocera-fs-3700" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" /> - <printer name="Kyocera FS-3700+" driver="kyocera-fs-3700plus" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" /> - <printer name="Kyocera FS-3750" driver="kyocera-fs-3750" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" /> - <printer name="Kyocera FS-3800" driver="kyocera-fs-3800" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" /> - <printer name="Kyocera FS-5800C" driver="kyocera-fs-5800c" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" /> - <printer name="Kyocera FS-5900C" driver="kyocera-fs-5900c" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" /> - <printer name="Kyocera FS-6500" driver="kyocera-fs-6500" manufacturer="Kyocera" model="3" parameters="pcl_laser_params" /> - <printer name="Kyocera FS-6500+" driver="kyocera-fs-6500plus" manufacturer="Kyocera" model="3" parameters="pcl_laser_params" /> - <printer name="Kyocera FS-6700" driver="kyocera-fs-6700" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" /> - <printer name="Kyocera FS-7000" driver="kyocera-fs-7000" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" /> - <printer name="Kyocera FS-7000+" driver="kyocera-fs-7000plus" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" /> - <printer name="Kyocera FS-8000C" driver="kyocera-fs-8000c" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" /> - <printer name="Kyocera FS-9000" driver="kyocera-fs-9000" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" /> - <printer name="Kyocera FS-9100DN" driver="kyocera-fs-9100dn" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" /> - <printer name="Kyocera FS-9500DN" driver="kyocera-fs-9500dn" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" /> - <printer name="Kyocera KM-1530" driver="kyocera-km-1530" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" /> - <printer name="Kyocera KM-1810" driver="kyocera-km-1810" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" /> - <printer name="Kyocera KM-2030" driver="kyocera-km-2030" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" /> - <printer name="Kyocera KM-2530" driver="kyocera-km-2530" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" /> - <printer name="Kyocera KM-3530" driver="kyocera-km-3530" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" /> - <printer name="Kyocera KM-4230" driver="kyocera-km-4230" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" /> - <printer name="Kyocera KM-4530" driver="kyocera-km-4530" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" /> - <printer name="Kyocera KM-5230" driver="kyocera-km-5230" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" /> - <printer name="Kyocera KM-5530" driver="kyocera-km-5530" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" /> - <printer name="Kyocera KM-6230" driver="kyocera-km-6230" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" /> + <printer name="Kyocera F-1010" driver="kyocera-f-1010" manufacturer="Kyocera" model="22" parameters="pcl_laser_params" /> + <printer name="Kyocera FS-600 - KPDL-2" driver="kyocera-fs-600_kpdl-2" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" /> + <printer name="Kyocera FS-600" driver="kyocera-fs-600" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" /> + <printer name="Kyocera FS-680" driver="kyocera-fs-680" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" /> + <printer name="Kyocera FS-800" driver="kyocera-fs-800" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" /> + <printer name="Kyocera FS-1000" driver="kyocera-fs-1000" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" /> + <printer name="Kyocera FS-1000+" driver="kyocera-fs-1000plus" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" /> + <printer name="Kyocera FS-1010" driver="kyocera-fs-1010" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" /> + <printer name="Kyocera FS-1050" driver="kyocera-fs-1050" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" /> + <printer name="Kyocera FS-1200" driver="kyocera-fs-1200" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" /> + <printer name="Kyocera FS-1600" driver="kyocera-fs-1600" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" /> + <printer name="Kyocera FS-1600+" driver="kyocera-fs-1600plus" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" /> + <printer name="Kyocera FS-1700" driver="kyocera-fs-1700" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" /> + <printer name="Kyocera FS-1700+" driver="kyocera-fs-1700plus" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" /> + <printer name="Kyocera FS-1750" driver="kyocera-fs-1750" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" /> + <printer name="Kyocera FS-1800" driver="kyocera-fs-1800" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" /> + <printer name="Kyocera FS-1800+" driver="kyocera-fs-1800plus" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" /> + <printer name="Kyocera FS-1900" driver="kyocera-fs-1900" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" /> + <printer name="Kyocera FS-3500" driver="kyocera-fs-3500" manufacturer="Kyocera" model="32" parameters="pcl_laser_params" /> + <printer name="Kyocera FS-3600" driver="kyocera-fs-3600" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" /> + <printer name="Kyocera FS-3600+" driver="kyocera-fs-3600plus" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" /> + <printer name="Kyocera FS-3700" driver="kyocera-fs-3700" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" /> + <printer name="Kyocera FS-3700+" driver="kyocera-fs-3700plus" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" /> + <printer name="Kyocera FS-3750" driver="kyocera-fs-3750" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" /> + <printer name="Kyocera FS-3800" driver="kyocera-fs-3800" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" /> + <printer name="Kyocera FS-5800C" driver="kyocera-fs-5800c" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" /> + <printer name="Kyocera FS-5900C" driver="kyocera-fs-5900c" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" /> + <printer name="Kyocera FS-6500" driver="kyocera-fs-6500" manufacturer="Kyocera" model="32" parameters="pcl_laser_params" /> + <printer name="Kyocera FS-6500+" driver="kyocera-fs-6500plus" manufacturer="Kyocera" model="32" parameters="pcl_laser_params" /> + <printer name="Kyocera FS-6700" driver="kyocera-fs-6700" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" /> + <printer name="Kyocera FS-7000" driver="kyocera-fs-7000" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" /> + <printer name="Kyocera FS-7000+" driver="kyocera-fs-7000plus" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" /> + <printer name="Kyocera FS-8000C" driver="kyocera-fs-8000c" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" /> + <printer name="Kyocera FS-9000" driver="kyocera-fs-9000" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" /> + <printer name="Kyocera FS-9100DN" driver="kyocera-fs-9100dn" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" /> + <printer name="Kyocera FS-9500DN" driver="kyocera-fs-9500dn" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" /> + <printer name="Kyocera KM-1530" driver="kyocera-km-1530" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" /> + <printer name="Kyocera KM-1810" driver="kyocera-km-1810" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" /> + <printer name="Kyocera KM-2030" driver="kyocera-km-2030" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" /> + <printer name="Kyocera KM-2530" driver="kyocera-km-2530" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" /> + <printer name="Kyocera KM-3530" driver="kyocera-km-3530" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" /> + <printer name="Kyocera KM-4230" driver="kyocera-km-4230" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" /> + <printer name="Kyocera KM-4530" driver="kyocera-km-4530" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" /> + <printer name="Kyocera KM-5230" driver="kyocera-km-5230" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" /> + <printer name="Kyocera KM-5530" driver="kyocera-km-5530" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" /> + <printer name="Kyocera KM-6230" driver="kyocera-km-6230" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" /> <printer name="Lexmark 4076" driver="lexmark-4076" manufacturer="Lexmark" model="500" parameters="pcl_inkjet_params" /> <printer name="Lexmark Optra E" driver="lexmark-optra_e" manufacturer="Lexmark" model="6" parameters="pcl_laser_params" /> <printer name="Lexmark Optra E+" driver="lexmark-optra_eplus" manufacturer="Lexmark" model="6" parameters="pcl_laser_params" /> <printer name="Lexmark Valuewriter 300" driver="lexmark-vw_300" manufacturer="Lexmark" model="2" parameters="pcl_laser_params" /> - <printer name="Minolta PagePro 1100" driver="minolta-pp_1100" manufacturer="Minolta" model="6" parameters="pcl_laser_params" /> <printer name="Minolta PagePro 6" driver="minolta-pp_6" manufacturer="Minolta" model="6" parameters="pcl_laser_params" /> <printer name="Minolta PagePro 6e" driver="minolta-pp_6e" manufacturer="Minolta" model="6" parameters="pcl_laser_params" /> <printer name="Minolta PagePro 6ex" driver="minolta-pp_6ex" manufacturer="Minolta" model="6" parameters="pcl_laser_params" /> <printer name="Minolta PagePro 8" driver="minolta-pp_8" manufacturer="Minolta" model="6" parameters="pcl_laser_params" /> <printer name="Minolta PagePro 8L" driver="minolta-pp_8l" manufacturer="Minolta" model="2" parameters="pcl_laser_params" /> - <printer name="NEC SuperScript 1260" driver="nec-ssc_1260" manufacturer="NEC" model="2" parameters="pcl_laser_params" /> - <printer name="NEC SuperScript 1400" driver="nec-ssc_1400" manufacturer="NEC" model="6" parameters="pcl_laser_params" /> - <printer name="NEC SuperScript 1800" driver="nec-ssc_1800" manufacturer="NEC" model="6" parameters="pcl_laser_params" /> + <printer name="Minolta PagePro 1100" driver="minolta-pp_1100" manufacturer="Minolta" model="6" parameters="pcl_laser_params" /> <printer name="NEC SuperScript 660i" driver="nec-ssc_660i" manufacturer="NEC" model="6" parameters="pcl_laser_params" /> <printer name="NEC SuperScript 860" driver="nec-ssc_860" manufacturer="NEC" model="2" parameters="pcl_laser_params" /> <printer name="NEC SuperScript 870" driver="nec-ssc_870" manufacturer="NEC" model="2" parameters="pcl_laser_params" /> + <printer name="NEC SuperScript 1260" driver="nec-ssc_1260" manufacturer="NEC" model="2" parameters="pcl_laser_params" /> + <printer name="NEC SuperScript 1400" driver="nec-ssc_1400" manufacturer="NEC" model="6" parameters="pcl_laser_params" /> + <printer name="NEC SuperScript 1800" driver="nec-ssc_1800" manufacturer="NEC" model="6" parameters="pcl_laser_params" /> <printer name="Okidata OL400" driver="okidata-ol400" manufacturer="Okidata" model="2" parameters="pcl_laser_params" /> <printer name="Okidata OL400e" driver="okidata-ol400e" manufacturer="Okidata" model="2" parameters="pcl_laser_params" /> <printer name="Okidata OL400ex" driver="okidata-ol400ex" manufacturer="Okidata" model="2" parameters="pcl_laser_params" /> diff --git a/src/main/sequence.c b/src/main/sequence.c index f51a6ed..ef69990 100644 --- a/src/main/sequence.c +++ b/src/main/sequence.c @@ -1,5 +1,5 @@ /* - * "$Id: sequence.c,v 1.21 2005/06/30 02:11:49 rlk Exp $" + * "$Id: sequence.c,v 1.22 2006/07/07 21:31:02 rleigh Exp $" * * Sequence data type. This type is designed to be derived from by * the curve and dither matrix types. @@ -70,7 +70,7 @@ check_sequence(const stp_sequence_t *v) } } -static stp_sequence_t * +static inline stp_sequence_t * deconst_sequence(const stp_sequence_t *sequence) { return (stp_sequence_t *) sequence; |