diff options
Diffstat (limited to 'src')
113 files changed, 16023 insertions, 4040 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index afa9459..5421d27 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -43,11 +43,14 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \ - $(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \ - $(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/stp.m4 \ + $(top_srcdir)/m4/stp_cups.m4 $(top_srcdir)/m4/stp_gimp.m4 \ + $(top_srcdir)/m4/stp_option.m4 $(top_srcdir)/m4/stp_release.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs @@ -87,10 +90,6 @@ CUPS_CFLAGS = @CUPS_CFLAGS@ CUPS_CONFIG = @CUPS_CONFIG@ CUPS_LIBS = @CUPS_LIBS@ CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DB2HTML = @DB2HTML@ DB2PDF = @DB2PDF@ @@ -100,16 +99,15 @@ DEPDIR = @DEPDIR@ DIALOG = @DIALOG@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ DVIPDF = @DVIPDF@ DVIPS = @DVIPS@ -ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ FIND = @FIND@ FOOMATIC_CONFIGURE = @FOOMATIC_CONFIGURE@ FOOMATIC_KITLOAD = @FOOMATIC_KITLOAD@ @@ -154,6 +152,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTLLIBS = @INTLLIBS@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -165,6 +164,7 @@ LIBREADLINE_DEPS = @LIBREADLINE_DEPS@ LIBS = $(INTLLIBS) @LIBS@ LIBTOOL = @LIBTOOL@ LIBTOOL_DEPS = @LIBTOOL_DEPS@ +LIPO = @LIPO@ LN_S = @LN_S@ LTALLOCA = @LTALLOCA@ LTLIBICONV = @LTLIBICONV@ @@ -177,8 +177,12 @@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ +NM = @NM@ NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -212,8 +216,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -258,6 +261,7 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -270,6 +274,7 @@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS) diff --git a/src/cups/Makefile.am b/src/cups/Makefile.am index c093bde..bebc47f 100644 --- a/src/cups/Makefile.am +++ b/src/cups/Makefile.am @@ -1,4 +1,4 @@ -## $Id: Makefile.am,v 1.118 2008/09/22 03:10:45 easysw Exp $ +## $Id: Makefile.am,v 1.119 2009/04/11 16:16:20 rlk Exp $ ## Copyright (C) 2000 Roger Leigh ## ## This program is free software; you can redistribute it and/or modify @@ -182,10 +182,11 @@ all-local: $(INSTALL_DATA_LOCAL_DEPS) ppd: ppd-stamp ppd-stamp: cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ $(top_srcdir)/src/xml/xml-stamp + $(MAKE) ppd-stamp-pre $(MAKE) ppd-stamp-phony touch ppd-stamp -ppd-stamp-phony: ppd-stamp-pre $(PPD) +ppd-stamp-phony: $(PPD) ppd-stamp-pre: -$(RM) -r ppd diff --git a/src/cups/Makefile.in b/src/cups/Makefile.in index 4bbd121..29ce8e8 100644 --- a/src/cups/Makefile.in +++ b/src/cups/Makefile.in @@ -52,11 +52,14 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \ - $(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \ - $(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/stp.m4 \ + $(top_srcdir)/m4/stp_cups.m4 $(top_srcdir)/m4/stp_gimp.m4 \ + $(top_srcdir)/m4/stp_option.m4 $(top_srcdir)/m4/stp_release.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs @@ -175,10 +178,6 @@ CUPS_CFLAGS = @CUPS_CFLAGS@ CUPS_CONFIG = @CUPS_CONFIG@ CUPS_LIBS = @CUPS_LIBS@ CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DB2HTML = @DB2HTML@ DB2PDF = @DB2PDF@ @@ -188,16 +187,15 @@ DEPDIR = @DEPDIR@ DIALOG = @DIALOG@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ DVIPDF = @DVIPDF@ DVIPS = @DVIPS@ -ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ FIND = @FIND@ FOOMATIC_CONFIGURE = @FOOMATIC_CONFIGURE@ FOOMATIC_KITLOAD = @FOOMATIC_KITLOAD@ @@ -242,6 +240,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTLLIBS = @INTLLIBS@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -253,6 +252,7 @@ LIBREADLINE_DEPS = @LIBREADLINE_DEPS@ LIBS = $(INTLLIBS) @LIBS@ LIBTOOL = @LIBTOOL@ LIBTOOL_DEPS = @LIBTOOL_DEPS@ +LIPO = @LIPO@ LN_S = @LN_S@ LTALLOCA = @LTALLOCA@ LTLIBICONV = @LTLIBICONV@ @@ -265,8 +265,12 @@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ +NM = @NM@ NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = cups PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -300,8 +304,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -346,6 +349,7 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -358,6 +362,7 @@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS) @@ -1087,10 +1092,11 @@ all-local: $(INSTALL_DATA_LOCAL_DEPS) ppd: ppd-stamp ppd-stamp: cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ $(top_srcdir)/src/xml/xml-stamp + $(MAKE) ppd-stamp-pre $(MAKE) ppd-stamp-phony touch ppd-stamp -ppd-stamp-phony: ppd-stamp-pre $(PPD) +ppd-stamp-phony: $(PPD) ppd-stamp-pre: -$(RM) -r ppd diff --git a/src/cups/cups-genppdupdate.in b/src/cups/cups-genppdupdate.in index 48324ee..1286c45 100644 --- a/src/cups/cups-genppdupdate.in +++ b/src/cups/cups-genppdupdate.in @@ -1,5 +1,5 @@ #! @PERL@ -w -# $Id: cups-genppdupdate.in,v 1.53 2008/09/22 11:04:24 rlk Exp $ +# $Id: cups-genppdupdate.in,v 1.57 2009/06/07 02:34:55 rlk Exp $ # Update CUPS PPDs for Gutenprint queues. # Copyright (C) 2002-2003 Roger Leigh (rleigh@debian.org) # @@ -20,8 +20,11 @@ use strict; use Getopt::Std; use Fcntl qw(:mode); +use FileHandle; +use IPC::Open2; sub parse_options (); +sub get_driver_version (); sub update_ppd ($); # Original PPD filename sub get_ppd_fh ($$$$$); # Return contents of desired PPD sub find_ppd ($$$$); # Gutenprint Filename, driver, language (e.g. en, sv), @@ -68,9 +71,11 @@ my @languages = qw(Global C @ALL_LINGUAS@); my $serverdir = "@cups_conf_serverbin@"; my $driver_bin = "$serverdir/driver/gutenprint.$version"; my $driver_version = ""; +my $server_multicat = 0; +my $server_multicat_initialized = 0; + if (-x $driver_bin) { - $driver_version = `$driver_bin VERSION`; - chomp $driver_version; + get_driver_version(); } $Getopt::Std::STANDARD_HELP_VERSION = 1; @@ -222,6 +227,24 @@ sub VERSION_MESSAGE($;$$$) { sub help() { HELP_MESSAGE(\*STDOUT); } + +sub check_multicat() { +} + +sub get_driver_version() { + open(DBIN, "$driver_bin org.gutenprint.extensions 2>/dev/null |") or return 0; + my ($line); + $server_multicat = 0; + while ($line = <DBIN>) { + if ($line =~ /^org.gutenprint.multicat$/) { + $server_multicat = 1; + last; + } + } + close DBIN; + $driver_version = `$driver_bin VERSION`; + chomp $driver_version; +} sub parse_options () { if (!getopts('d:hnqs:vNo:p:P:r:ifl:')) { @@ -259,6 +282,7 @@ sub parse_options () { if (-d $opt_s) { $ppd_base_dir = "$opt_s"; $driver_bin = ""; + $server_multicat = 0; $use_static_ppd = "yes"; } else { die "$opt_s: invalid directory: $!\n"; @@ -272,9 +296,8 @@ sub parse_options () { # for an exact match. $file_version = "\"$version"; if (-x $driver_bin) { - $driver_version = `$driver_bin VERSION`; + get_driver_version(); $use_static_ppd = "no"; - chomp $driver_version; $file_version = "\"$driver_version\"\$"; } elsif (! -d $ppd_base_dir && ! -l $ppd_base_dir) { die "Gutenprint $version does not appear to be installed!\n"; @@ -285,6 +308,7 @@ sub parse_options () { if (-d $opt_s) { $ppd_base_dir = "$opt_s"; $driver_bin = ""; + $server_multicat = 0; $driver_version = ""; $use_static_ppd = "yes"; } @@ -303,8 +327,7 @@ sub parse_options () { if ($opt_P) { if (-x $opt_P) { $driver_bin = "$opt_P"; - $driver_version = `$driver_bin VERSION`; - chomp $driver_version; + get_driver_version(); $use_static_ppd = "no"; } else { @@ -356,7 +379,15 @@ sub get_ppd_fh($$$$$) { foreach $url (@url_list) { $new_ppd_filename = $url; if ($debug & 8) { - print "Trying $driver_bin cat $url for $driver, $simplified, $locale, $region\n"; + print "Trying ", (! $server_multicat ? "$driver_bin cat " : ""), "$url for $driver, $simplified, $locale, $region\n"; + } + if ($server_multicat) { + if (! $server_multicat_initialized) { + my ($pid) = open2(*Reader, *Writer, "$driver_bin org.gutenprint.multicat"); + $server_multicat_initialized = 1; + } + print Writer "$url\n"; + return ($new_ppd_filename, \*Reader); } if (open PPD, "$driver_bin cat $url |") { return ($new_ppd_filename, \*PPD); @@ -491,11 +522,11 @@ sub update_ppd ($) { print "Update PPD $ppd_source_filename from $new_ppd_filename [nyq]? "; my $input = readline(*STDIN); if ($input =~ /^q/i) { - close $source_fd; + close $source_fd if !$server_multicat; print "Skipping all...\n"; return -2; } elsif (! ($input =~ /^y/i)) { - close $source_fd; + close $source_fd if !$server_multicat; print "Skipping...\n"; return -1; } @@ -511,7 +542,7 @@ sub update_ppd ($) { # Close original and temporary files... close ORIG; - if (! close $source_fd) { + if (! $server_multicat && ! close $source_fd) { print "Unable to retrieve new PPD file: $!\n"; return 0; } @@ -808,6 +839,7 @@ sub get_ppd_data(*$$$$$) { if ($resolutions || $types || $opts || $defaults || $data) { while (<$fh>) { + last if $_ eq "*%*%EOFEOF\n"; $source_data .= $_ if ($data); chomp; if (($types || $opts) && m/^\*OpenUI/) { diff --git a/src/cups/genppd.c b/src/cups/genppd.c index 580c59c..2af44a6 100644 --- a/src/cups/genppd.c +++ b/src/cups/genppd.c @@ -1,5 +1,5 @@ -/* - * "$Id: genppd.c,v 1.171 2008/12/05 03:27:20 easysw Exp $" + /* + * "$Id: genppd.c,v 1.178 2009/07/18 00:55:45 rlk Exp $" * * PPD file generation program for the CUPS drivers. * @@ -161,7 +161,7 @@ const char *parameter_level_names[] = */ #ifdef CUPS_DRIVER_INTERFACE -static int cat_ppd(int argc, char **argv); +static int cat_ppd(const char *uri); static int list_ppds(const char *argv0); #else /* !CUPS_DRIVER_INTERFACE */ static int generate_ppd(const char *prefix, int verbose, @@ -176,10 +176,12 @@ static char **getlangs(void); static int is_special_option(const char *name); static void print_group_close(gzFile fp, stp_parameter_class_t p_class, stp_parameter_level_t p_level, - const char *language, stp_string_list_t *po); + const char *language, + const stp_string_list_t *po); static void print_group_open(gzFile fp, stp_parameter_class_t p_class, stp_parameter_level_t p_level, - const char *language, stp_string_list_t *po); + const char *language, + const stp_string_list_t *po); static int write_ppd(gzFile fp, const stp_printer_t *p, const char *language, const char *ppd_location, int simplified); @@ -196,6 +198,13 @@ static int write_ppd(gzFile fp, const stp_printer_t *p, * 'main()' - Process files on the command-line... */ +const char slang_c[] = "LANG=C"; +const char slcall_c[] = "LC_ALL=C"; +const char slcnumeric_c[] = "LC_NUMERIC=C"; +char lang_c[sizeof(slang_c) + 1]; +char lcall_c[sizeof(slcall_c) + 1]; +char lcnumeric_c[sizeof(slcnumeric_c) + 1]; + int /* O - Exit status */ main(int argc, /* I - Number of command-line arguments */ char *argv[]) /* I - Command-line arguments */ @@ -204,9 +213,12 @@ main(int argc, /* I - Number of command-line arguments */ * Force POSIX locale, since stp_init incorrectly calls setlocale... */ - putenv((char *)"LANG=C"); - putenv((char *)"LC_ALL=C"); - putenv((char *)"LC_NUMERIC=C"); + strcpy(lang_c, slang_c); + strcpy(lcall_c, slcall_c); + strcpy(lcnumeric_c, slcnumeric_c); + putenv(lang_c); + putenv(lcall_c); + putenv(lcnumeric_c); /* * Initialise libgutenprint @@ -221,12 +233,34 @@ main(int argc, /* I - Number of command-line arguments */ if (argc == 2 && !strcmp(argv[1], "list")) return (list_ppds(argv[0])); else if (argc == 3 && !strcmp(argv[1], "cat")) - return (cat_ppd(argc, argv)); + return (cat_ppd(argv[2])); + else if (argc == 2 && !strcmp(argv[1], "org.gutenprint.multicat")) + { + char buf[1024]; + int status = 0; + while (status == 0 && fgets(buf, sizeof(buf) - 1, stdin)) + { + size_t len = strlen(buf); + if (len == 0) + continue; + if (buf[len - 1] == '\n') + buf[len - 1] = '\0'; + status = cat_ppd(buf); + fputs("*%*%EOFEOF\n", stdout); + (void) fflush(stdout); + } + return status; + } else if (argc == 2 && !strcmp(argv[1], "VERSION")) { printf("%s\n", VERSION); return (0); } + else if (argc == 2 && !strcasecmp(argv[1], "org.gutenprint.extensions")) + { + printf("org.gutenprint.multicat"); + return (0); + } else { fprintf(stderr, "Usage: %s list\n", argv[0]); @@ -241,9 +275,8 @@ main(int argc, /* I - Number of command-line arguments */ */ static int /* O - Exit status */ -cat_ppd(int argc, char **argv) /* I - Driver URI */ +cat_ppd(const char *uri) /* I - Driver URI */ { - const char *uri = argv[2]; char scheme[64], /* URI scheme */ userpass[32], /* URI user/pass (unused) */ hostname[32], /* URI hostname */ @@ -800,7 +833,7 @@ print_group( stp_parameter_class_t p_class, /* I - Option class */ stp_parameter_level_t p_level, /* I - Option level */ const char *language, /* I - Language */ - stp_string_list_t *po) /* I - Message catalog */ + const stp_string_list_t *po) /* I - Message catalog */ { char buf[64]; const char *class = stp_i18n_lookup(po, parameter_class_names[p_class]); @@ -816,7 +849,7 @@ print_group( for (langnum = 0; all_langs[langnum]; langnum ++) { - stp_string_list_t *altpo; + const stp_string_list_t *altpo; lang = all_langs[langnum]; @@ -846,7 +879,7 @@ print_group_close( stp_parameter_class_t p_class, /* I - Option class */ stp_parameter_level_t p_level, /* I - Option level */ const char *language, /* I - language */ - stp_string_list_t *po) /* I - Message catalog */ + const stp_string_list_t *po) /* I - Message catalog */ { print_group(fp, "Close", p_class, p_level, NULL, NULL); } @@ -862,7 +895,7 @@ print_group_open( stp_parameter_class_t p_class, /* I - Option class */ stp_parameter_level_t p_level, /* I - Option level */ const char *language, /* I - language */ - stp_string_list_t *po) /* I - Message catalog */ + const stp_string_list_t *po) /* I - Message catalog */ { print_group(fp, "Open", p_class, p_level, language ? language : "C", po); } @@ -911,7 +944,7 @@ write_ppd( char *default_resolution = NULL; /* Default resolution mapped name */ stp_string_list_t *resolutions = stp_string_list_create(); char **all_langs = getlangs();/* All languages */ - stp_string_list_t *po = stp_i18n_load(language); + const stp_string_list_t *po = stp_i18n_load(language); /* Message catalog */ @@ -1535,7 +1568,7 @@ write_ppd( !stp_string_list_is_present(res_list, res_name)) { resolution_ok = 1; - stp_string_list_add_string(res_list, res_name, res_name); + stp_string_list_add_string(res_list, res_name, opt->text); } else if (tmp_ydpi > tmp_xdpi && tmp_ydpi < MAXIMUM_SAFE_PPD_Y_RESOLUTION) @@ -1548,7 +1581,7 @@ write_ppd( else tmp_xdpi /= 2; } while (!resolution_ok); - stp_string_list_add_string(resolutions, res_name, res_name); + stp_string_list_add_string(resolutions, res_name, opt->text); gzprintf(fp, "*Resolution %s/%s:\t\"<</HWResolution[%d %d]/cupsCompression %d>>setpagedevice\"\n", res_name, stp_i18n_lookup(po, opt->text), xdpi, ydpi, i + 1); if (strcmp(res_name, opt->name) != 0) @@ -1760,7 +1793,7 @@ write_ppd( { gzprintf(fp, "*OpenUI *StpFine%s/%s %s: PickOne\n", desc.name, stp_i18n_lookup(po, desc.text), _("Fine Adjustment")); - gzprintf(fp, "*OPOptionHints Stp%s: \"hide\"\n", + gzprintf(fp, "*OPOptionHints StpFine%s: \"hide\"\n", lparam->name); gzprintf(fp, "*StpStpFine%s: %d %d %d %d %d %.3f %.3f %.3f\n", desc.name, STP_PARAMETER_TYPE_INVALID, 0, @@ -1860,7 +1893,7 @@ write_ppd( */ gzprintf(fp, "*CustomStp%s True: \"pop\"\n", desc.name); - gzprintf(fp, "*ParamCustomStp%s Value/%s: 1 points %d %d\n\n", + gzprintf(fp, "*ParamCustomStp%s Value/%s: 1 int %d %d\n\n", desc.name, _("Value"), desc.bounds.dimension.lower, desc.bounds.dimension.upper); @@ -1878,6 +1911,7 @@ write_ppd( print_group_close(fp, j, k, language, po); } } + stp_parameter_list_destroy(param_list); stp_describe_parameter(v, "ImageType", &desc); if (desc.is_active && desc.p_type == STP_PARAMETER_TYPE_STRING_LIST) { @@ -1906,7 +1940,7 @@ write_ppd( */ const char *lang; - stp_string_list_t *altpo; + const stp_string_list_t *altpo; int langnum; for (langnum = 0; all_langs[langnum]; langnum ++) @@ -2240,6 +2274,7 @@ write_ppd( } } } + stp_parameter_list_destroy(param_list); stp_describe_parameter(v, "ImageType", &desc); if (desc.is_active && desc.p_type == STP_PARAMETER_TYPE_STRING_LIST) { @@ -2262,8 +2297,6 @@ write_ppd( stp_free(default_resolution); stp_string_list_destroy(resolutions); - stp_parameter_list_destroy(param_list); - #undef _ #define _(x) x @@ -2320,5 +2353,5 @@ write_ppd( /* - * End of "$Id: genppd.c,v 1.171 2008/12/05 03:27:20 easysw Exp $". + * End of "$Id: genppd.c,v 1.178 2009/07/18 00:55:45 rlk Exp $". */ diff --git a/src/cups/i18n.c b/src/cups/i18n.c index 59406ec..81c4488 100644 --- a/src/cups/i18n.c +++ b/src/cups/i18n.c @@ -1,5 +1,5 @@ /* - * "$Id: i18n.c,v 1.6 2008/08/16 16:56:06 rlk Exp $" + * "$Id: i18n.c,v 1.8 2009/04/11 19:05:12 rlk Exp $" * * Internationalization functions for CUPS drivers. * @@ -87,7 +87,7 @@ static stpi_i18n_t *stpi_pocache = NULL; * 'stp_i18n_load()' - Load a message catalog for a locale. */ -stp_string_list_t * /* O - Message catalog */ +const stp_string_list_t * /* O - Message catalog */ stp_i18n_load(const char *locale) /* I - Locale name */ { stp_string_list_t *po; /* Message catalog */ @@ -385,6 +385,8 @@ stp_i18n_load(const char *locale) /* I - Locale name */ stpi_pocache = pocache; } + if (ic) + iconv_close(ic); return (po); } @@ -395,7 +397,7 @@ stp_i18n_load(const char *locale) /* I - Locale name */ const char * /* O - Localized message */ stp_i18n_lookup( - stp_string_list_t *po, /* I - Message catalog */ + const stp_string_list_t *po, /* I - Message catalog */ const char *message) /* I - Message */ { stp_param_string_t *param; /* Matching message */ @@ -414,7 +416,7 @@ stp_i18n_lookup( void stp_i18n_printf( - stp_string_list_t *po, /* I - Message catalog */ + const stp_string_list_t *po, /* I - Message catalog */ const char *message, /* I - Printf-style message */ ...) /* I - Additional arguments as needed */ { @@ -477,5 +479,5 @@ stpi_unquote(char *s) /* IO - Original string */ /* - * End of "$Id: i18n.c,v 1.6 2008/08/16 16:56:06 rlk Exp $". + * End of "$Id: i18n.c,v 1.8 2009/04/11 19:05:12 rlk Exp $". */ diff --git a/src/cups/i18n.h b/src/cups/i18n.h index f5ae7af..a75510b 100644 --- a/src/cups/i18n.h +++ b/src/cups/i18n.h @@ -1,5 +1,5 @@ /* - * "$Id: i18n.h,v 1.1 2008/08/13 07:35:52 easysw Exp $" + * "$Id: i18n.h,v 1.3 2009/04/11 19:05:12 rlk Exp $" * * Internationalization definitions for CUPS drivers. * @@ -35,13 +35,13 @@ * Prototypes... */ -extern stp_string_list_t *stp_i18n_load(const char *locale); -extern const char *stp_i18n_lookup(stp_string_list_t *po, +extern const stp_string_list_t *stp_i18n_load(const char *locale); +extern const char *stp_i18n_lookup(const stp_string_list_t *po, const char *message); -extern void stp_i18n_printf(stp_string_list_t *po, +extern void stp_i18n_printf(const stp_string_list_t *po, const char *message, ...); /* - * End of "$Id: i18n.h,v 1.1 2008/08/13 07:35:52 easysw Exp $". + * End of "$Id: i18n.h,v 1.3 2009/04/11 19:05:12 rlk Exp $". */ diff --git a/src/escputil/Makefile.in b/src/escputil/Makefile.in index d441e3c..07325b5 100644 --- a/src/escputil/Makefile.in +++ b/src/escputil/Makefile.in @@ -45,11 +45,14 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \ - $(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \ - $(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/stp.m4 \ + $(top_srcdir)/m4/stp_cups.m4 $(top_srcdir)/m4/stp_gimp.m4 \ + $(top_srcdir)/m4/stp_option.m4 $(top_srcdir)/m4/stp_release.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs @@ -98,10 +101,6 @@ CUPS_CFLAGS = @CUPS_CFLAGS@ CUPS_CONFIG = @CUPS_CONFIG@ CUPS_LIBS = @CUPS_LIBS@ CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DB2HTML = @DB2HTML@ DB2PDF = @DB2PDF@ @@ -111,16 +110,15 @@ DEPDIR = @DEPDIR@ DIALOG = @DIALOG@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ DVIPDF = @DVIPDF@ DVIPS = @DVIPS@ -ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ FIND = @FIND@ FOOMATIC_CONFIGURE = @FOOMATIC_CONFIGURE@ FOOMATIC_KITLOAD = @FOOMATIC_KITLOAD@ @@ -165,6 +163,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTLLIBS = @INTLLIBS@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -176,6 +175,7 @@ LIBREADLINE_DEPS = @LIBREADLINE_DEPS@ LIBS = $(INTLLIBS) @LIBS@ LIBTOOL = @LIBTOOL@ LIBTOOL_DEPS = @LIBTOOL_DEPS@ +LIPO = @LIPO@ LN_S = @LN_S@ LTALLOCA = @LTALLOCA@ LTLIBICONV = @LTLIBICONV@ @@ -188,8 +188,12 @@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ +NM = @NM@ NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -223,8 +227,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -269,6 +272,7 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -281,6 +285,7 @@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS) diff --git a/src/escputil/escputil.c b/src/escputil/escputil.c index df65b46..0d14b08 100644 --- a/src/escputil/escputil.c +++ b/src/escputil/escputil.c @@ -1,5 +1,5 @@ /* - * "$Id: escputil.c,v 1.99 2008/12/21 18:35:43 rlk Exp $" + * "$Id: escputil.c,v 1.100 2009/03/22 01:35:18 rlk Exp $" * * Printer maintenance utility for EPSON Stylus (R) printers * @@ -1242,7 +1242,7 @@ print_old_ink_levels(const char *ind, stp_string_list_t *color_list) if (!ind[0] || ind[0] == ';') return; val = (get_digit(ind[0]) << 4) + get_digit(ind[1]); - printf("%18s %20d\n", + printf("%20s %20d\n", gettext(stp_string_list_param(color_list, i)->text), val); ind += 2; } @@ -1292,7 +1292,7 @@ do_old_status(status_cmd_t cmd, const char *buf, const stp_printer_t *printer) if (cmd == CMD_STATUS) printf(_("Ink Levels:\n")); - printf("%18s %20s\n", _("Ink color"), _("Percent remaining")); + printf("%20s %20s\n", _("Ink color"), _("Percent remaining")); print_old_ink_levels(ind, color_list); stp_string_list_destroy(color_list); if (cmd == CMD_STATUS) @@ -1331,16 +1331,16 @@ do_new_status(status_cmd_t cmd, char *buf, int bytes, ind = buf + i + 3; if (cmd == CMD_STATUS) printf(_("Ink Levels:\n")); - printf("%18s %20s\n", _("Ink color"), _("Percent remaining")); + printf("%20s %20s\n", _("Ink color"), _("Percent remaining")); for (j = 0; j < count; j++) { if (ind[0] < color_count && param == 3 && (interchangeable_inks || ind[1] >= aux_color_count || ! aux_colors[(int) ind[1]])) - printf("%18s %20d\n", + printf("%20s %20d\n", gettext(colors_new[(int) ind[0]]), ind[2]); else if (ind[1] < aux_color_count && aux_colors[(int) ind[1]]) - printf("%18s %20d\n", + printf("%20s %20d\n", gettext(aux_colors[(int) ind[1]]), ind[2]); else printf("%8s 0x%02x 0x%02x %20d\n", @@ -1603,14 +1603,14 @@ do_extended_ink_info(int extended_output) &year2, &month2, &id2) == 12) { int j; - printf("%18s %20s %12s %7s\n", + printf("%20s %20s %12s %7s\n", _("Ink cartridge"), _("Percent remaining"), _("Part number"), _("Date")); - printf("%18s %20d T0%03d %2d%02d-%02d\n", + printf("%20s %20d T0%03d %2d%02d-%02d\n", gettext(stp_string_list_param(color_list, 0)->text), iv[0], id, (year > 80 ? 19 : 20), year, month); for (j = 1; j < 6; j++) - printf("%18s %20d T0%03d %2d%02d-%02d\n", + printf("%20s %20d T0%03d %2d%02d-%02d\n", gettext(stp_string_list_param(color_list, j)->text), iv[j], id2, (year2 > 80 ? 19 : 20), year2, month2); break; @@ -1627,14 +1627,14 @@ do_extended_ink_info(int extended_output) &year2, &month2, &id2) == 10) { int j; - printf("%18s %20s %12s %7s\n", + printf("%20s %20s %12s %7s\n", _("Ink cartridge"), _("Percent remaining"), _("Part number"), _("Date")); - printf("%18s %20d T0%03d %2d%02d-%02d\n", + printf("%20s %20d T0%03d %2d%02d-%02d\n", gettext(stp_string_list_param(color_list, 0)->text), iv[0], id, (year > 80 ? 19 : 20), year, month); for (j = 1; j < 4; j++) - printf("%18s %20d T0%03d %2d%02d-%02d\n", + printf("%20s %20d T0%03d %2d%02d-%02d\n", gettext(stp_string_list_param(color_list, j)->text), iv[j], id2, (year2 > 80 ? 19 : 20), year2, month2); break; @@ -1647,10 +1647,10 @@ do_extended_ink_info(int extended_output) &val, &year, &month, &id ) == 4) { if (i == 0) - printf("%18s %20s %12s %7s\n", + printf("%20s %20s %12s %7s\n", _("Ink cartridge"), _("Percent remaining"), _("Part number"), _("Date")); - printf("%18s %20d T0%03d %2d%02d-%02d\n", + printf("%20s %20d T0%03d %2d%02d-%02d\n", gettext(stp_string_list_param(color_list, i)->text), val, id, (year > 80 ? 19 : 20), year, month); } diff --git a/src/foomatic/Makefile.in b/src/foomatic/Makefile.in index 2267efe..2be4684 100644 --- a/src/foomatic/Makefile.in +++ b/src/foomatic/Makefile.in @@ -50,11 +50,14 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \ - $(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \ - $(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/stp.m4 \ + $(top_srcdir)/m4/stp_cups.m4 $(top_srcdir)/m4/stp_gimp.m4 \ + $(top_srcdir)/m4/stp_option.m4 $(top_srcdir)/m4/stp_release.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs @@ -116,10 +119,6 @@ CUPS_CFLAGS = @CUPS_CFLAGS@ CUPS_CONFIG = @CUPS_CONFIG@ CUPS_LIBS = @CUPS_LIBS@ CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DB2HTML = @DB2HTML@ DB2PDF = @DB2PDF@ @@ -129,16 +128,15 @@ DEPDIR = @DEPDIR@ DIALOG = @DIALOG@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ DVIPDF = @DVIPDF@ DVIPS = @DVIPS@ -ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ FIND = @FIND@ FOOMATIC_CONFIGURE = @FOOMATIC_CONFIGURE@ FOOMATIC_KITLOAD = @FOOMATIC_KITLOAD@ @@ -183,6 +181,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTLLIBS = @INTLLIBS@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -194,6 +193,7 @@ LIBREADLINE_DEPS = @LIBREADLINE_DEPS@ LIBS = $(INTLLIBS) @LIBS@ LIBTOOL = @LIBTOOL@ LIBTOOL_DEPS = @LIBTOOL_DEPS@ +LIPO = @LIPO@ LN_S = @LN_S@ LTALLOCA = @LTALLOCA@ LTLIBICONV = @LTLIBICONV@ @@ -206,8 +206,12 @@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ +NM = @NM@ NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -241,8 +245,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -287,6 +290,7 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -299,6 +303,7 @@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS) diff --git a/src/foomatic/foomatic-printermap b/src/foomatic/foomatic-printermap index ff2b87d..11121aa 100644 --- a/src/foomatic/foomatic-printermap +++ b/src/foomatic/foomatic-printermap @@ -85,6 +85,7 @@ #gptofoo canon-cp400 printer/Canon-SELPHY-CP-400 #gptofoo canon-cp500 printer/Canon-SELPHY-CP-500 #gptofoo canon-cp510 printer/Canon-SELPHY-CP-510 +#gptofoo canon-cp520 printer/Canon-SELPHY-CP-520 #gptofoo canon-cp600 printer/Canon-SELPHY-CP-600 #gptofoo canon-cp710 printer/Canon-SELPHY-CP-710 #gptofoo canon-cp720 printer/Canon-SELPHY-CP-720 @@ -109,6 +110,7 @@ #gptofoo bjc-PIXMA-iP6000D printer/Canon-PIXMA-iP6000D #gptofoo bjc-PIXMA-iP6700 printer/Canon-PIXMA-iP6700 #gptofoo bjc-PIXMA-iP8500 printer/Canon-PIXMA-iP8500 +#gptofoo bjc-PIXMA-iX4000 printer/Canon-PIXMA-iX4000 #gptofoo bjc-PIXMA-iX5000 printer/Canon-PIXMA-iX5000 #gptofoo bjc-PIXMA-Pro9500 printer/Canon-PIXMA-Pro9500 #gptofoo bjc-MULTIPASS-MP150 printer/Canon-MULTIPASS-MP150 @@ -141,6 +143,8 @@ #gptofoo compaq-ij1200 printer/Compaq-IJ1200 #gptofoo dec-1800 printer/DEC-1800 #gptofoo dec-ln17 printer/DEC-LN17 +#gptofoo dnp-ds40 printer/DNP-DS40 +#gptofoo dnp-ds80 printer/DNP-DS80 #gptofoo epson-actl_1100 printer/Epson-ActionLaser_1100 #gptofoo epson-actl_ii printer/Epson-ActionLaser_II #gptofoo epson-acl_c2000 printer/Epson-AcuLaser_C2000 @@ -242,6 +246,7 @@ #gptofoo escp2-pmg4500 printer/Epson-PM_G4500 #gptofoo escp2-pmt960 printer/Epson-PM_T960 #gptofoo escp2-px5500 printer/Epson-PX_5500 +#gptofoo escp2-pxg5600 printer/Epson-PX_G5600 #gptofoo escp2-px7000 printer/Epson-PX_7000 #gptofoo escp2-px9000 printer/Epson-PX_9000 #gptofoo escp2-pxa650 printer/Epson-PX_A650 @@ -394,6 +399,7 @@ #gptofoo escp2-d120 printer/Epson-Stylus_D120 #gptofoo escp2-dx3800 printer/Epson-Stylus_DX3800 #gptofoo escp2-dx3850 printer/Epson-Stylus_DX3850 +#gptofoo escp2-dx4000 printer/Epson-Stylus_DX4000 #gptofoo escp2-dx4050 printer/Epson-Stylus_DX4050 #gptofoo escp2-dx4200 printer/Epson-Stylus_DX4200 #gptofoo escp2-dx4250 printer/Epson-Stylus_DX4250 @@ -448,6 +454,7 @@ #gptofoo escp2-r1800 printer/Epson-Stylus_Photo_R1800 #gptofoo escp2-r1900 printer/Epson-Stylus_Photo_R1900 #gptofoo escp2-r2400 printer/Epson-Stylus_Photo_R2400 +#gptofoo escp2-r2880 printer/Epson-Stylus_Photo_R2880 #gptofoo escp2-r200 printer/Epson-Stylus_Photo_R200 #gptofoo escp2-r210 printer/Epson-Stylus_Photo_R210 #gptofoo escp2-r220 printer/Epson-Stylus_Photo_R220 @@ -530,7 +537,7 @@ #gptofoo escp2-wf40 printer/Epson-WorkForce_40 #gptofoo escp2-wf500 printer/Epson-WorkForce_500 #gptofoo escp2-wf600 printer/Epson-WorkForce_600 -#gptofoo escp2-px700fw printer/Epson-Stylus_PX700FW +#gptofoo escp2-px700fw printer/Epson-Stylus_PX700W #gptofoo escp2-px800fw printer/Epson-Stylus_PX800FW #gptofoo escp2-s20 printer/Epson-Stylus_S20 #gptofoo escp2-sx100 printer/Epson-Stylus_SX100 @@ -551,7 +558,7 @@ #gptofoo escp2-tx200 printer/Epson-Stylus_TX200 #gptofoo escp2-tx400 printer/Epson-Stylus_TX400 #gptofoo escp2-tx700w printer/Epson-Stylus_Photo_TX700W -#gptofoo escp2-tx800w printer/Epson-Stylus_Photo_TX800W +#gptofoo escp2-tx800w printer/Epson-Stylus_Photo_TX800FW #gptofoo fujifilm-cx400 printer/Fujifilm-Printpix-CX-400 #gptofoo fujifilm-cx550 printer/Fujifilm-Printpix-CX-550 #gptofoo fujifilm-nx500 printer/Fujifilm-FinePix-NX-500 @@ -997,11 +1004,9 @@ #gptofoo gestetner-2712 printer/Gestetner-2712 #gptofoo gestetner-3212 printer/Gestetner-3212 #gptofoo gestetner-3502 printer/Gestetner-3502 -#gptofoo gestetner-3532 printer/Gestetner-3532 -#gptofoo gestetner-4235g printer/Gestetner-4235g +#gptofoo gestetner-4235g printer/Gestetner-3532_4235g #gptofoo gestetner-4502 printer/Gestetner-4502 -#gptofoo gestetner-4532 printer/Gestetner-4532 -#gptofoo gestetner-4245g printer/Gestetner-4245g +#gptofoo gestetner-4245g printer/Gestetner-4532_4245g #gptofoo gestetner-6002 printer/Gestetner-6002 #gptofoo gestetner-7502 printer/Gestetner-7502 #gptofoo gestetner-9002 printer/Gestetner-9002 @@ -1014,49 +1019,31 @@ #gptofoo gestetner-dsm620d printer/Gestetner-DSm620d #gptofoo gestetner-dsm622 printer/Gestetner-DSm622 #gptofoo gestetner-dsm627 printer/Gestetner-DSm627 -#gptofoo gestetner-dsm635 printer/Gestetner-DSm635 -#gptofoo gestetner-dsm635g printer/Gestetner-DSm635G -#gptofoo gestetner-dsm645 printer/Gestetner-DSm645 -#gptofoo gestetner-ds645g printer/Gestetner-DS645G +#gptofoo gestetner-dsm635g printer/Gestetner-DSm635_635G +#gptofoo gestetner-ds645g printer/Gestetner-DSm645_645G #gptofoo gestetner-dsm651 printer/Gestetner-DSm651 #gptofoo gestetner-dsm660 printer/Gestetner-DSm660 #gptofoo gestetner-dsm675 printer/Gestetner-DSm675 #gptofoo gestetner-dsm725 printer/Gestetner-DSm725 #gptofoo gestetner-dsm730 printer/Gestetner-DSm730 -#gptofoo gestetner-dsm735 printer/Gestetner-DSm735 -#gptofoo gestetner-dsm735g printer/Gestetner-DSm735G -#gptofoo gestetner-dsm745 printer/Gestetner-DSm745 -#gptofoo gestetner-dsm745g printer/Gestetner-DSm745G -#gptofoo gestetner-mp1100 printer/Gestetner-MP1100 -#gptofoo gestetner-dsm7110 printer/Gestetner-DSm7110 -#gptofoo gestetner-mp1350 printer/Gestetner-MP1350 -#gptofoo gestetner-dsm7135 printer/Gestetner-DSm7135 -#gptofoo gestetner-mp1600 printer/Gestetner-MP1600 -#gptofoo gestetner-dsm716 printer/Gestetner-DSm716 -#gptofoo gestetner-mp2000 printer/Gestetner-MP2000 -#gptofoo gestetner-dsm721d printer/Gestetner-DSm721d -#gptofoo gestetner-mp2500 printer/Gestetner-MP2500 -#gptofoo gestetner-dsm625 printer/Gestetner-DSm625 -#gptofoo gestetner-mp3500 printer/Gestetner-MP3500 -#gptofoo gestetner-dsm735e printer/Gestetner-DSm735e -#gptofoo gestetner-mp4500 printer/Gestetner-MP4500 -#gptofoo gestetner-dsm745e printer/Gestetner-DSm745e -#gptofoo gestetner-mp5500 printer/Gestetner-MP5500 -#gptofoo gestetner-dsm755 printer/Gestetner-DSm755 -#gptofoo gestetner-mp6500 printer/Gestetner-MP6500 -#gptofoo gestetner-dsm765 printer/Gestetner-DSm765 -#gptofoo gestetner-mp7500 printer/Gestetner-MP7500 -#gptofoo gestetner-dsm775 printer/Gestetner-DSm775 -#gptofoo gestetner-mp9000 printer/Gestetner-MP9000 -#gptofoo gestetner-dsm790 printer/Gestetner-DSm790 -#gptofoo gestetner-mp_161 printer/Gestetner-MP_161 -#gptofoo gestetner-dsm416 printer/Gestetner-DSm416 -#gptofoo gestetner-mp_2510 printer/Gestetner-MP_2510 -#gptofoo gestetner-dsm725e printer/Gestetner-DSm725e +#gptofoo gestetner-dsm735g printer/Gestetner-DSm735_735G +#gptofoo gestetner-dsm745g printer/Gestetner-DSm745_745G +#gptofoo gestetner-dsm7110 printer/Gestetner-MP1100_DSm7110 +#gptofoo gestetner-dsm7135 printer/Gestetner-MP1350_DSm7135 +#gptofoo gestetner-dsm716 printer/Gestetner-MP1600_DSm716 +#gptofoo gestetner-dsm721d printer/Gestetner-MP2000_DSm721d +#gptofoo gestetner-dsm625 printer/Gestetner-MP2500_DSm625 +#gptofoo gestetner-dsm735e printer/Gestetner-MP3500_DSm735e +#gptofoo gestetner-dsm745e printer/Gestetner-MP4500_DSm745e +#gptofoo gestetner-dsm755 printer/Gestetner-MP5500_DSm755 +#gptofoo gestetner-dsm765 printer/Gestetner-MP6500_DSm765 +#gptofoo gestetner-dsm775 printer/Gestetner-MP7500_DSm775 +#gptofoo gestetner-dsm790 printer/Gestetner-MP9000_DSm790 +#gptofoo gestetner-dsm416 printer/Gestetner-MP_161_DSm416 +#gptofoo gestetner-dsm725e printer/Gestetner-MP_2510_DSm725e #gptofoo gestetner-mp_2550 printer/Gestetner-MP_2550 #gptofoo gestetner-mp_2550b printer/Gestetner-MP_2550B -#gptofoo gestetner-mp_3010 printer/Gestetner-MP_3010 -#gptofoo gestetner-dsm730e printer/Gestetner-DSm730e +#gptofoo gestetner-dsm730e printer/Gestetner-MP_3010_DSm730e #gptofoo gestetner-mp_3350 printer/Gestetner-MP_3350 #gptofoo gestetner-mp_3350b printer/Gestetner-MP_3350B #gptofoo gestetner-mp_4000 printer/Gestetner-MP_4000 @@ -1145,85 +1132,41 @@ #gptofoo lanier-ld230 printer/Lanier-LD230 #gptofoo lanier-ld235 printer/Lanier-LD235 #gptofoo lanier-ld245 printer/Lanier-LD245 -#gptofoo lanier-mp_2500 printer/Lanier-MP_2500 -#gptofoo lanier-ld125 printer/Lanier-LD125 -#gptofoo lanier-mp_1100 printer/Lanier-MP_1100 -#gptofoo lanier-ld1100 printer/Lanier-LD1100 -#gptofoo lanier-mp_1350 printer/Lanier-MP_1350 -#gptofoo lanier-ld1135 printer/Lanier-LD1135 -#gptofoo lanier-mp_1600 printer/Lanier-MP_1600 -#gptofoo lanier-ld316 printer/Lanier-LD316 -#gptofoo lanier-mp_161 printer/Lanier-MP_161 -#gptofoo lanier-ld016 printer/Lanier-LD016 -#gptofoo lanier-mp_2000 printer/Lanier-MP_2000 -#gptofoo lanier-ld320d printer/Lanier-LD320d -#gptofoo lanier-mp_2510 printer/Lanier-MP_2510 -#gptofoo lanier-ld325 printer/Lanier-LD325 -#gptofoo lanier-mp_2550b printer/Lanier-MP_2550B -#gptofoo lanier-ld425b printer/Lanier-LD425B -#gptofoo lanier-mp_2550 printer/Lanier-MP_2550 -#gptofoo lanier-ld425 printer/Lanier-LD425 -#gptofoo lanier-mp_3010 printer/Lanier-MP_3010 -#gptofoo lanier-ld330 printer/Lanier-LD330 -#gptofoo lanier-mp_3350b printer/Lanier-MP_3350B -#gptofoo lanier-ld433b printer/Lanier-LD433B -#gptofoo lanier-mp_3350 printer/Lanier-MP_3350 -#gptofoo lanier-ld433 printer/Lanier-LD433 -#gptofoo lanier-mp_3500 printer/Lanier-MP_3500 -#gptofoo lanier-ld335 printer/Lanier-LD335 -#gptofoo lanier-mp_4000b printer/Lanier-MP_4000B -#gptofoo lanier-ld040b printer/Lanier-LD040B -#gptofoo lanier-mp_4000 printer/Lanier-MP_4000 -#gptofoo lanier-ld040 printer/Lanier-LD040 -#gptofoo lanier-mp_4500 printer/Lanier-MP_4500 -#gptofoo lanier-ld345 printer/Lanier-LD345 -#gptofoo lanier-mp_5000b printer/Lanier-MP_5000B -#gptofoo lanier-ld050b printer/Lanier-LD050B -#gptofoo lanier-mp_5000 printer/Lanier-MP_5000 -#gptofoo lanier-ld050 printer/Lanier-LD050 -#gptofoo lanier-mp_5500 printer/Lanier-MP_5500 -#gptofoo lanier-ld255 printer/Lanier-LD255 -#gptofoo lanier-mp_6500 printer/Lanier-MP_6500 -#gptofoo lanier-ld265 printer/Lanier-LD265 -#gptofoo lanier-mp_7500 printer/Lanier-MP_7500 -#gptofoo lanier-ld275 printer/Lanier-LD275 -#gptofoo lanier-mp_9000 printer/Lanier-MP_9000 -#gptofoo lanier-ld190 printer/Lanier-LD190 +#gptofoo lanier-ld125 printer/Lanier-MP2500_LD125 +#gptofoo lanier-ld1100 printer/Lanier-MP_1100_LD1100 +#gptofoo lanier-ld1135 printer/Lanier-MP_1350_LD1135 +#gptofoo lanier-ld316 printer/Lanier-MP_1600_LD316 +#gptofoo lanier-ld016 printer/Lanier-MP_161_LD016 +#gptofoo lanier-ld320d printer/Lanier-MP_2000_LD320d +#gptofoo lanier-ld325 printer/Lanier-MP_2510_LD325 +#gptofoo lanier-ld425b printer/Lanier-MP_2550B_LD425B +#gptofoo lanier-ld425 printer/Lanier-MP_2550_LD425 +#gptofoo lanier-ld330 printer/Lanier-MP_3010_LD330 +#gptofoo lanier-ld433b printer/Lanier-MP_3350B_LD433B +#gptofoo lanier-ld433 printer/Lanier-MP_3350_LD433 +#gptofoo lanier-ld335 printer/Lanier-MP_3500_LD335 +#gptofoo lanier-ld040b printer/Lanier-MP_4000B_LD040B +#gptofoo lanier-ld040 printer/Lanier-MP_4000_LD040 +#gptofoo lanier-ld345 printer/Lanier-MP_4500_LD345 +#gptofoo lanier-ld050b printer/Lanier-MP_5000B_LD050B +#gptofoo lanier-ld050 printer/Lanier-MP_5000_LD050 +#gptofoo lanier-ld255 printer/Lanier-MP_5500_LD255 +#gptofoo lanier-ld265 printer/Lanier-MP_6500_LD265 +#gptofoo lanier-ld275 printer/Lanier-MP_7500_LD275 +#gptofoo lanier-ld190 printer/Lanier-MP_9000_LD190 #gptofoo lexmark-optra_e321 printer/Lexmark-Optra_E321 #gptofoo lexmark-optra_e323 printer/Lexmark-Optra_E323 -#gptofoo nrg-10515 printer/NRG-10515 -#gptofoo nrg-10518 printer/NRG-10518 -#gptofoo nrg-10512 printer/NRG-10512 -#gptofoo nrg-2205 printer/NRG-2205 -#gptofoo nrg-2238 printer/NRG-2238 -#gptofoo nrg-2212 printer/NRG-2212 -#gptofoo nrg-2705 printer/NRG-2705 -#gptofoo nrg-2738 printer/NRG-2738 -#gptofoo nrg-2712 printer/NRG-2712 -#gptofoo nrg-3205 printer/NRG-3205 -#gptofoo nrg-3238 printer/NRG-3238 -#gptofoo nrg-3212 printer/NRG-3212 -#gptofoo nrg-3525 printer/NRG-3525 -#gptofoo nrg-3508 printer/NRG-3508 -#gptofoo nrg-3502 printer/NRG-3502 -#gptofoo nrg-3545 printer/NRG-3545 -#gptofoo nrg-3518 printer/NRG-3518 -#gptofoo nrg-3532 printer/NRG-3532 -#gptofoo nrg-4525 printer/NRG-4525 -#gptofoo nrg-4508 printer/NRG-4508 -#gptofoo nrg-4502 printer/NRG-4502 -#gptofoo nrg-4545 printer/NRG-4545 -#gptofoo nrg-4518 printer/NRG-4518 -#gptofoo nrg-4532 printer/NRG-4532 -#gptofoo nrg-6002 printer/NRG-6002 -#gptofoo nrg-6005 printer/NRG-6005 -#gptofoo nrg-6008 printer/NRG-6008 -#gptofoo nrg-7502 printer/NRG-7502 -#gptofoo nrg-7505 printer/NRG-7505 -#gptofoo nrg-7508 printer/NRG-7508 -#gptofoo nrg-9005 printer/NRG-9005 -#gptofoo nrg-9008 printer/NRG-9008 -#gptofoo nrg-9002 printer/NRG-9002 +#gptofoo nrg-10512 printer/NRG-10515_10518_10512 +#gptofoo nrg-2212 printer/NRG-2205_2238_2212 +#gptofoo nrg-2712 printer/NRG-2705_2738_2712 +#gptofoo nrg-3212 printer/NRG-3205_3238_3212 +#gptofoo nrg-3502 printer/NRG-3525_3508_3502 +#gptofoo nrg-3532 printer/NRG-3545_3518_3532 +#gptofoo nrg-4502 printer/NRG-4525_4508_4502 +#gptofoo nrg-4532 printer/NRG-4545_4518_4532 +#gptofoo nrg-6008 printer/NRG-6002_6005_6008 +#gptofoo nrg-7508 printer/NRG-7502_7505_7508 +#gptofoo nrg-9002 printer/NRG-9005_9008_9002 #gptofoo nrg-dsm415 printer/NRG-DSm415 #gptofoo nrg-dsm615 printer/NRG-DSm615 #gptofoo nrg-dsm616 printer/NRG-DSm616 @@ -1338,10 +1281,8 @@ #gptofoo savin-2522 printer/Savin-2522 #gptofoo savin-2527 printer/Savin-2527 #gptofoo savin-2532 printer/Savin-2532 -#gptofoo savin-2535 printer/Savin-2535 -#gptofoo savin-2235 printer/Savin-2235 -#gptofoo savin-2545 printer/Savin-2545 -#gptofoo savin-2245 printer/Savin-2245 +#gptofoo savin-2235 printer/Savin-2535_2235 +#gptofoo savin-2245 printer/Savin-2545_2245 #gptofoo savin-2560 printer/Savin-2560 #gptofoo savin-2575 printer/Savin-2575 #gptofoo savin-3515 printer/Savin-3515 @@ -1351,14 +1292,10 @@ #gptofoo savin-4018d printer/Savin-4018d #gptofoo savin-4022 printer/Savin-4022 #gptofoo savin-4027 printer/Savin-4027 -#gptofoo savin-4035 printer/Savin-4035 -#gptofoo savin-4135g printer/Savin-4135g -#gptofoo savin-4035e printer/Savin-4035e -#gptofoo savin-4135eg printer/Savin-4135eG -#gptofoo savin-4045 printer/Savin-4045 -#gptofoo savin-4145g printer/Savin-4145g -#gptofoo savin-4045e printer/Savin-4045e -#gptofoo savin-4145eg printer/Savin-4145eG +#gptofoo savin-4135g printer/Savin-4035_4135g +#gptofoo savin-4135eg printer/Savin-4035e_4135eG +#gptofoo savin-4145g printer/Savin-4045_4145g +#gptofoo savin-4145eg printer/Savin-4045e_4145eG #gptofoo savin-4051 printer/Savin-4051 #gptofoo savin-4060 printer/Savin-4060 #gptofoo savin-4075 printer/Savin-4075 @@ -1371,11 +1308,9 @@ #gptofoo savin-8025e printer/Savin-8025e #gptofoo savin-8030 printer/Savin-8030 #gptofoo savin-8030e printer/Savin-8030e -#gptofoo savin-8035 printer/Savin-8035 -#gptofoo savin-8035g printer/Savin-8035g +#gptofoo savin-8035g printer/Savin-8035_8035g #gptofoo savin-8035e printer/Savin-8035e -#gptofoo savin-8045 printer/Savin-8045 -#gptofoo savin-8045g printer/Savin-8045g +#gptofoo savin-8045g printer/Savin-8045_8045g #gptofoo savin-8045e printer/Savin-8045e #gptofoo savin-8055 printer/Savin-8055 #gptofoo savin-8065 printer/Savin-8065 diff --git a/src/ghost/Makefile.in b/src/ghost/Makefile.in index 22e953d..e1e89e0 100644 --- a/src/ghost/Makefile.in +++ b/src/ghost/Makefile.in @@ -45,11 +45,14 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \ - $(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \ - $(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/stp.m4 \ + $(top_srcdir)/m4/stp_cups.m4 $(top_srcdir)/m4/stp_gimp.m4 \ + $(top_srcdir)/m4/stp_option.m4 $(top_srcdir)/m4/stp_release.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs @@ -108,10 +111,6 @@ CUPS_CFLAGS = @CUPS_CFLAGS@ CUPS_CONFIG = @CUPS_CONFIG@ CUPS_LIBS = @CUPS_LIBS@ CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DB2HTML = @DB2HTML@ DB2PDF = @DB2PDF@ @@ -121,16 +120,15 @@ DEPDIR = @DEPDIR@ DIALOG = @DIALOG@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ DVIPDF = @DVIPDF@ DVIPS = @DVIPS@ -ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ FIND = @FIND@ FOOMATIC_CONFIGURE = @FOOMATIC_CONFIGURE@ FOOMATIC_KITLOAD = @FOOMATIC_KITLOAD@ @@ -175,6 +173,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTLLIBS = @INTLLIBS@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -186,6 +185,7 @@ LIBREADLINE_DEPS = @LIBREADLINE_DEPS@ LIBS = $(INTLLIBS) @LIBS@ LIBTOOL = @LIBTOOL@ LIBTOOL_DEPS = @LIBTOOL_DEPS@ +LIPO = @LIPO@ LN_S = @LN_S@ LTALLOCA = @LTALLOCA@ LTLIBICONV = @LTLIBICONV@ @@ -198,8 +198,12 @@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ +NM = @NM@ NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -233,8 +237,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -279,6 +282,7 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -291,6 +295,7 @@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS) diff --git a/src/gimp2/Makefile.in b/src/gimp2/Makefile.in index 67c22c4..9874a38 100644 --- a/src/gimp2/Makefile.in +++ b/src/gimp2/Makefile.in @@ -46,11 +46,14 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \ - $(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \ - $(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/stp.m4 \ + $(top_srcdir)/m4/stp_cups.m4 $(top_srcdir)/m4/stp_gimp.m4 \ + $(top_srcdir)/m4/stp_option.m4 $(top_srcdir)/m4/stp_release.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs @@ -102,10 +105,6 @@ CUPS_CFLAGS = @CUPS_CFLAGS@ CUPS_CONFIG = @CUPS_CONFIG@ CUPS_LIBS = @CUPS_LIBS@ CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DB2HTML = @DB2HTML@ DB2PDF = @DB2PDF@ @@ -115,16 +114,15 @@ DEPDIR = @DEPDIR@ DIALOG = @DIALOG@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ DVIPDF = @DVIPDF@ DVIPS = @DVIPS@ -ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ FIND = @FIND@ FOOMATIC_CONFIGURE = @FOOMATIC_CONFIGURE@ FOOMATIC_KITLOAD = @FOOMATIC_KITLOAD@ @@ -169,6 +167,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTLLIBS = @INTLLIBS@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -180,6 +179,7 @@ LIBREADLINE_DEPS = @LIBREADLINE_DEPS@ LIBS = $(INTLLIBS) @LIBS@ LIBTOOL = @LIBTOOL@ LIBTOOL_DEPS = @LIBTOOL_DEPS@ +LIPO = @LIPO@ LN_S = @LN_S@ LTALLOCA = @LTALLOCA@ LTLIBICONV = @LTLIBICONV@ @@ -192,8 +192,12 @@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ +NM = @NM@ NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -227,8 +231,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -273,6 +276,7 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -285,6 +289,7 @@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS) diff --git a/src/gutenprintui2/Makefile.in b/src/gutenprintui2/Makefile.in index 5265a0d..61e955f 100644 --- a/src/gutenprintui2/Makefile.in +++ b/src/gutenprintui2/Makefile.in @@ -46,11 +46,14 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \ - $(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \ - $(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/stp.m4 \ + $(top_srcdir)/m4/stp_cups.m4 $(top_srcdir)/m4/stp_gimp.m4 \ + $(top_srcdir)/m4/stp_option.m4 $(top_srcdir)/m4/stp_release.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs @@ -128,10 +131,6 @@ CUPS_CFLAGS = @CUPS_CFLAGS@ CUPS_CONFIG = @CUPS_CONFIG@ CUPS_LIBS = @CUPS_LIBS@ CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DB2HTML = @DB2HTML@ DB2PDF = @DB2PDF@ @@ -141,16 +140,15 @@ DEPDIR = @DEPDIR@ DIALOG = @DIALOG@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ DVIPDF = @DVIPDF@ DVIPS = @DVIPS@ -ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ FIND = @FIND@ FOOMATIC_CONFIGURE = @FOOMATIC_CONFIGURE@ FOOMATIC_KITLOAD = @FOOMATIC_KITLOAD@ @@ -195,6 +193,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTLLIBS = @INTLLIBS@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -206,6 +205,7 @@ LIBREADLINE_DEPS = @LIBREADLINE_DEPS@ LIBS = $(INTLLIBS) @LIBS@ LIBTOOL = @LIBTOOL@ LIBTOOL_DEPS = @LIBTOOL_DEPS@ +LIPO = @LIPO@ LN_S = @LN_S@ LTALLOCA = @LTALLOCA@ LTLIBICONV = @LTLIBICONV@ @@ -218,8 +218,12 @@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ +NM = @NM@ NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -253,8 +257,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -299,6 +302,7 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -311,6 +315,7 @@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS) diff --git a/src/main/Makefile.in b/src/main/Makefile.in index cd04b9d..8fbf0f9 100644 --- a/src/main/Makefile.in +++ b/src/main/Makefile.in @@ -45,11 +45,14 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \ - $(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \ - $(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/stp.m4 \ + $(top_srcdir)/m4/stp_cups.m4 $(top_srcdir)/m4/stp_gimp.m4 \ + $(top_srcdir)/m4/stp_option.m4 $(top_srcdir)/m4/stp_release.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs @@ -217,10 +220,6 @@ CUPS_CFLAGS = @CUPS_CFLAGS@ CUPS_CONFIG = @CUPS_CONFIG@ CUPS_LIBS = @CUPS_LIBS@ CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DB2HTML = @DB2HTML@ DB2PDF = @DB2PDF@ @@ -230,16 +229,15 @@ DEPDIR = @DEPDIR@ DIALOG = @DIALOG@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ DVIPDF = @DVIPDF@ DVIPS = @DVIPS@ -ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ FIND = @FIND@ FOOMATIC_CONFIGURE = @FOOMATIC_CONFIGURE@ FOOMATIC_KITLOAD = @FOOMATIC_KITLOAD@ @@ -284,6 +282,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTLLIBS = @INTLLIBS@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -295,6 +294,7 @@ LIBREADLINE_DEPS = @LIBREADLINE_DEPS@ LIBS = $(INTLLIBS) @LIBS@ LIBTOOL = @LIBTOOL@ LIBTOOL_DEPS = @LIBTOOL_DEPS@ +LIPO = @LIPO@ LN_S = @LN_S@ LTALLOCA = @LTALLOCA@ LTLIBICONV = @LTLIBICONV@ @@ -307,8 +307,12 @@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ +NM = @NM@ NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -342,8 +346,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -388,6 +391,7 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -400,6 +404,7 @@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS) diff --git a/src/main/bit-ops.c b/src/main/bit-ops.c index a110adf..6ecf227 100644 --- a/src/main/bit-ops.c +++ b/src/main/bit-ops.c @@ -1,5 +1,5 @@ /* - * "$Id: bit-ops.c,v 1.12 2007/03/08 13:34:27 faust3 Exp $" + * "$Id: bit-ops.c,v 1.14 2009/06/07 15:21:22 rlk Exp $" * * Softweave calculator for Gutenprint. * @@ -49,7 +49,7 @@ stp_fold(const unsigned char *line, unsigned char l1 = line[single_length]; if (l0 || l1) { - outbuf[0] = + outbuf[0] = /* B7 A7 B6 A6 B5 A5 B4 A4 */ ((l0 & (1 << 7)) >> 1) + ((l0 & (1 << 6)) >> 2) + ((l0 & (1 << 5)) >> 3) + @@ -58,7 +58,7 @@ stp_fold(const unsigned char *line, ((l1 & (1 << 6)) >> 1) + ((l1 & (1 << 5)) >> 2) + ((l1 & (1 << 4)) >> 3); - outbuf[1] = + outbuf[1] = /* B3 A3 B2 A2 B1 A1 B0 A0 */ ((l0 & (1 << 3)) << 3) + ((l0 & (1 << 2)) << 2) + ((l0 & (1 << 1)) << 1) + @@ -80,34 +80,41 @@ stp_fold_3bit(const unsigned char *line, { int i; memset(outbuf, 0, single_length * 3); - for (i = 0; i < single_length; i++) { - outbuf[0] = - ((line[0] & (1 << 7)) >> 2) | - ((line[0] & (1 << 6)) >> 4) | - ((line[single_length] & (1 << 7)) >> 1) | - ((line[single_length] & (1 << 6)) >> 3) | - ((line[single_length] & (1 << 5)) >> 5) | - ((line[2*single_length] & (1 << 7)) << 0) | - ((line[2*single_length] & (1 << 6)) >> 2) | - ((line[2*single_length] & (1 << 5)) >> 4); - outbuf[1] = - ((line[0] & (1 << 5)) << 2) | - ((line[0] & (1 << 4)) << 0) | - ((line[0] & (1 << 3)) >> 2) | - ((line[single_length] & (1 << 4)) << 1) | - ((line[single_length] & (1 << 3)) >> 1) | - ((line[2*single_length] & (1 << 4)) << 2) | - ((line[2*single_length] & (1 << 3)) << 0) | - ((line[2*single_length] & (1 << 2)) >> 2); - outbuf[2] = - ((line[0] & (1 << 2)) << 4) | - ((line[0] & (1 << 1)) << 2) | - ((line[0] & (1 << 0)) << 0) | - ((line[single_length] & (1 << 2)) << 5) | - ((line[single_length] & (1 << 1)) << 3) | - ((line[single_length] & (1 << 0)) << 1) | - ((line[2*single_length] & (1 << 1)) << 4) | - ((line[2*single_length] & (1 << 0)) << 2); + for (i = 0; i < single_length; i++) + { + unsigned char l0 = line[0]; + unsigned char l1 = line[single_length]; + unsigned char l2 = line[single_length * 2]; + if (l0 || l1 || l2) + { + outbuf[0] = /* C7 B7 A7 C6 B6 A6 C5 B5 */ + ((l0 & (1 << 7)) >> 2) | + ((l0 & (1 << 6)) >> 4) | + ((l1 & (1 << 7)) >> 1) | + ((l1 & (1 << 6)) >> 3) | + ((l1 & (1 << 5)) >> 5) | + ((l2 & (1 << 7)) << 0) | + ((l2 & (1 << 6)) >> 2) | + ((l2 & (1 << 5)) >> 4); + outbuf[1] = /* A5 C4 B4 A4 C3 B3 A3 C2 */ + ((l0 & (1 << 5)) << 2) | + ((l0 & (1 << 4)) << 0) | + ((l0 & (1 << 3)) >> 2) | + ((l1 & (1 << 4)) << 1) | + ((l1 & (1 << 3)) >> 1) | + ((l2 & (1 << 4)) << 2) | + ((l2 & (1 << 3)) << 0) | + ((l2 & (1 << 2)) >> 2); + outbuf[2] = /* B2 A2 C1 B1 A1 C0 B0 A0 */ + ((l0 & (1 << 2)) << 4) | + ((l0 & (1 << 1)) << 2) | + ((l0 & (1 << 0)) << 0) | + ((l1 & (1 << 2)) << 5) | + ((l1 & (1 << 1)) << 3) | + ((l1 & (1 << 0)) << 1) | + ((l2 & (1 << 1)) << 4) | + ((l2 & (1 << 0)) << 2); + } line++; outbuf += 3; } @@ -115,100 +122,101 @@ stp_fold_3bit(const unsigned char *line, void stp_fold_3bit_323(const unsigned char *line, - int single_length, - unsigned char *outbuf) + int single_length, + unsigned char *outbuf) { - unsigned char A0,A1,A2,B0,B1,B2,C0,C1,C2; - const unsigned char *last= line+single_length; + const unsigned char *last= line + single_length; memset(outbuf, 0, single_length * 3); - for (; line < last; line+=3, outbuf+=8) { - - A0= line[0]; B0= line[single_length]; C0= line[2*single_length]; - - if (line<last-2) { - A1= line[1]; B1= line[single_length+1]; C1= line[2*single_length+1]; - } else { - A1= 0; B1= 0; C1= 0; - } - if (line<last-1) { - A2= line[2]; B2= line[single_length+2]; C2= line[2*single_length+2]; - } else { - A2= 0; B2= 0; C2= 0; + for (; line < last; line += 3) + { + unsigned char A0 = line[0]; + unsigned char B0 = line[single_length]; + unsigned char C0 = line[2*single_length]; + unsigned char A1 = (line < last - 2) ? line[1] : 0; + unsigned char B1 = (line < last - 2) ? line[single_length + 1] : 0; + unsigned char C1 = (line < last - 2) ? line[(single_length * 2) + 1] : 0; + unsigned char A2 = (line < last - 1) ? line[2] : 0; + unsigned char B2 = (line < last - 1) ? line[single_length + 2] : 0; + unsigned char C2 = (line < last - 1) ? line[(single_length * 2) + 2] : 0; + + if (A0 || A1 || A2 || B0 || B1 || B2 || C0 || C1 || C2) + { + /* Missing: C0_6, C0_3, C0_0, C1_5, C1_2, C2_7, C2_4, C2_1 ??? */ + outbuf[0] = /* C0_7 B0_7 A0_7 B0_6 A0_6 C0_5 B0_5 A0_5 */ + ((C0 & (1 << 7)) >> 0) | + ((B0 & (1 << 7)) >> 1) | + ((A0 & (1 << 7)) >> 2) | + ((B0 & (1 << 6)) >> 2) | + ((A0 & (1 << 6)) >> 3) | + ((C0 & (1 << 5)) >> 3) | + ((B0 & (1 << 5)) >> 4) | + ((A0 & (1 << 5)) >> 5); + outbuf[1] = /* C0_4 B0_4 A0_4 B0_3 A0_3 C0_2 B0_2 A0_2 */ + ((C0 & (1 << 4)) << 3) | + ((B0 & (1 << 4)) << 2) | + ((A0 & (1 << 4)) << 1) | + ((B0 & (1 << 3)) << 1) | + ((A0 & (1 << 3)) << 0) | + ((C0 & (1 << 2)) >> 0) | + ((B0 & (1 << 2)) >> 1) | + ((A0 & (1 << 2)) >> 2); + outbuf[2] = /* C0_1 B0_1 A0_1 B0_0 A0_0 C1_7 B1_7 A1_7 */ + ((C0 & (1 << 1)) << 6) | + ((B0 & (1 << 1)) << 5) | + ((A0 & (1 << 1)) << 4) | + ((B0 & (1 << 0)) << 4) | + ((A0 & (1 << 0)) << 3) | + ((C1 & (1 << 7)) >> 5) | + ((B1 & (1 << 7)) >> 6) | + ((A1 & (1 << 7)) >> 7); + outbuf[3] = /* C1_6 B1_6 A1_6 B1_5 A1_5 C1_4 B1_4 A1_4 */ + ((C1 & (1 << 6)) << 1) | + ((B1 & (1 << 6)) << 0) | + ((A1 & (1 << 6)) >> 1) | + ((B1 & (1 << 5)) >> 1) | + ((A1 & (1 << 5)) >> 2) | + ((C1 & (1 << 4)) >> 2) | + ((B1 & (1 << 4)) >> 3) | + ((A1 & (1 << 4)) >> 4); + outbuf[4] = /* C1_3 B1_3 A1_3 B1_2 A1_2 C1_1 B1_1 A1_1 */ + ((C1 & (1 << 3)) << 4) | + ((B1 & (1 << 3)) << 3) | + ((A1 & (1 << 3)) << 2) | + ((B1 & (1 << 2)) << 2) | + ((A1 & (1 << 2)) << 1) | + ((C1 & (1 << 1)) << 1) | + ((B1 & (1 << 1)) >> 0) | + ((A1 & (1 << 1)) >> 1); + outbuf[5] = /* C1_0 B1_0 A1_0 B2_7 A2_7 C2_6 B2_6 A2_6 */ + ((C1 & (1 << 0)) << 7) | + ((B1 & (1 << 0)) << 6) | + ((A1 & (1 << 0)) << 5) | + ((B2 & (1 << 7)) >> 3) | + ((A2 & (1 << 7)) >> 4) | + ((C2 & (1 << 6)) >> 4) | + ((B2 & (1 << 6)) >> 5) | + ((A2 & (1 << 6)) >> 6); + outbuf[6] = /* C2_5 B2_5 A2_5 B2_4 A2_4 C2_3 B2_3 A2_3 */ + ((C2 & (1 << 5)) << 2) | + ((B2 & (1 << 5)) << 1) | + ((A2 & (1 << 5)) << 0) | + ((B2 & (1 << 4)) >> 0) | + ((A2 & (1 << 4)) >> 1) | + ((C2 & (1 << 3)) >> 1) | + ((B2 & (1 << 3)) >> 2) | + ((A2 & (1 << 3)) >> 3); + outbuf[7] = /* C2_2 B2_2 A2_2 B2_1 A2_1 C2_0 B2_0 A2_0 */ + ((C2 & (1 << 2)) << 5) | + ((B2 & (1 << 2)) << 4) | + ((A2 & (1 << 2)) << 3) | + ((B2 & (1 << 1)) << 3) | + ((A2 & (1 << 1)) << 2) | + ((C2 & (1 << 0)) << 2) | + ((B2 & (1 << 0)) << 1) | + ((A2 & (1 << 0)) << 0); + } + outbuf += 8; } - - outbuf[0] = - ((C0 & 0x80) >> 0) | - ((B0 & 0x80) >> 1) | - ((A0 & 0x80) >> 2) | - ((B0 & 0x40) >> 2) | - ((A0 & 0x40) >> 3) | - ((C0 & 0x20) >> 3) | - ((B0 & 0x20) >> 4) | - ((A0 & 0x20) >> 5); - outbuf[1] = - ((C0 & 0x10) << 3) | - ((B0 & 0x10) << 2) | - ((A0 & 0x10) << 1) | - ((B0 & 0x08) << 1) | - ((A0 & 0x08) << 0) | - ((C0 & 0x04) >> 0) | - ((B0 & 0x04) >> 1) | - ((A0 & 0x04) >> 2); - outbuf[2] = - ((C0 & 0x02) << 6) | - ((B0 & 0x02) << 5) | - ((A0 & 0x02) << 4) | - ((B0 & 0x01) << 4) | - ((A0 & 0x01) << 3) | - ((C1 & 0x80) >> 5) | - ((B1 & 0x80) >> 6) | - ((A1 & 0x80) >> 7); - outbuf[3] = - ((C1 & 0x40) << 1) | - ((B1 & 0x40) << 0) | - ((A1 & 0x40) >> 1) | - ((B1 & 0x20) >> 1) | - ((A1 & 0x20) >> 2) | - ((C1 & 0x10) >> 2) | - ((B1 & 0x10) >> 3) | - ((A1 & 0x10) >> 4); - outbuf[4] = - ((C1 & 0x08) << 4) | - ((B1 & 0x08) << 3) | - ((A1 & 0x08) << 2) | - ((B1 & 0x04) << 2) | - ((A1 & 0x04) << 1) | - ((C1 & 0x02) << 1) | - ((B1 & 0x02) >> 0) | - ((A1 & 0x02) >> 1); - outbuf[5] = - ((C1 & 0x01) << 7) | - ((B1 & 0x01) << 6) | - ((A1 & 0x01) << 5) | - ((B2 & 0x80) >> 3) | - ((A2 & 0x80) >> 4) | - ((C2 & 0x40) >> 4) | - ((B2 & 0x40) >> 5) | - ((A2 & 0x40) >> 6); - outbuf[6] = - ((C2 & 0x20) << 2) | - ((B2 & 0x20) << 1) | - ((A2 & 0x20) << 0) | - ((B2 & 0x10) >> 0) | - ((A2 & 0x10) >> 1) | - ((C2 & 0x08) >> 1) | - ((B2 & 0x08) >> 2) | - ((A2 & 0x08) >> 3); - outbuf[7] = - ((C2 & 0x04) << 5) | - ((B2 & 0x04) << 4) | - ((A2 & 0x04) << 3) | - ((B2 & 0x02) << 3) | - ((A2 & 0x02) << 2) | - ((C2 & 0x01) << 2) | - ((B2 & 0x01) << 1) | - ((A2 & 0x01) << 0); - } } void @@ -218,158 +226,120 @@ stp_fold_4bit(const unsigned char *line, { int i; memset(outbuf, 0, single_length * 4); - for (i = 0; i < single_length; i++){ - unsigned char l0 = line[0]; - unsigned char l1 = line[single_length]; - unsigned char l2 = line[single_length*2]; - unsigned char l3 = line[single_length*3]; - if(l0 || l1 || l2 || l3){ - outbuf[0] = - ((l3 & (1<<7)) >> 0)| - ((l2 & (1<<7)) >> 1)| - ((l1 & (1<<7)) >> 2)| - ((l0 & (1<<7)) >> 3)| - ((l3 & (1<<6)) >> 3)| - ((l2 & (1<<6)) >> 4)| - ((l1 & (1<<6)) >> 5)| - ((l0 & (1<<6)) >> 6); - - outbuf[1] = - ((l3 & (1<<5)) << 2)| - ((l2 & (1<<5)) << 1)| - ((l1 & (1<<5)) << 0)| - ((l0 & (1<<5)) >> 1)| - ((l3 & (1<<4)) >> 1)| - ((l2 & (1<<4)) >> 2)| - ((l1 & (1<<4)) >> 3)| - ((l0 & (1<<4)) >> 4); - - outbuf[2] = - ((l3 & (1<<3)) << 4)| - ((l2 & (1<<3)) << 3)| - ((l1 & (1<<3)) << 2)| - ((l0 & (1<<3)) << 1)| - ((l3 & (1<<2)) << 1)| - ((l2 & (1<<2)) << 0)| - ((l1 & (1<<2)) >> 1)| - ((l0 & (1<<2)) >> 2); - outbuf[3] = - ((l3 & (1<<1)) << 6)| - ((l2 & (1<<1)) << 5)| - ((l1 & (1<<1)) << 4)| - ((l0 & (1<<1)) << 3)| - ((l3 & (1<<0)) << 3)| - ((l2 & (1<<0)) << 2)| - ((l1 & (1<<0)) << 1)| - ((l0 & (1<<0)) << 0); - } - line++; - outbuf += 4; - } -} - -static void -stpi_split_2_1(int length, - const unsigned char *in, - unsigned char *outhi, - unsigned char *outlo) -{ - unsigned char *outs[2]; - int i; - int row = 0; - int limit = length; - outs[0] = outhi; - outs[1] = outlo; - memset(outs[1], 0, limit); - for (i = 0; i < limit; i++) + for (i = 0; i < single_length; i++) { - unsigned char inbyte = in[i]; - outs[0][i] = 0; - if (inbyte == 0) - continue; - /* For some reason gcc isn't unrolling this, even with -funroll-loops */ - if (inbyte & 1) - { - outs[row][i] |= 1 & inbyte; - row = row ^ 1; - } - if (inbyte & (1 << 1)) - { - outs[row][i] |= (1 << 1) & inbyte; - row = row ^ 1; - } - if (inbyte & (1 << 2)) - { - outs[row][i] |= (1 << 2) & inbyte; - row = row ^ 1; - } - if (inbyte & (1 << 3)) - { - outs[row][i] |= (1 << 3) & inbyte; - row = row ^ 1; - } - if (inbyte & (1 << 4)) - { - outs[row][i] |= (1 << 4) & inbyte; - row = row ^ 1; - } - if (inbyte & (1 << 5)) - { - outs[row][i] |= (1 << 5) & inbyte; - row = row ^ 1; - } - if (inbyte & (1 << 6)) - { - outs[row][i] |= (1 << 6) & inbyte; - row = row ^ 1; - } - if (inbyte & (1 << 7)) + unsigned char l0 = line[0]; + unsigned char l1 = line[single_length]; + unsigned char l2 = line[single_length*2]; + unsigned char l3 = line[single_length*3]; + if (l0 || l1 || l2 || l3) { - outs[row][i] |= (1 << 7) & inbyte; - row = row ^ 1; + outbuf[0] = /* D7 C7 B7 A7 D6 C6 B6 A6 */ + ((l3 & (1 << 7)) >> 0)| + ((l2 & (1 << 7)) >> 1)| + ((l1 & (1 << 7)) >> 2)| + ((l0 & (1 << 7)) >> 3)| + ((l3 & (1 << 6)) >> 3)| + ((l2 & (1 << 6)) >> 4)| + ((l1 & (1 << 6)) >> 5)| + ((l0 & (1 << 6)) >> 6); + + outbuf[1] = /* D5 C5 B5 A5 D4 C4 B4 A4 */ + ((l3 & (1 << 5)) << 2)| + ((l2 & (1 << 5)) << 1)| + ((l1 & (1 << 5)) << 0)| + ((l0 & (1 << 5)) >> 1)| + ((l3 & (1 << 4)) >> 1)| + ((l2 & (1 << 4)) >> 2)| + ((l1 & (1 << 4)) >> 3)| + ((l0 & (1 << 4)) >> 4); + + outbuf[2] = /* D3 C3 B3 A3 D2 C2 B2 A2 */ + ((l3 & (1 << 3)) << 4)| + ((l2 & (1 << 3)) << 3)| + ((l1 & (1 << 3)) << 2)| + ((l0 & (1 << 3)) << 1)| + ((l3 & (1 << 2)) << 1)| + ((l2 & (1 << 2)) << 0)| + ((l1 & (1 << 2)) >> 1)| + ((l0 & (1 << 2)) >> 2); + + outbuf[3] = /* D1 C1 B1 A1 D0 C0 B0 A0 */ + ((l3 & (1 << 1)) << 6)| + ((l2 & (1 << 1)) << 5)| + ((l1 & (1 << 1)) << 4)| + ((l0 & (1 << 1)) << 3)| + ((l3 & (1 << 0)) << 3)| + ((l2 & (1 << 0)) << 2)| + ((l1 & (1 << 0)) << 1)| + ((l0 & (1 << 0)) << 0); } + line++; + outbuf += 4; } } -static void -stp_split_2_2(int length, - const unsigned char *in, - unsigned char *outhi, - unsigned char *outlo) +#define SPLIT_MASK(k, b) (((1 << (b)) - 1) << ((k) * (b))) + +#define SPLIT_STEP(k, b, i, o, in, r, inc, rl) \ +do \ + { \ + if (in & SPLIT_MASK(k, b)) \ + { \ + o[r][i] |= SPLIT_MASK(k, b) & in; \ + r += inc; \ + if (r >= rl) \ + r = 0; \ + } \ + } while (0) + +void +stp_split(int length, + int bits, + int n, + const unsigned char *in, + int increment, + unsigned char **outs) { - unsigned char *outs[2]; + int row = 0; + int limit = length * bits; + int rlimit = n * increment; int i; - unsigned row = 0; - int limit = length * 2; - outs[0] = outhi; - outs[1] = outlo; - memset(outs[1], 0, limit); - for (i = 0; i < limit; i++) + for (i = 1; i < n; i++) + memset(outs[i * increment], 0, limit); + + if (bits == 1) { - unsigned char inbyte = in[i]; - outs[0][i] = 0; - if (inbyte == 0) - continue; - /* For some reason gcc isn't unrolling this, even with -funroll-loops */ - if (inbyte & 3) - { - outs[row][i] |= (3 & inbyte); - row = row ^ 1; - } - if (inbyte & (3 << 2)) + for (i = 0; i < limit; i++) { - outs[row][i] |= ((3 << 2) & inbyte); - row = row ^ 1; + unsigned char inbyte = in[i]; + outs[0][i] = 0; + if (inbyte == 0) + continue; + /* For some reason gcc isn't unrolling this, even with -funroll-loops */ + SPLIT_STEP(0, 1, i, outs, inbyte, row, increment, rlimit); + SPLIT_STEP(1, 1, i, outs, inbyte, row, increment, rlimit); + SPLIT_STEP(2, 1, i, outs, inbyte, row, increment, rlimit); + SPLIT_STEP(3, 1, i, outs, inbyte, row, increment, rlimit); + SPLIT_STEP(4, 1, i, outs, inbyte, row, increment, rlimit); + SPLIT_STEP(5, 1, i, outs, inbyte, row, increment, rlimit); + SPLIT_STEP(6, 1, i, outs, inbyte, row, increment, rlimit); + SPLIT_STEP(7, 1, i, outs, inbyte, row, increment, rlimit); } - if (inbyte & (3 << 4)) - { - outs[row][i] |= ((3 << 4) & inbyte); - row = row ^ 1; - } - if (inbyte & (3 << 6)) + } + else + { + for (i = 0; i < limit; i++) { - outs[row][i] |= ((3 << 6) & inbyte); - row = row ^ 1; + unsigned char inbyte = in[i]; + outs[0][i] = 0; + if (inbyte == 0) + continue; + /* For some reason gcc isn't unrolling this, even with -funroll-loops */ + SPLIT_STEP(0, 2, i, outs, inbyte, row, increment, rlimit); + SPLIT_STEP(1, 2, i, outs, inbyte, row, increment, rlimit); + SPLIT_STEP(2, 2, i, outs, inbyte, row, increment, rlimit); + SPLIT_STEP(3, 2, i, outs, inbyte, row, increment, rlimit); } } } @@ -381,128 +351,10 @@ stp_split_2(int length, unsigned char *outhi, unsigned char *outlo) { - if (bits == 2) - stp_split_2_2(length, in, outhi, outlo); - else - stpi_split_2_1(length, in, outhi, outlo); -} - -static void -stpi_split_4_1(int length, - const unsigned char *in, - unsigned char *out0, - unsigned char *out1, - unsigned char *out2, - unsigned char *out3) -{ - unsigned char *outs[4]; - int i; - int row = 0; - int limit = length; - outs[0] = out0; - outs[1] = out1; - outs[2] = out2; - outs[3] = out3; - memset(outs[1], 0, limit); - memset(outs[2], 0, limit); - memset(outs[3], 0, limit); - for (i = 0; i < limit; i++) - { - unsigned char inbyte = in[i]; - outs[0][i] = 0; - if (inbyte == 0) - continue; - /* For some reason gcc isn't unrolling this, even with -funroll-loops */ - if (inbyte & 1) - { - outs[row][i] |= 1 & inbyte; - row = (row + 1) & 3; - } - if (inbyte & (1 << 1)) - { - outs[row][i] |= (1 << 1) & inbyte; - row = (row + 1) & 3; - } - if (inbyte & (1 << 2)) - { - outs[row][i] |= (1 << 2) & inbyte; - row = (row + 1) & 3; - } - if (inbyte & (1 << 3)) - { - outs[row][i] |= (1 << 3) & inbyte; - row = (row + 1) & 3; - } - if (inbyte & (1 << 4)) - { - outs[row][i] |= (1 << 4) & inbyte; - row = (row + 1) & 3; - } - if (inbyte & (1 << 5)) - { - outs[row][i] |= (1 << 5) & inbyte; - row = (row + 1) & 3; - } - if (inbyte & (1 << 6)) - { - outs[row][i] |= (1 << 6) & inbyte; - row = (row + 1) & 3; - } - if (inbyte & (1 << 7)) - { - outs[row][i] |= (1 << 7) & inbyte; - row = (row + 1) & 3; - } - } -} - -static void -stpi_split_4_2(int length, - const unsigned char *in, - unsigned char *out0, - unsigned char *out1, - unsigned char *out2, - unsigned char *out3) -{ - unsigned char *outs[4]; - int i; - int row = 0; - int limit = length * 2; - outs[0] = out0; - outs[1] = out1; - outs[2] = out2; - outs[3] = out3; - memset(outs[1], 0, limit); - memset(outs[2], 0, limit); - memset(outs[3], 0, limit); - for (i = 0; i < limit; i++) - { - unsigned char inbyte = in[i]; - outs[0][i] = 0; - if (inbyte == 0) - continue; - /* For some reason gcc isn't unrolling this, even with -funroll-loops */ - if (inbyte & 3) - { - outs[row][i] |= 3 & inbyte; - row = (row + 1) & 3; - } - if (inbyte & (3 << 2)) - { - outs[row][i] |= (3 << 2) & inbyte; - row = (row + 1) & 3; - } - if (inbyte & (3 << 4)) - { - outs[row][i] |= (3 << 4) & inbyte; - row = (row + 1) & 3; - } - if (inbyte & (3 << 6)) - { - outs[row][i] |= (3 << 6) & inbyte; - row = (row + 1) & 3; - } - } + unsigned char *outs[2]; + outs[0] = outhi; + outs[1] = outlo; + stp_split(length, bits, 2, in, 1, outs); } void @@ -514,26 +366,19 @@ stp_split_4(int length, unsigned char *out2, unsigned char *out3) { - if (bits == 2) - stpi_split_4_2(length, in, out0, out1, out2, out3); - else - stpi_split_4_1(length, in, out0, out1, out2, out3); + unsigned char *outs[4]; + outs[0] = out0; + outs[1] = out1; + outs[2] = out2; + outs[3] = out3; + stp_split(length, bits, 4, in, 1, outs); } -#if __BYTE_ORDER == __LITTLE_ENDIAN -#define SH20 0 -#define SH21 8 -#else -#define SH20 8 -#define SH21 0 -#endif - static void stpi_unpack_2_1(int length, const unsigned char *in, - unsigned char *out0, - unsigned char *out1) + unsigned char **outs) { unsigned char tempin, bit, temp0, temp1; @@ -570,8 +415,8 @@ stpi_unpack_2_1(int length, else { bit = 128; - *out0++ = temp0; - *out1++ = temp1; + *outs[0]++ = temp0; + *outs[1]++ = temp1; temp0 = 0; temp1 = 0; @@ -580,16 +425,15 @@ stpi_unpack_2_1(int length, if (bit < 128) { - *out0++ = temp0; - *out1++ = temp1; + *outs[0]++ = temp0; + *outs[1]++ = temp1; } } static void stpi_unpack_2_2(int length, - const unsigned char *in, - unsigned char *out0, - unsigned char *out1) + const unsigned char *in, + unsigned char **outs) { if (length <= 0) return; @@ -600,11 +444,11 @@ stpi_unpack_2_2(int length, ti0 = in[0]; ti1 = in[1]; - *out0++ = (ti0 & 0xc0) << 0 + *outs[0]++ = (ti0 & 0xc0) << 0 | (ti0 & 0x0c) << 2 | (ti1 & 0xc0) >> 4 | (ti1 & 0x0c) >> 2; - *out1++ = (ti0 & 0x30) << 2 + *outs[1]++ = (ti0 & 0x30) << 2 | (ti0 & 0x03) << 4 | (ti1 & 0x30) >> 2 | (ti1 & 0x03) >> 0; @@ -612,38 +456,10 @@ stpi_unpack_2_2(int length, } } -void -stp_unpack_2(int length, - int bits, - const unsigned char *in, - unsigned char *outlo, - unsigned char *outhi) -{ - if (bits == 1) - stpi_unpack_2_1(length, in, outlo, outhi); - else - stpi_unpack_2_2(length, in, outlo, outhi); -} - -#if __BYTE_ORDER == __LITTLE_ENDIAN -#define SH40 0 -#define SH41 8 -#define SH42 16 -#define SH43 24 -#else -#define SH40 24 -#define SH41 16 -#define SH42 8 -#define SH43 0 -#endif - static void stpi_unpack_4_1(int length, const unsigned char *in, - unsigned char *out0, - unsigned char *out1, - unsigned char *out2, - unsigned char *out3) + unsigned char **outs) { unsigned char tempin, bit, temp0, temp1, temp2, temp3; @@ -678,10 +494,10 @@ stpi_unpack_4_1(int length, else { bit = 128; - *out0++ = temp0; - *out1++ = temp1; - *out2++ = temp2; - *out3++ = temp3; + *outs[0]++ = temp0; + *outs[1]++ = temp1; + *outs[2]++ = temp2; + *outs[3]++ = temp3; temp0 = 0; temp1 = 0; @@ -692,20 +508,17 @@ stpi_unpack_4_1(int length, if (bit < 128) { - *out0++ = temp0; - *out1++ = temp1; - *out2++ = temp2; - *out3++ = temp3; + *outs[0]++ = temp0; + *outs[1]++ = temp1; + *outs[2]++ = temp2; + *outs[3]++ = temp3; } } static void stpi_unpack_4_2(int length, const unsigned char *in, - unsigned char *out0, - unsigned char *out1, - unsigned char *out2, - unsigned char *out3) + unsigned char **outs) { unsigned char tempin, shift, @@ -741,10 +554,10 @@ stpi_unpack_4_2(int length, else { shift = 0; - *out0++ = temp0; - *out1++ = temp1; - *out2++ = temp2; - *out3++ = temp3; + *outs[0]++ = temp0; + *outs[1]++ = temp1; + *outs[2]++ = temp2; + *outs[3]++ = temp3; temp0 = 0; temp1 = 0; @@ -755,39 +568,17 @@ stpi_unpack_4_2(int length, if (shift) { - *out0++ = temp0; - *out1++ = temp1; - *out2++ = temp2; - *out3++ = temp3; + *outs[0]++ = temp0; + *outs[1]++ = temp1; + *outs[2]++ = temp2; + *outs[3]++ = temp3; } } -void -stp_unpack_4(int length, - int bits, - const unsigned char *in, - unsigned char *out0, - unsigned char *out1, - unsigned char *out2, - unsigned char *out3) -{ - if (bits == 1) - stpi_unpack_4_1(length, in, out0, out1, out2, out3); - else - stpi_unpack_4_2(length, in, out0, out1, out2, out3); -} - static void stpi_unpack_8_1(int length, const unsigned char *in, - unsigned char *out0, - unsigned char *out1, - unsigned char *out2, - unsigned char *out3, - unsigned char *out4, - unsigned char *out5, - unsigned char *out6, - unsigned char *out7) + unsigned char **outs) { unsigned char tempin, bit, temp0, temp1, temp2, temp3, temp4, temp5, temp6, temp7; @@ -824,14 +615,14 @@ stpi_unpack_8_1(int length, else { bit = 128; - *out0++ = temp0; - *out1++ = temp1; - *out2++ = temp2; - *out3++ = temp3; - *out4++ = temp4; - *out5++ = temp5; - *out6++ = temp6; - *out7++ = temp7; + *outs[0]++ = temp0; + *outs[1]++ = temp1; + *outs[2]++ = temp2; + *outs[3]++ = temp3; + *outs[4]++ = temp4; + *outs[5]++ = temp5; + *outs[6]++ = temp6; + *outs[7]++ = temp7; temp0 = 0; temp1 = 0; @@ -846,28 +637,21 @@ stpi_unpack_8_1(int length, if (bit < 128) { - *out0++ = temp0; - *out1++ = temp1; - *out2++ = temp2; - *out3++ = temp3; - *out4++ = temp4; - *out5++ = temp5; - *out6++ = temp6; - *out7++ = temp7; + *outs[0]++ = temp0; + *outs[1]++ = temp1; + *outs[2]++ = temp2; + *outs[3]++ = temp3; + *outs[4]++ = temp4; + *outs[5]++ = temp5; + *outs[6]++ = temp6; + *outs[7]++ = temp7; } } static void stpi_unpack_8_2(int length, const unsigned char *in, - unsigned char *out0, - unsigned char *out1, - unsigned char *out2, - unsigned char *out3, - unsigned char *out4, - unsigned char *out5, - unsigned char *out6, - unsigned char *out7) + unsigned char **outs) { unsigned char tempin, shift, @@ -918,14 +702,14 @@ stpi_unpack_8_2(int length, else { shift = 0; - *out0++ = temp0; - *out1++ = temp1; - *out2++ = temp2; - *out3++ = temp3; - *out4++ = temp4; - *out5++ = temp5; - *out6++ = temp6; - *out7++ = temp7; + *outs[0]++ = temp0; + *outs[1]++ = temp1; + *outs[2]++ = temp2; + *outs[3]++ = temp3; + *outs[4]++ = temp4; + *outs[5]++ = temp5; + *outs[6]++ = temp6; + *outs[7]++ = temp7; temp0 = 0; temp1 = 0; @@ -940,61 +724,25 @@ stpi_unpack_8_2(int length, if (shift) { - *out0++ = temp0; - *out1++ = temp1; - *out2++ = temp2; - *out3++ = temp3; - *out4++ = temp4; - *out5++ = temp5; - *out6++ = temp6; - *out7++ = temp7; + *outs[0]++ = temp0; + *outs[1]++ = temp1; + *outs[2]++ = temp2; + *outs[3]++ = temp3; + *outs[4]++ = temp4; + *outs[5]++ = temp5; + *outs[6]++ = temp6; + *outs[7]++ = temp7; } } -void -stp_unpack_8(int length, - int bits, - const unsigned char *in, - unsigned char *out0, - unsigned char *out1, - unsigned char *out2, - unsigned char *out3, - unsigned char *out4, - unsigned char *out5, - unsigned char *out6, - unsigned char *out7) -{ - if (bits == 1) - stpi_unpack_8_1(length, in, out0, out1, out2, out3, - out4, out5, out6, out7); - else - stpi_unpack_8_2(length, in, out0, out1, out2, out3, - out4, out5, out6, out7); -} - - static void stpi_unpack_16_1(int length, const unsigned char *in, - unsigned char *out0, - unsigned char *out1, - unsigned char *out2, - unsigned char *out3, - unsigned char *out4, - unsigned char *out5, - unsigned char *out6, - unsigned char *out7, - unsigned char *out8, - unsigned char *out9, - unsigned char *out10, - unsigned char *out11, - unsigned char *out12, - unsigned char *out13, - unsigned char *out14, - unsigned char *out15) + unsigned char **outs) { unsigned char tempin, bit; unsigned char temp[16]; + int j; if (length <= 0) return; @@ -1046,70 +794,26 @@ stpi_unpack_16_1(int length, else { bit = 128; - *out0++ = temp[0]; - *out1++ = temp[1]; - *out2++ = temp[2]; - *out3++ = temp[3]; - *out4++ = temp[4]; - *out5++ = temp[5]; - *out6++ = temp[6]; - *out7++ = temp[7]; - *out8++ = temp[8]; - *out9++ = temp[9]; - *out10++ = temp[10]; - *out11++ = temp[11]; - *out12++ = temp[12]; - *out13++ = temp[13]; - *out14++ = temp[14]; - *out15++ = temp[15]; + for (j = 0; j < 16; j++) + *outs[j]++ = temp[j]; memset(temp, 0, 16); } } if (bit < 128) - { - *out0++ = temp[0]; - *out1++ = temp[1]; - *out2++ = temp[2]; - *out3++ = temp[3]; - *out4++ = temp[4]; - *out5++ = temp[5]; - *out6++ = temp[6]; - *out7++ = temp[7]; - *out8++ = temp[8]; - *out9++ = temp[9]; - *out10++ = temp[10]; - *out11++ = temp[11]; - *out12++ = temp[12]; - *out13++ = temp[13]; - *out14++ = temp[14]; - *out15++ = temp[15]; - } + for (j = 0; j < 16; j++) + *outs[j]++ = temp[j]; } static void stpi_unpack_16_2(int length, const unsigned char *in, - unsigned char *out0, - unsigned char *out1, - unsigned char *out2, - unsigned char *out3, - unsigned char *out4, - unsigned char *out5, - unsigned char *out6, - unsigned char *out7, - unsigned char *out8, - unsigned char *out9, - unsigned char *out10, - unsigned char *out11, - unsigned char *out12, - unsigned char *out13, - unsigned char *out14, - unsigned char *out15) + unsigned char **outs) { unsigned char tempin, shift; unsigned char temp[16]; + int j; if (length <= 0) return; @@ -1175,46 +879,120 @@ stpi_unpack_16_2(int length, else { shift = 0; - *out0++ = temp[0]; - *out1++ = temp[1]; - *out2++ = temp[2]; - *out3++ = temp[3]; - *out4++ = temp[4]; - *out5++ = temp[5]; - *out6++ = temp[6]; - *out7++ = temp[7]; - *out8++ = temp[8]; - *out9++ = temp[9]; - *out10++ = temp[10]; - *out11++ = temp[11]; - *out12++ = temp[12]; - *out13++ = temp[13]; - *out14++ = temp[14]; - *out15++ = temp[15]; + for (j = 0; j < 16; j++) + *outs[j]++ = temp[j]; memset(temp, 0, 16); } } if (shift) - { - *out0++ = temp[0]; - *out1++ = temp[1]; - *out2++ = temp[2]; - *out3++ = temp[3]; - *out4++ = temp[4]; - *out5++ = temp[5]; - *out6++ = temp[6]; - *out7++ = temp[7]; - *out8++ = temp[8]; - *out9++ = temp[9]; - *out10++ = temp[10]; - *out11++ = temp[11]; - *out12++ = temp[12]; - *out13++ = temp[13]; - *out14++ = temp[14]; - *out15++ = temp[15]; - } + for (j = 0; j < 16; j++) + *outs[j]++ = temp[j]; +} + +void +stp_unpack(int length, + int bits, + int n, + const unsigned char *in, + unsigned char **outs) +{ + unsigned char **touts; + int i; + if (n < 2) + return; + touts = stp_malloc(sizeof(unsigned char *) * n); + for (i = 0; i < n; i++) + touts[i] = outs[i]; + if (bits == 1) + switch (n) + { + case 2: + stpi_unpack_2_1(length, in, touts); + break; + case 4: + stpi_unpack_4_1(length, in, touts); + break; + case 8: + stpi_unpack_8_1(length, in, touts); + break; + case 16: + stpi_unpack_16_1(length, in, touts); + break; + } + else + switch (n) + { + case 2: + stpi_unpack_2_2(length, in, touts); + break; + case 4: + stpi_unpack_4_2(length, in, touts); + break; + case 8: + stpi_unpack_8_2(length, in, touts); + break; + case 16: + stpi_unpack_16_2(length, in, touts); + break; + } + stp_free(touts); +} + +void +stp_unpack_2(int length, + int bits, + const unsigned char *in, + unsigned char *outhi, + unsigned char *outlo) +{ + unsigned char *outs[2]; + outs[0] = outhi; + outs[1] = outlo; + stp_unpack(length, bits, 2, in, outs); +} + +void +stp_unpack_4(int length, + int bits, + const unsigned char *in, + unsigned char *out0, + unsigned char *out1, + unsigned char *out2, + unsigned char *out3) +{ + unsigned char *outs[4]; + outs[0] = out0; + outs[1] = out1; + outs[2] = out2; + outs[3] = out3; + stp_unpack(length, bits, 4, in, outs); +} + +void +stp_unpack_8(int length, + int bits, + const unsigned char *in, + unsigned char *out0, + unsigned char *out1, + unsigned char *out2, + unsigned char *out3, + unsigned char *out4, + unsigned char *out5, + unsigned char *out6, + unsigned char *out7) +{ + unsigned char *outs[8]; + outs[0] = out0; + outs[1] = out1; + outs[2] = out2; + outs[3] = out3; + outs[4] = out4; + outs[5] = out5; + outs[6] = out6; + outs[7] = out7; + stp_unpack(length, bits, 8, in, outs); } void @@ -1238,14 +1016,24 @@ stp_unpack_16(int length, unsigned char *out14, unsigned char *out15) { - if (bits == 1) - stpi_unpack_16_1(length, in, - out0, out1, out2, out3, out4, out5, out6, out7, - out8, out9, out10, out11, out12, out13, out14, out15); - else - stpi_unpack_16_2(length, in, - out0, out1, out2, out3, out4, out5, out6, out7, - out8, out9, out10, out11, out12, out13, out14, out15); + unsigned char *outs[16]; + outs[0] = out0; + outs[1] = out1; + outs[2] = out2; + outs[3] = out3; + outs[4] = out4; + outs[5] = out5; + outs[6] = out6; + outs[7] = out7; + outs[8] = out8; + outs[9] = out9; + outs[10] = out10; + outs[11] = out11; + outs[12] = out12; + outs[13] = out13; + outs[14] = out14; + outs[15] = out15; + stp_unpack(length, bits, 16, in, outs); } static void diff --git a/src/main/channel.c b/src/main/channel.c index b31a4f6..96043a2 100644 --- a/src/main/channel.c +++ b/src/main/channel.c @@ -1,5 +1,5 @@ /* - * "$Id: channel.c,v 1.31 2008/10/29 00:10:42 easysw Exp $" + * "$Id: channel.c,v 1.32 2009/03/01 17:14:15 rlk Exp $" * * Dither routine entrypoints * @@ -618,9 +618,9 @@ stp_channel_initialize(stp_vars_t *v, stp_image_t *image, stp_dprintf(STP_DBG_INK, v, " black_channel %d\n", cg->black_channel); stp_dprintf(STP_DBG_INK, v, " gloss_channel %d\n", cg->gloss_channel); stp_dprintf(STP_DBG_INK, v, " gloss_physical %d\n", cg->gloss_physical_channel); - stp_dprintf(STP_DBG_INK, v, " cyan %.3f", cg->cyan_balance); - stp_dprintf(STP_DBG_INK, v, " magenta %.3f", cg->magenta_balance); - stp_dprintf(STP_DBG_INK, v, " yellow %.3f", cg->yellow_balance); + stp_dprintf(STP_DBG_INK, v, " cyan %.3f\n", cg->cyan_balance); + stp_dprintf(STP_DBG_INK, v, " magenta %.3f\n", cg->magenta_balance); + stp_dprintf(STP_DBG_INK, v, " yellow %.3f\n", cg->yellow_balance); stp_dprintf(STP_DBG_INK, v, " input_data %p\n", (void *) cg->input_data); stp_dprintf(STP_DBG_INK, v, " multi_tmp %p\n", diff --git a/src/main/escp2-channels.c b/src/main/escp2-channels.c index b899c78..5f16887 100644 --- a/src/main/escp2-channels.c +++ b/src/main/escp2-channels.c @@ -1,5 +1,5 @@ /* - * "$Id: escp2-channels.c,v 1.87 2008/10/29 00:10:42 easysw Exp $" + * "$Id: escp2-channels.c,v 1.89 2009/03/07 19:38:00 rlk Exp $" * * Print plug-in EPSON ESC/P2 driver for the GIMP. * @@ -47,6 +47,12 @@ load_subchannel(stp_mxml_node_t *node, stp_mxml_node_t *root, physical_subchanne name = stp_mxmlElementGetAttr(node, "headOffset"); if (name) icl->head_offset = stp_xmlstrtol(name); + name = stp_mxmlElementGetAttr(node, "name"); + if (name) + icl->name = stp_strdup(name); + name = stp_mxmlElementGetAttr(node, "text"); + if (name) + icl->text = stp_strdup(name); while (child) { if (child->type == STP_MXML_ELEMENT) @@ -234,6 +240,8 @@ load_inkname(stp_mxml_node_t *node, stp_mxml_node_t *root, inkname_t *inl) inl->inkset = INKSET_CcMmYKk; else if (!strcmp(name, "Quadtone")) inl->inkset = INKSET_QUADTONE; + else if (!strcmp(name, "Hextone")) + inl->inkset = INKSET_HEXTONE; else if (!strcmp(name, "OTHER")) inl->inkset = INKSET_OTHER; else if (!strcmp(name, "Extended")) diff --git a/src/main/escp2-papers.c b/src/main/escp2-papers.c index 457aa0c..05593e9 100644 --- a/src/main/escp2-papers.c +++ b/src/main/escp2-papers.c @@ -1,5 +1,5 @@ /* - * "$Id: escp2-papers.c,v 1.117 2008/07/06 02:17:43 rlk Exp $" + * "$Id: escp2-papers.c,v 1.118 2009/07/21 11:07:06 rlk Exp $" * * Print plug-in EPSON ESC/P2 driver for the GIMP. * @@ -449,6 +449,9 @@ build_input_slot(const stp_vars_t *v, const char *name) n1 = stp_mxmlFindElement(node, node, "DeinitSequence", NULL, NULL, STP_MXML_DESCEND); if (n1 && n1->child && n1->child->type == STP_MXML_TEXT) answer->deinit_sequence = stp_xmlstrtoraw(n1->child->value.text.string); + n1 = stp_mxmlFindElement(node, node, "ExtraHeight", NULL, NULL, STP_MXML_DESCEND); + if (n1 && n1->child && n1->child->type == STP_MXML_TEXT) + answer->extra_height = stp_xmlstrtoul(n1->child->value.text.string); return answer; } diff --git a/src/main/print-escp2.c b/src/main/print-escp2.c index 096fb43..0ccc74c 100644 --- a/src/main/print-escp2.c +++ b/src/main/print-escp2.c @@ -1,5 +1,5 @@ /* - * "$Id: print-escp2.c,v 1.416 2008/11/22 20:34:29 rlk Exp $" + * "$Id: print-escp2.c,v 1.424 2009/07/21 11:07:06 rlk Exp $" * * Print plug-in EPSON ESC/P2 driver for the GIMP. * @@ -317,6 +317,12 @@ static const stp_parameter_t the_parameters[] = STP_PARAMETER_LEVEL_INTERNAL, 0, 0, STP_CHANNEL_NONE, 0, 0 }, { + "RawChannelNames", N_("Raw Channel Names"), N_("Advanced Printer Functionality"), + N_("Raw Channel Names"), + STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_FEATURE, + STP_PARAMETER_LEVEL_INTERNAL, 0, 0, STP_CHANNEL_NONE, 0, 0 + }, + { "ChannelNames", N_("Channel Names"), N_("Advanced Printer Functionality"), N_("Channel Names"), STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_FEATURE, @@ -740,6 +746,126 @@ static const float_param_t float_parameters[] = }, { { + "HGray5Value", N_("Hextone Gray 5 Value"), N_("Advanced Ink Adjustment"), + N_("Hextone Gray 5 (Darkest) Value"), + STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT, + STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0 + }, 0.0, 5.0, 1.0, 1 + }, + { + { + "HGray5Trans", N_("Hextone Gray 5 Transition"), N_("Advanced Ink Adjustment"), + N_("Hextone Gray 5 (Darkest) Transition"), + STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT, + STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0 + }, 0.0, 5.0, 1.0, 1 + }, + { + { + "HGray5Scale", N_("Hextone Gray 5 Density Scale"), N_("Advanced Ink Adjustment"), + N_("Hextone Gray 5 (Darkest) Density Scale"), + STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT, + STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0 + }, 0.0, 5.0, 1.0, 1 + }, + { + { + "HGray4Value", N_("Hextone Gray 4 Value"), N_("Advanced Ink Adjustment"), + N_("Hextone Gray 4 Value"), + STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT, + STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0 + }, 0.0, 5.0, 1.0, 1 + }, + { + { + "HGray4Trans", N_("Hextone Gray 4 Transition"), N_("Advanced Ink Adjustment"), + N_("Hextone Gray 4 Transition"), + STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT, + STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0 + }, 0.0, 5.0, 1.0, 1 + }, + { + { + "HGray4Scale", N_("Hextone Gray 4 Density Scale"), N_("Advanced Ink Adjustment"), + N_("Hextone Gray 4 Density Scale"), + STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT, + STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0 + }, 0.0, 5.0, 1.0, 1 + }, + { + { + "HGray3Value", N_("Hextone Gray 3 Value"), N_("Advanced Ink Adjustment"), + N_("Hextone Gray 3 Value"), + STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT, + STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0 + }, 0.0, 5.0, 1.0, 1 + }, + { + { + "HGray3Trans", N_("Hextone Gray 3 Transition"), N_("Advanced Ink Adjustment"), + N_("Hextone Gray 3 Transition"), + STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT, + STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0 + }, 0.0, 5.0, 1.0, 1 + }, + { + { + "HGray3Scale", N_("Hextone Gray 3 Density Scale"), N_("Advanced Ink Adjustment"), + N_("Hextone Gray 3 Density Scale"), + STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT, + STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0 + }, 0.0, 5.0, 1.0, 1 + }, + { + { + "HGray2Value", N_("Hextone Gray 2 Value"), N_("Advanced Ink Adjustment"), + N_("Hextone Gray 2 Value"), + STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT, + STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0 + }, 0.0, 5.0, 1.0, 1 + }, + { + { + "HGray2Trans", N_("Hextone Gray 2 Transition"), N_("Advanced Ink Adjustment"), + N_("Hextone Gray 2 Transition"), + STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT, + STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0 + }, 0.0, 5.0, 1.0, 1 + }, + { + { + "HGray2Scale", N_("Hextone Gray 2 Density Scale"), N_("Advanced Ink Adjustment"), + N_("Hextone Gray 2 Density Scale"), + STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT, + STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0 + }, 0.0, 5.0, 1.0, 1 + }, + { + { + "HGray1Value", N_("Hextone Gray 1 Value"), N_("Advanced Ink Adjustment"), + N_("Hextone Gray 1 (Lightest) Value"), + STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT, + STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0 + }, 0.0, 5.0, 1.0, 1 + }, + { + { + "HGray1Trans", N_("Hextone Gray 1 Transition"), N_("Advanced Ink Adjustment"), + N_("Hextone Gray 1 (Lightest) Transition"), + STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT, + STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0 + }, 0.0, 5.0, 1.0, 1 + }, + { + { + "HGray1Scale", N_("Hextone Gray 1 Density Scale"), N_("Advanced Ink Adjustment"), + N_("Hextone Gray 1 (Lightest) Density Scale"), + STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT, + STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0 + }, 0.0, 5.0, 1.0, 1 + }, + { + { "BlackTrans", N_("GCR Transition"), N_("Advanced Output Control"), N_("Adjust the gray component transition rate"), STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT, @@ -796,6 +922,14 @@ static const int_param_t int_parameters[] = { { { + "QualityEnhancement", N_("Quality Enhancement"), N_("Advanced Printer Functionality"), + N_("Enhance print quality by additional passes"), + STP_PARAMETER_TYPE_INT, STP_PARAMETER_CLASS_FEATURE, + STP_PARAMETER_LEVEL_ADVANCED2, 0, 1, STP_CHANNEL_NONE, 1, 0 + }, 0, 4, 0 + }, + { + { "PaperThickness", N_("Paper Thickness"), N_("Advanced Printer Functionality"), N_("Set printer paper thickness"), STP_PARAMETER_TYPE_INT, STP_PARAMETER_CLASS_FEATURE, @@ -837,6 +971,7 @@ static const int_param_t int_parameters[] = { { "FeedAdjustment", N_("Feed Adjustment"), N_("Advanced Printer Functionality"), + /* xgettext:no-c-format */ N_("Set paper feed adjustment (0.01% units)"), STP_PARAMETER_TYPE_INT, STP_PARAMETER_CLASS_FEATURE, STP_PARAMETER_LEVEL_ADVANCED3, 0, 1, STP_CHANNEL_NONE, 1, 0 @@ -1544,6 +1679,40 @@ get_inktype(const stp_vars_t *v) return &(ink_list->inknames[0]); } +static const inkname_t * +get_inktype_only(const stp_vars_t *v) +{ + const char *ink_type = stp_get_string_parameter(v, "InkType"); + + if (!ink_type) + return NULL; + else + return get_inktype(v); +} + +static int +printer_supports_inkset(const stp_vars_t *v, inkset_id_t inkset) +{ + const inkgroup_t *ink_group = escp2_inkgroup(v); + int i; + for (i = 0; i < ink_group->n_inklists; i++) + { + const inklist_t *ink_list = &(ink_group->inklists[i]); + if (ink_list) + { + int j; + for (j = 0; j < ink_list->n_inks; j++) + { + if (ink_list->inknames[j].inkset == inkset) + { + return 1; + } + } + } + } + return 0; +} + static const stp_vars_t * get_media_adjustment(const stp_vars_t *v) { @@ -1680,9 +1849,13 @@ set_gray_value_parameter(const stp_vars_t *v, stp_parameter_t *description, int expected_channels) { - const inkname_t *ink_name = get_inktype(v); + const inkname_t *ink_name = get_inktype_only(v); description->is_active = 0; - if (ink_name && + if (!ink_name && + ((expected_channels == 4 && printer_supports_inkset(v, INKSET_QUADTONE)) || + (expected_channels == 6 && printer_supports_inkset(v, INKSET_HEXTONE)))) + fill_value_parameters(v, description, STP_ECOLOR_K); + else if (ink_name && (ink_name->channels[STP_ECOLOR_K].n_subchannels == expected_channels)) fill_value_parameters(v, description, STP_ECOLOR_K); @@ -1727,8 +1900,12 @@ set_gray_transition_parameter(const stp_vars_t *v, stp_parameter_t *description, int expected_channels) { - const inkname_t *ink_name = get_inktype(v); + const inkname_t *ink_name = get_inktype_only(v); description->is_active = 0; + if (!ink_name && + ((expected_channels == 4 && printer_supports_inkset(v, INKSET_QUADTONE)) || + (expected_channels == 6 && printer_supports_inkset(v, INKSET_HEXTONE)))) + fill_transition_parameters(v, description, STP_ECOLOR_K); if (ink_name && (ink_name->channels[STP_ECOLOR_K].n_subchannels == expected_channels)) @@ -1768,8 +1945,12 @@ set_gray_scale_parameter(const stp_vars_t *v, stp_parameter_t *description, int expected_channels) { - const inkname_t *ink_name = get_inktype(v); + const inkname_t *ink_name = get_inktype_only(v); description->is_active = 0; + if (!ink_name && + ((expected_channels == 4 && printer_supports_inkset(v, INKSET_QUADTONE)) || + (expected_channels == 6 && printer_supports_inkset(v, INKSET_HEXTONE)))) + fill_transition_parameters(v, description, STP_ECOLOR_K); if (ink_name && (ink_name->channels[STP_ECOLOR_K].n_subchannels == expected_channels)) @@ -1941,6 +2122,30 @@ find_resolution_from_quality(const stp_vars_t *v, const char *quality, return NULL; } +static const inkname_t * +get_raw_inktype(const stp_vars_t *v) +{ + if (strcmp(stp_get_string_parameter(v, "InputImageType"), "Raw") == 0) + { + const inklist_t *inks = stp_escp2_inklist(v); + int ninktypes = inks->n_inks; + int i; + const char *channel_name = stp_get_string_parameter(v, "RawChannels"); + const channel_count_t *count; + if (!channel_name) + goto none; + count = get_channel_count_by_name(channel_name); + if (!count) + goto none; + for (i = 0; i < ninktypes; i++) + if (inks->inknames[i].inkset == INKSET_EXTENDED && + (inks->inknames[i].channel_count == count->count)) + return &(inks->inknames[i]); + } + none: + return get_inktype(v); +} + static void escp2_parameters(const stp_vars_t *v, const char *name, stp_parameter_t *description) @@ -2455,7 +2660,7 @@ escp2_parameters(const stp_vars_t *v, const char *name, const inklist_t *inks = stp_escp2_inklist(v); int ninktypes = inks->n_inks; description->bounds.str = stp_string_list_create(); - if (ninktypes > 1) + if (ninktypes >= 1) { stp_string_list_add_string(description->bounds.str, "None", "None"); for (i = 0; i < ninktypes; i++) @@ -2470,9 +2675,41 @@ escp2_parameters(const stp_vars_t *v, const char *name, description->deflt.str = stp_string_list_param(description->bounds.str, 0)->name; } - if (ninktypes <= 1) + else description->is_active = 0; } + else if (strcmp(name, "RawChannelNames") == 0) + { + const inkname_t *ink_name = get_raw_inktype(v); + if (ink_name) + { + description->bounds.str = stp_string_list_create(); + for (i = 0; i < ink_name->channel_count; i++) + { + int j; + const ink_channel_t *ic = &(ink_name->channels[i]); + if (ic) + for (j = 0; j < ic->n_subchannels; j++) + if (ic->subchannels[j].name) + stp_string_list_add_string(description->bounds.str, + ic->subchannels[j].name, + gettext(ic->subchannels[j].text)); + } + for (i = 0; i < ink_name->aux_channel_count; i++) + { + int j; + const ink_channel_t *ic = &(ink_name->aux_channels[i]); + if (ic) + for (j = 0; j < ic->n_subchannels; j++) + if (ic->subchannels[j].name) + stp_string_list_add_string(description->bounds.str, + ic->subchannels[j].name, + gettext(ic->subchannels[j].text)); + } + description->deflt.str = + stp_string_list_param(description->bounds.str, 0)->name; + } + } else if (strcmp(name, "MultiChannelLimit") == 0) { description->is_active = 0; @@ -2500,6 +2737,10 @@ escp2_parameters(const stp_vars_t *v, const char *name, if (stp_escp2_has_media_feature(v, name)) description->is_active = 1; } + else if (strcmp(name, "QualityEnhancement") == 0) + { + description->is_active = 1; + } } const res_t * @@ -2790,6 +3031,7 @@ escp2_describe_output(const stp_vars_t *v) switch (ink_type->inkset) { case INKSET_QUADTONE: + case INKSET_HEXTONE: return "Grayscale"; case INKSET_OTHER: case INKSET_CMYK: @@ -3638,6 +3880,7 @@ setup_printer_weave_parameters(stp_vars_t *v) pd->nozzle_start = 0; pd->min_nozzles = 1; pd->use_black_parameters = 0; + pd->extra_vertical_passes = 1; } static void @@ -3665,6 +3908,7 @@ setup_head_parameters(stp_vars_t *v) pd->printer_weave = get_printer_weave(v); + pd->extra_vertical_passes = 1 << stp_get_int_parameter(v, "QualityEnhancement"); if (stp_escp2_has_cap(v, MODEL_FAST_360, MODEL_FAST_360_YES) && (pd->inkname->inkset == INKSET_CMYK || pd->physical_channels == 1) && pd->res->hres == pd->physical_xdpi && pd->res->vres == 360) @@ -3806,7 +4050,11 @@ setup_page(stp_vars_t *v) } else { - pd->page_extra_height = 0; + if (input_slot) + pd->page_extra_height = input_slot->extra_height * + pd->page_management_units / escp2_base_separation(v); + else + pd->page_extra_height = 0; pd->paper_extra_bottom = escp2_paper_extra_bottom(v); } internal_imageable_area(v, 0, 0, &pd->page_left, &pd->page_right, @@ -4051,7 +4299,7 @@ escp2_print_page(stp_vars_t *v, stp_image_t *image) pd->nozzles, pd->nozzle_separation * pd->res->vres / escp2_base_separation(v), pd->horizontal_passes, - pd->res->vertical_passes, + pd->res->vertical_passes * pd->extra_vertical_passes, 1, pd->channels_in_use, pd->bitwidth, @@ -4135,6 +4383,12 @@ escp2_do_print(stp_vars_t *v, stp_image_t *image, int print_op) stp_eprintf(v, "Warning: Quadtone inkset only available in MONO\n"); stp_set_string_parameter(v, "PrintingMode", "BW"); } + if (pd->inkname && pd->inkname->inkset == INKSET_HEXTONE && + strcmp(stp_get_string_parameter(v, "PrintingMode"), "BW") != 0) + { + stp_eprintf(v, "Warning: Hextone inkset only available in MONO\n"); + stp_set_string_parameter(v, "PrintingMode", "BW"); + } pd->channels_in_use = count_channels(pd->inkname, pd->use_aux_channels); setup_basic(v); diff --git a/src/main/print-escp2.h b/src/main/print-escp2.h index 4f27add..465cab1 100644 --- a/src/main/print-escp2.h +++ b/src/main/print-escp2.h @@ -1,5 +1,5 @@ /* - * "$Id: print-escp2.h,v 1.133 2008/11/22 20:28:04 rlk Exp $" + * "$Id: print-escp2.h,v 1.137 2009/07/21 11:07:06 rlk Exp $" * * Print plug-in EPSON ESC/P2 driver for the GIMP. * @@ -161,6 +161,8 @@ typedef struct const char *subchannel_transition; const char *subchannel_value; const char *subchannel_scale; + const char *name; + const char *text; short *split_channels; } physical_subchannel_t; @@ -180,8 +182,9 @@ typedef enum INKSET_CcMmYyK = 2, INKSET_CcMmYKk = 3, INKSET_QUADTONE = 4, - INKSET_OTHER = 5, - INKSET_EXTENDED = 6 + INKSET_HEXTONE = 5, + INKSET_OTHER = 6, + INKSET_EXTENDED = 7 } inkset_id_t; typedef struct @@ -241,6 +244,7 @@ typedef struct short is_cd; short is_roll_feed; short duplex; + short extra_height; unsigned roll_feed_cut_flags; const stp_raw_t *init_sequence; const stp_raw_t *deinit_sequence; @@ -555,6 +559,7 @@ typedef struct const res_t *res; /* Description of the printing resolution */ const stp_raw_t *printer_weave; /* Printer weave parameters */ int use_printer_weave; /* Use the printer weaving mechanism */ + int extra_vertical_passes; /* Quality enhancement */ /* page parameters */ /* Indexed from top left */ int page_left; /* Left edge of page (points) */ @@ -614,5 +619,5 @@ extern void stpi_escp2_terminate_page(stp_vars_t *v); #endif /* GUTENPRINT_INTERNAL_ESCP2_H */ /* - * End of "$Id: print-escp2.h,v 1.133 2008/11/22 20:28:04 rlk Exp $". + * End of "$Id: print-escp2.h,v 1.137 2009/07/21 11:07:06 rlk Exp $". */ diff --git a/src/main/print-olympus.c b/src/main/print-olympus.c index a0dc7e0..29836ed 100644 --- a/src/main/print-olympus.c +++ b/src/main/print-olympus.c @@ -1,5 +1,5 @@ /* - * "$Id: print-olympus.c,v 1.89 2008/08/14 01:01:41 rlk Exp $" + * "$Id: print-olympus.c,v 1.94 2009/06/22 11:58:34 rlk Exp $" * * Print plug-in DyeSub driver (formerly Olympus driver) for the GIMP. * @@ -50,6 +50,7 @@ #define DYESUB_FEATURE_BORDERLESS 0x00000008 #define DYESUB_FEATURE_WHITE_BORDER 0x00000010 #define DYESUB_FEATURE_PLANE_INTERLACE 0x00000020 +#define DYESUB_FEATURE_PLANE_LEFTTORIGHT 0x00000040 #define DYESUB_PORTRAIT 0 #define DYESUB_LANDSCAPE 1 @@ -168,6 +169,7 @@ typedef struct { int prnh_px, prnw_px, prnt_px, prnb_px, prnl_px, prnr_px; int print_mode; /* portrait or landscape */ int image_rows; + int plane_lefttoright; } dyesub_print_vars_t; typedef struct /* printer specific parameters */ @@ -851,6 +853,37 @@ static const dyesub_printsize_t cp220_printsize[] = LIST(dyesub_printsize_list_t, cp220_printsize_list, dyesub_printsize_t, cp220_printsize); + +/* Canon SELPHY CP-520 */ +static void cp520_printer_init_func(stp_vars_t *v) +{ + char pg = (strcmp(privdata.pagesize, "Postcard") == 0 ? '\1' : + (strcmp(privdata.pagesize, "w253h337") == 0 ? '\2' : + (strcmp(privdata.pagesize, "w155h244") == 0 ? '\3' : + (strcmp(privdata.pagesize, "w283h566") == 0 ? '\4' : + '\1' )))); + + stp_put16_be(0x4000, v); + stp_putc('\0', v); + stp_putc(pg, v); + dyesub_nputc(v, '\0', 8); + /* The CP520 does not want the printer_init and plane_init command to be sent + in the same USB-packet so we fill up first USB-Packet with '\0'. */ + dyesub_nputc(v, '\0', 1012); +} + +static void cp520_plane_init_func(stp_vars_t *v) +{ + stp_put16_be(0x4001, v); + stp_putc(3 - privdata.plane, v); /* The CP520 differs from the cp-printer + in that it reqires the plane in the 3rd + byte not in the 4th */ + stp_putc('\0', v); + stp_put32_le(privdata.w_size * privdata.h_size, v); + dyesub_nputc(v, '\0', 4); +} + + /* Canon SELPHY ES series */ static void es1_printer_init_func(stp_vars_t *v) { @@ -1406,6 +1439,89 @@ static void shinko_chcs9045_printer_init(stp_vars_t *v) } +/* Dai Nippon Printing DS40 */ +static const dyesub_pagesize_t dnpds40_dock_page[] = +{ + { "w288h432", "4x6", PT(1920,300)+1, PT(1240,300)+1, 0, 0, 0, 0, + DYESUB_PORTRAIT}, + { "w432h576", "6x9", PT(1920,300)+1, PT(2740,300)+1, 0, 0, 0, 0, + DYESUB_PORTRAIT}, + { "A5", "6x8", PT(1920,300)+1, PT(2436,300)+1, 0, 0, 0, 0, + DYESUB_PORTRAIT}, +}; + +LIST(dyesub_pagesize_list_t, dnpds40_dock_page_list, dyesub_pagesize_t, dnpds40_dock_page); + +static const dyesub_printsize_t dnpds40_dock_printsize[] = +{ + { "300x300", "w288h432", 1920, 1240}, + { "300x300", "w432h576", 1920, 2740}, + { "300x300", "A5", 1920, 2436}, +}; + +LIST(dyesub_printsize_list_t, dnpds40_dock_printsize_list, dyesub_printsize_t, dnpds40_dock_printsize); + +static void dnpds40_printer_end(stp_vars_t *v) +{ + stp_zprintf(v, "\033PCNTRL START"); dyesub_nputc(v, ' ', 19); +} + +static void dnpds40_plane_init(stp_vars_t *v) +{ + char p = (privdata.plane == 3 ? 'Y' : + (privdata.plane == 2 ? 'M' : + 'C' )); + + long RFSize = (privdata.w_size*privdata.h_size) + 1024 + 54; + long AdSize = (32 - (RFSize % 32)); + long FSize = RFSize + AdSize; + + stp_zprintf(v, "\033PCNTRL RETENTION 0000000800000000"); + stp_zprintf(v, "\033PIMAGE %cPLANE", p); dyesub_nputc(v, ' ', 10); + + stp_zprintf(v, "0%ld", FSize); + stp_zprintf(v, "BM"); + stp_put32_le(FSize, v); + dyesub_nputc(v, '\0', 4); + stp_put32_le(1088, v); + stp_put32_le(40, v); + stp_put32_le(privdata.w_size, v); + stp_put32_le(privdata.h_size, v); + stp_put16_le(1, v); + stp_put16_le(8, v); + dyesub_nputc(v, '\0', 24); + dyesub_nputc(v, '\0', 1024); /*RGB Array*/ + dyesub_nputc(v, '\0', AdSize); /*Locate to 32bit border */ +} + + + +/* Dai Nippon Printing DS80 */ +static const dyesub_pagesize_t dnpds80_dock_page[] = +{ + { "c8x10", "8x10", PT(2560,300)+1, PT(3036,300)+1, 0, 0, 0, 0, DYESUB_PORTRAIT}, + { "C6", "8x4", PT(2560,300)+1, PT(1236,300)+1, 0, 0, 0, 0, DYESUB_PORTRAIT},/* 8x4 */ + { "C5", "8x5", PT(2560,300)+1, PT(1536,300)+1, 0, 0, 0, 0, DYESUB_PORTRAIT}, + { "C4", "8x6", PT(2560,300)+1, PT(1836,300)+1, 0, 0, 0, 0, DYESUB_PORTRAIT}, + { "C3", "8x8", PT(2560,300)+1, PT(2436,300)+1, 0, 0, 0, 0, DYESUB_PORTRAIT}, + { "C2", "8x12", PT(2560,300)+1, PT(3636,300)+1, 0, 0, 0, 0, DYESUB_PORTRAIT}, + { "C1", "A4 Length", PT(2560,300)+1, PT(3544,300)+1, 0, 0, 0, 0, DYESUB_PORTRAIT}, +}; + +LIST(dyesub_pagesize_list_t, dnpds80_dock_page_list, dyesub_pagesize_t, dnpds80_dock_page); + +static const dyesub_printsize_t dnpds80_dock_printsize[] = +{ + { "300x300", "c8x10", 2560, 3036}, + { "300x300", "C6", 2560, 1236}, + { "300x300", "C5", 2560, 1536}, + { "300x300", "C4", 2560, 1836}, + { "300x300", "C3", 2560, 2436}, + { "300x300", "C2", 2560, 3636}, + { "300x300", "C1", 2560, 3544}, +}; + +LIST(dyesub_printsize_list_t, dnpds80_dock_printsize_list, dyesub_printsize_t, dnpds80_dock_printsize); /* Model capabilities */ @@ -1549,6 +1665,22 @@ static const dyesub_cap_t dyesub_model_capabilities[] = cpx00_adj_cyan, cpx00_adj_magenta, cpx00_adj_yellow, NULL, }, + { /* Canon CP-520 */ + 1004, + &ymc_ink_list, + &res_300dpi_list, + &cp220_page_list, + &cp220_printsize_list, + SHRT_MAX, + DYESUB_FEATURE_FULL_WIDTH | DYESUB_FEATURE_FULL_HEIGHT + | DYESUB_FEATURE_BORDERLESS | DYESUB_FEATURE_WHITE_BORDER + | DYESUB_FEATURE_PLANE_INTERLACE, + &cp520_printer_init_func, NULL, + &cp520_plane_init_func, NULL, + NULL, NULL, + cpx00_adj_cyan, cpx00_adj_magenta, cpx00_adj_yellow, + NULL, + }, { /* Canon SELPHY ES1, ES2, ES20 (!experimental) */ 1003, &ymc_ink_list, @@ -1696,6 +1828,36 @@ static const dyesub_cap_t dyesub_model_capabilities[] = NULL, NULL, NULL, NULL, }, + { /* Dai Nippon Printing DS40 */ + 6000, + &rgb_ink_list, + &res_300dpi_list, + &dnpds40_dock_page_list, + &dnpds40_dock_printsize_list, + SHRT_MAX, + DYESUB_FEATURE_FULL_WIDTH | DYESUB_FEATURE_FULL_HEIGHT + | DYESUB_FEATURE_PLANE_INTERLACE | DYESUB_FEATURE_PLANE_LEFTTORIGHT, + NULL, &dnpds40_printer_end, + &dnpds40_plane_init, NULL, + NULL, NULL, + NULL, NULL, NULL, + NULL, + }, + { /* Dai Nippon Printing DS80 */ + 6001, + &rgb_ink_list, + &res_300dpi_list, + &dnpds80_dock_page_list, + &dnpds80_dock_printsize_list, + SHRT_MAX, + DYESUB_FEATURE_FULL_WIDTH | DYESUB_FEATURE_FULL_HEIGHT + | DYESUB_FEATURE_PLANE_INTERLACE | DYESUB_FEATURE_PLANE_LEFTTORIGHT, + NULL, &dnpds40_printer_end, + &dnpds40_plane_init, NULL, + NULL, NULL, + NULL, NULL, NULL, + NULL, + }, }; static const stp_parameter_t the_parameters[] = @@ -1731,6 +1893,10 @@ static const stp_parameter_t the_parameters[] = STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0 }, { + /* TRANSLATORS: Some dye sublimation printers are able achieve */ + /* better durability of output by covering it with transparent */ + /* laminate surface. This surface can be of different patterns: */ + /* common are matte, glossy or texture. */ "Laminate", N_("Laminate Pattern"), N_("Advanced Printer Setup"), N_("Laminate Pattern"), STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_FEATURE, @@ -2365,7 +2531,10 @@ dyesub_print_row(stp_vars_t *v, for (w = 0; w < pv->outw_px; w++) { col = dyesub_interpolate(w, pv->outw_px, pv->imgw_px); - ret = dyesub_print_pixel(v, pv, row, col, plane); + if (pv->plane_lefttoright) + ret = dyesub_print_pixel(v, pv, row, pv->imgw_px - col - 1, plane); + else + ret = dyesub_print_pixel(v, pv, row, col, plane); if (ret > 1) break; } @@ -2553,6 +2722,7 @@ dyesub_do_print(stp_vars_t *v, stp_image_t *image) (strcmp(ink_type, "RGB") == 0 || strcmp(ink_type, "BGR") == 0) ? '\xff' : '\0'); pv.plane_interlacing = dyesub_feature(caps, DYESUB_FEATURE_PLANE_INTERLACE); + pv.plane_lefttoright = dyesub_feature(caps, DYESUB_FEATURE_PLANE_LEFTTORIGHT); pv.print_mode = page_mode; if (!pv.image_data) { diff --git a/src/main/print-weave.c b/src/main/print-weave.c index 0207082..98eae16 100644 --- a/src/main/print-weave.c +++ b/src/main/print-weave.c @@ -1,5 +1,5 @@ /* - * "$Id: print-weave.c,v 1.72 2008/10/29 00:10:42 easysw Exp $" + * "$Id: print-weave.c,v 1.75 2009/05/24 01:53:53 rlk Exp $" * * Softweave calculator for Gutenprint. * @@ -1149,6 +1149,10 @@ stp_initialize_weave(stp_vars_t *v, sw->horizontal_width = (sw->compute_linewidth)(v, ((sw->linewidth + sw->horizontal_weave - 1) / sw->horizontal_weave)); + stp_dprintf(STP_DBG_WEAVE_PARAMS, v, + "Computing linewidth for linewidth %d weave %d => %d (%d)\n", + sw->linewidth, sw->horizontal_weave, sw->horizontal_width, + ((sw->horizontal_width + 7) / 8)); sw->horizontal_width = ((sw->horizontal_width + 7) / 8); for (i = 0; i < sw->vmod; i++) @@ -1173,6 +1177,10 @@ stp_initialize_weave(stp_vars_t *v, sw->oversample, sw->vmod, sw->vmod * sw->virtual_jets * sw->bitwidth * sw->ncolors * sw->horizontal_width, page_height); + stp_dprintf(STP_DBG_WEAVE_PARAMS, v, + " ***Buffer limit %d (vj %d bw %d hw %d)\n", + sw->virtual_jets * sw->bitwidth * sw->horizontal_width, + sw->virtual_jets, sw->bitwidth, sw->horizontal_width); stp_allocate_component_data(v, "Weave", NULL, stpi_destroy_weave, sw); return; } @@ -1499,9 +1507,44 @@ add_to_row(stp_vars_t *v, stpi_softweave_t *sw, int row, unsigned char *buf, size_t count = linecount->v[color]; if (place + nbytes > sw->virtual_jets * sw->bitwidth * sw->horizontal_width) { - stp_eprintf(v, "Buffer overflow: limit %d, actual %ld, count %ld\n", + int i; + stp_eprintf(v, "ERROR: %s\n", _("Fatal error!")); + stp_eprintf(v, "ERROR: Static weave data follows:\n"); + stp_eprintf(v, "ERROR: jets: %d\n", sw->jets); + stp_eprintf(v, "ERROR: virtual_jets: %d\n", sw->virtual_jets); + stp_eprintf(v, "ERROR: separation: %d\n", sw->separation); + stp_eprintf(v, "ERROR: horizontal_weave: %d\n", sw->horizontal_weave); + stp_eprintf(v, "ERROR: vertical_subpasses: %d\n", sw->vertical_subpasses); + stp_eprintf(v, "ERROR: vmod: %d\n", sw->vmod); + stp_eprintf(v, "ERROR: oversample: %d\n", sw->oversample); + stp_eprintf(v, "ERROR: repeat_count: %d\n", sw->repeat_count); + stp_eprintf(v, "ERROR: ncolors: %d\n", sw->ncolors); + stp_eprintf(v, "ERROR: linewidth: %d\n", sw->linewidth); + stp_eprintf(v, "ERROR: vertical_height: %d\n", sw->vertical_height); + stp_eprintf(v, "ERROR: firstline: %d\n", sw->firstline); + stp_eprintf(v, "ERROR: bitwidth: %d\n", sw->bitwidth); + stp_eprintf(v, "ERROR: vertical_oversample: %d\n", sw->vertical_oversample); + stp_eprintf(v, "ERROR: horizontal_width: %d\n", sw->horizontal_width); + if (sw->head_offset) + { + stp_eprintf(v, "ERROR: head_offset:\n"); + for (i = 0; i < sw->ncolors; i++) + stp_eprintf(v, "ERROR: head %d: %d\n", i, sw->head_offset[i]); + } + stp_eprintf(v, "ERROR: Dynamic weave data follows:\n"); + stp_eprintf(v, "ERROR: last_pass_offset: %d\n", sw->last_pass_offset); + stp_eprintf(v, "ERROR: last_pass: %d\n", sw->last_pass); + stp_eprintf(v, "ERROR: lineno: %d\n", sw->lineno); + stp_eprintf(v, "ERROR: current_vertical_subpass: %d\n", sw->current_vertical_subpass); + stp_eprintf(v, "ERROR: rcache: %d\n", sw->rcache); + stp_eprintf(v, "ERROR: vcache: %d\n", sw->vcache); + stp_eprintf(v, "ERROR: Other parameters: row %d color %d setactive %d hpass %d\n", + row, color, setactive, h_pass); + stp_eprintf(v, "ERROR: Buffer overflow: limit %d (jets %d bits %d horizontal %d), actual %ld (current %d added %d), count %ld\n", sw->virtual_jets * sw->bitwidth * sw->horizontal_width, - (long)(place + nbytes), (long)count); + sw->virtual_jets, sw->bitwidth, sw->horizontal_width, + (long) (place + nbytes), (int) place, (int) nbytes, (long) count); + stp_eprintf(v, "ERROR: %s\n", _("Please report the above information to gimp-print-devel@lists.sourceforge.net")); stp_abort(); } memcpy(bufs->v[color] + lineoffs->v[color], buf, nbytes); @@ -1582,10 +1625,23 @@ stp_write_weave(stp_vars_t *v, unsigned char *const cols[]) int cpass = sw->current_vertical_subpass * h_passes; if (!sw->fold_buf) - sw->fold_buf = stp_zalloc(sw->bitwidth * ylength); + { + stp_dprintf(STP_DBG_WEAVE_PARAMS, v, + "fold buffer allocation: length %d lw %d weave %d xlength %d ylength %d\n", + length, sw->linewidth, sw->horizontal_weave, xlength, ylength); + stp_dprintf(STP_DBG_WEAVE_PARAMS, v, + "Allocating fold buf %d * %d (%d)\n", ylength, sw->bitwidth, + sw->bitwidth * ylength); + sw->fold_buf = stp_zalloc(sw->bitwidth * ylength); + } if (!sw->comp_buf) - sw->comp_buf = stp_zalloc(sw->bitwidth * - (sw->compute_linewidth)(v,ylength)); + { + stp_dprintf(STP_DBG_WEAVE_PARAMS, v, + "Allocating compression buffer based on %d, %d\n", + sw->bitwidth, ylength); + sw->comp_buf = stp_zalloc(sw->bitwidth * + (sw->compute_linewidth)(v,ylength)); + } if (sw->current_vertical_subpass == 0) initialize_row(v, sw, sw->lineno, xlength, cols); @@ -1622,47 +1678,15 @@ stp_write_weave(stp_vars_t *v, unsigned char *const cols[]) } else in = cols[j]; - switch (sw->horizontal_weave) - { - case 1: - memcpy(sw->s[0], in, length * sw->bitwidth); - break; - case 2: - stp_unpack_2(length, sw->bitwidth, in, sw->s[0], sw->s[1]); - break; - case 4: - stp_unpack_4(length, sw->bitwidth, in, - sw->s[0], sw->s[1], sw->s[2], sw->s[3]); - break; - case 8: - stp_unpack_8(length, sw->bitwidth, in, - sw->s[0], sw->s[1], sw->s[2], sw->s[3], - sw->s[4], sw->s[5], sw->s[6], sw->s[7]); - break; - case 16: - stp_unpack_16(length, sw->bitwidth, in, - sw->s[0], sw->s[1], sw->s[2], sw->s[3], - sw->s[4], sw->s[5], sw->s[6], sw->s[7], - sw->s[8], sw->s[9], sw->s[10], sw->s[11], - sw->s[12], sw->s[13], sw->s[14], sw->s[15]); - break; - } - switch (sw->vertical_subpasses) + if (sw->horizontal_weave == 1) + memcpy(sw->s[0], in, length * sw->bitwidth); + else + stp_unpack(length, sw->bitwidth, sw->horizontal_weave, in, sw->s); + if (sw->vertical_subpasses > 1) { - case 4: - for (idx = 0; idx < sw->horizontal_weave; idx++) - stp_split_4(length, sw->bitwidth, sw->s[idx], sw->s[idx], - sw->s[idx + sw->horizontal_weave], - sw->s[idx + sw->horizontal_weave * 2], - sw->s[idx + sw->horizontal_weave * 3]); - break; - case 2: for (idx = 0; idx < sw->horizontal_weave; idx++) - stp_split_2(length, sw->bitwidth, sw->s[idx], sw->s[idx], - sw->s[idx + sw->horizontal_weave]); - break; - /* case 1 is taken care of because the various unpack */ - /* functions will do the trick themselves */ + stp_split(length, sw->bitwidth, sw->vertical_subpasses, + sw->s[idx], sw->horizontal_weave, &(sw->s[idx])); } for (i = 0; i < h_passes; i++) { diff --git a/src/testpattern/Makefile.in b/src/testpattern/Makefile.in index d463d43..fc25c0b 100644 --- a/src/testpattern/Makefile.in +++ b/src/testpattern/Makefile.in @@ -49,11 +49,14 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \ - $(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \ - $(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/stp.m4 \ + $(top_srcdir)/m4/stp_cups.m4 $(top_srcdir)/m4/stp_gimp.m4 \ + $(top_srcdir)/m4/stp_option.m4 $(top_srcdir)/m4/stp_release.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs @@ -127,10 +130,6 @@ CUPS_CFLAGS = @CUPS_CFLAGS@ CUPS_CONFIG = @CUPS_CONFIG@ CUPS_LIBS = @CUPS_LIBS@ CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DB2HTML = @DB2HTML@ DB2PDF = @DB2PDF@ @@ -140,16 +139,15 @@ DEPDIR = @DEPDIR@ DIALOG = @DIALOG@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ DVIPDF = @DVIPDF@ DVIPS = @DVIPS@ -ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ FIND = @FIND@ FOOMATIC_CONFIGURE = @FOOMATIC_CONFIGURE@ FOOMATIC_KITLOAD = @FOOMATIC_KITLOAD@ @@ -194,6 +192,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTLLIBS = @INTLLIBS@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -205,6 +204,7 @@ LIBREADLINE_DEPS = @LIBREADLINE_DEPS@ LIBS = $(INTLLIBS) @LIBS@ LIBTOOL = @LIBTOOL@ LIBTOOL_DEPS = @LIBTOOL_DEPS@ +LIPO = @LIPO@ LN_S = @LN_S@ LTALLOCA = @LTALLOCA@ LTLIBICONV = @LTLIBICONV@ @@ -217,8 +217,12 @@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ +NM = @NM@ NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -252,8 +256,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -298,6 +301,7 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -310,6 +314,7 @@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS) diff --git a/src/testpattern/run-testpattern-2.in b/src/testpattern/run-testpattern-2.in index 3e5b7d9..ecc28d7 100644 --- a/src/testpattern/run-testpattern-2.in +++ b/src/testpattern/run-testpattern-2.in @@ -15,10 +15,11 @@ my $retval = 0; my $testpattern_command; my @printer_list = (); my @special_options = (); -my @standard_options = qw(InkType InkSet DitherAlgorithm Duplex MediaType InputSlot ColorCorrection ImageType FullBleed Quality UseGloss Weave RawChannels PrintingDirection Density CyanDensity); +my @standard_options = qw(InkType InkSet,RawChannels DitherAlgorithm Duplex MediaType InputSlot ColorCorrection ImageType FullBleed Quality UseGloss Weave PrintingDirection Density CyanDensity); my $global_status = 1; my $run_installed = 0; my $use_min_res = 0; +my $help = 0; my $output = undef; my @extras = (); @@ -32,6 +33,7 @@ my %models; my %families; my $skip_duplicate_printers = 0; my $std_pages = 1; +my $duplex_pages = 4; my $skip_resolutions = 0; my $quiet = 0; my $single = 0; @@ -49,6 +51,7 @@ GetOptions("v+" => \$valgrind, "g" => \$gdb_attach, "n" => \$dontrun, "p:i" => \$std_pages, + "P:i" => \$duplex_pages, "s!" => \$skip_duplicate_printers, "S!" => \$single, "i!" => \$run_installed, @@ -60,7 +63,58 @@ GetOptions("v+" => \$valgrind, "O=s" => \$output, "d=s" => \@default_options, "m:s" => \$calc_md5_dir, - "M:s" => \$calc_md5_file); + "M:s" => \$calc_md5_file, + "h" => \$help); + +if ($help) { + my $options = join("\n ", sort @standard_options); + print STDERR <<EOF; +Usage: run-testpattern-2 [opts] [model ...] + + Options: + -c Use callgrind (incompatible with -v) + -f family Test printers only in the specified family. Multiple + families may be tested. By default, all printer families + are tested. + -g Attach testpattern job to gdb + -i Use the installed Gutenprint libraries rather than + source tree + -m md5_dir Generate MD5 checksums and place them in the specified + directory, one file per run. Directory will be created + if necessary. + -M md5_file Generate MD5 checksums and place them in the specified + file, one line per run. + -n Do not actually run testpattern + -O out_dir Generate actual output and place it in the specified + directory, one file per run. Directory will be created + if necessary. + -o option Test this option. Multiple -o options may be specified. + option1,option2 indicates to test each value of option1 + in combination with each value of option2. For floating + point and integer options, a selection of values is + tested. + Default: + $options + -p page count Specify number of pages to print per printer. Default $std_pages. + -P page count Specify number of pages to print per printer when testing + duplex mode. Default $duplex_pages. + -q Do not print progress messages + -r Do not test each resolution (test only the default) + -R Use the minimum resolution (rather than the default) + to test other options. + -RR Use only the minimum resolution, and do not test other + resolutions. + -s Skip duplicate printers (with the same model number + in printers.xml) + -S Run a separate testpattern command for each printer + -v[v[v[v]]] Use valgrind. Number of -v options controls usage: + -v Basic valgrind checking, no leak checking + -vv Additional leak checking + -vvv Show reachable data also + -vvvv Minimal checks only +EOF +exit 1; +} my $pages = $std_pages; @@ -412,10 +466,6 @@ sub do_printer($$) { @job_extras = (); @messages = (); @global_messages = (); - if ($first_time) { - set_global_message("$printer\n"); - $first_time = 0; - } set_opt("PrintingMode", $pmode, $printer); if ($use_min_res) { set_opt("Resolution", $min_res_name, $printer); @@ -426,6 +476,7 @@ sub do_printer($$) { my $k = $subkeys[$_]; my $v = $subopts[$_]; if ($k eq "RawChannels") { + next if ($v ne "None" && $pmode ne "Color"); $rawval = $v; } else { set_opt($k, $v, $printer); @@ -433,15 +484,18 @@ sub do_printer($$) { push @mvals, "${k}_${v}"; push @ovals, "${k}=${v}"; } (0..$#subkeys); + if ($first_time) { + set_global_message("$printer\n"); + $first_time = 0; + } # FIXME! need to handle Duplex as a subkey map { + $pages = $std_pages; if ($key ne $_) { set_opt($_, $base_settings{$_}, $printer); if ($key eq "Duplex") { set_opt("JobMode", "Job", $printer); - $pages = 4; - } else { - $pages = $std_pages; + $pages = $duplex_pages; } } } keys %base_settings; @@ -520,7 +574,7 @@ if ($dontrun) { $suppress = '-n'; } my ($qopt) = $quiet ? "-q" : ""; - $testpattern_command = "$valgrind_command ./testpattern $suppress $qopt"; + $testpattern_command = "$valgrind_command ./testpattern -y $suppress $qopt"; if ($single) { foreach my $printer (@printer_list) { open TESTPATTERN, "|$testpattern_command" or diff --git a/src/testpattern/testpattern.c b/src/testpattern/testpattern.c index 512739d..e27e73d 100644 --- a/src/testpattern/testpattern.c +++ b/src/testpattern/testpattern.c @@ -1,5 +1,5 @@ /* - * "$Id: testpattern.c,v 1.54 2008/07/16 23:59:23 rlk Exp $" + * "$Id: testpattern.c,v 1.57 2009/06/14 17:12:44 rlk Exp $" * * Test pattern generator for Gimp-Print * @@ -92,11 +92,15 @@ int global_did_something; int global_noscale = 0; int global_suppress_output = 0; int global_quiet = 0; +int global_fail_verify_ok = 0; char *global_output = NULL; FILE *output = NULL; int write_to_process = 0; int start_job = 0; int end_job = 0; +int passes = 0; +int failures = 0; +int skipped = 0; static testpattern_t *static_testpatterns; @@ -249,6 +253,7 @@ initialize_global_parameters(void) static int do_print(void) { + int status = 0; stp_vars_t *v; const stp_printer_t *the_printer; int left, right, top, bottom; @@ -421,22 +426,50 @@ do_print(void) stp_set_top(v, top); stp_merge_printvars(v, stp_printer_get_defaults(the_printer)); - if (start_job) + if (stp_verify(v)) { - stp_start_job(v, &theImage); - start_job = 0; + if (start_job) + { + stp_start_job(v, &theImage); + start_job = 0; + } + if (stp_print(v, &theImage) != 1) + { + if (!global_quiet) + fprintf(stderr, "FAILED!"); + failures++; + status = 2; + } + else + passes++; + if (end_job) + { + stp_end_job(v, &theImage); + end_job = 0; + } } - if (stp_print(v, &theImage) != 1) - return 2; - if (end_job) + else { - stp_end_job(v, &theImage); - end_job = 0; + if (! global_fail_verify_ok) + { + if (!global_quiet) + fprintf(stderr, "FAILED!"); + failures++; + status = 2; + } + else + { + if (!global_quiet) + fprintf(stderr, "(skipped)"); + skipped++; + } } + if (!global_quiet) + fprintf(stderr, "\n"); stp_vars_destroy(v); stp_free(static_testpatterns); static_testpatterns = NULL; - return 0; + return status; } int @@ -447,7 +480,7 @@ main(int argc, char **argv) int global_status = 0; while (1) { - c = getopt(argc, argv, "nq"); + c = getopt(argc, argv, "nqy"); if (c == -1) break; switch (c) @@ -458,6 +491,9 @@ main(int argc, char **argv) case 'q': global_quiet = 1; break; + case 'y': + global_fail_verify_ok = 1; + break; default: break; } @@ -474,6 +510,8 @@ main(int argc, char **argv) global_status = 1; } close_output(); + if (!global_quiet) + fprintf(stderr, "%d pass, %d fail, %d skipped\n", passes, failures, skipped); return global_status; } @@ -1134,8 +1172,6 @@ Image_conclude(stp_image_t *image) abort(); } Image_is_valid = 0; - if (!global_quiet) - fprintf(stderr, "\n"); } static const char * diff --git a/src/testpattern/testpatternl.c b/src/testpattern/testpatternl.c index 167b521..a3d8dd5 100644 --- a/src/testpattern/testpatternl.c +++ b/src/testpattern/testpatternl.c @@ -8,7 +8,7 @@ #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 #define YY_FLEX_MINOR_VERSION 5 -#define YY_FLEX_SUBMINOR_VERSION 33 +#define YY_FLEX_SUBMINOR_VERSION 35 #if YY_FLEX_SUBMINOR_VERSION > 0 #define FLEX_BETA #endif @@ -30,7 +30,7 @@ /* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */ -#if __STDC_VERSION__ >= 199901L +#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L /* C99 says to define __STDC_LIMIT_MACROS before including stdint.h, * if you want the limit (max/min) macros for int types. @@ -93,11 +93,12 @@ typedef unsigned int flex_uint32_t; #else /* ! __cplusplus */ -#if __STDC__ +/* C99 requires __STDC__ to be defined as 1. */ +#if defined (__STDC__) #define YY_USE_CONST -#endif /* __STDC__ */ +#endif /* defined (__STDC__) */ #endif /* ! __cplusplus */ #ifdef YY_USE_CONST @@ -177,14 +178,9 @@ extern FILE *yyin, *yyout; #define unput(c) yyunput( c, (yytext_ptr) ) -/* The following is because we cannot portably get our hands on size_t - * (without autoconf's help, which isn't available because we want - * flex-generated scanners to compile on their own). - */ - #ifndef YY_TYPEDEF_YY_SIZE_T #define YY_TYPEDEF_YY_SIZE_T -typedef unsigned int yy_size_t; +typedef size_t yy_size_t; #endif #ifndef YY_STRUCT_YY_BUFFER_STATE @@ -343,6 +339,9 @@ FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0; typedef int yy_state_type; extern int yylineno; + +int yylineno = 1; + extern char *yytext; #define yytext_ptr yytext @@ -361,8 +360,8 @@ static void yy_fatal_error (yyconst char msg[] ); *yy_cp = '\0'; \ (yy_c_buf_p) = yy_cp; -#define YY_NUM_RULES 54 -#define YY_END_OF_BUFFER 55 +#define YY_NUM_RULES 47 +#define YY_END_OF_BUFFER 48 /* This struct is not used in this scanner, but its presence is necessary. */ struct yy_trans_info @@ -370,37 +369,37 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static yyconst flex_int16_t yy_accept[264] = +static yyconst flex_int16_t yy_accept[268] = { 0, - 0, 0, 55, 54, 51, 53, 54, 52, 54, 54, - 48, 48, 33, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 51, 0, 52, 0, 50, 48, - 50, 0, 48, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 0, 49, 0, 50, 49, - 48, 50, 50, 38, 50, 50, 50, 47, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 37, 50, 50, 21, 50, 50, 50, 50, 49, - 50, 50, 35, 1, 50, 50, 50, 50, 50, 40, - 39, 30, 50, 50, 50, 36, 50, 50, 50, 22, - 50, 50, 50, 34, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 7, 50, 50, 50, - 50, 50, 9, 23, 28, 50, 50, 50, 50, 10, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 11, - 24, 41, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 2, 50, 50, 50, 50, 42, 50, 50, - - 50, 50, 50, 50, 5, 50, 31, 50, 20, 46, - 50, 50, 8, 50, 3, 43, 44, 50, 50, 26, - 13, 50, 50, 50, 6, 29, 50, 50, 50, 50, - 50, 27, 25, 12, 4, 32, 14, 45, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 15, 50, 16, 50, 50, 50, 19, 18, - 50, 17, 0 + 0, 0, 48, 47, 44, 46, 47, 45, 47, 47, + 41, 41, 25, 43, 43, 43, 43, 43, 43, 43, + 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, + 43, 43, 43, 43, 44, 0, 43, 45, 0, 41, + 41, 43, 0, 41, 42, 43, 43, 41, 43, 43, + 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, + 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, + 43, 43, 43, 43, 43, 43, 43, 43, 42, 0, + 41, 42, 0, 43, 42, 41, 43, 43, 30, 43, + 43, 43, 39, 43, 43, 43, 43, 43, 43, 43, + + 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, + 43, 43, 43, 43, 43, 43, 43, 43, 29, 43, + 43, 13, 43, 43, 43, 43, 42, 43, 43, 27, + 40, 43, 43, 43, 43, 43, 32, 31, 22, 43, + 43, 43, 28, 14, 43, 43, 43, 43, 43, 26, + 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, + 43, 43, 40, 43, 43, 43, 43, 43, 1, 15, + 20, 43, 2, 43, 43, 43, 43, 43, 43, 43, + 43, 43, 43, 43, 3, 16, 33, 43, 43, 43, + 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, + + 43, 34, 43, 43, 43, 43, 43, 43, 40, 43, + 23, 12, 43, 38, 43, 43, 40, 43, 40, 35, + 36, 43, 43, 18, 5, 43, 43, 43, 40, 21, + 43, 43, 43, 43, 43, 19, 17, 4, 40, 24, + 6, 37, 43, 43, 43, 43, 43, 43, 43, 43, + 43, 43, 43, 43, 43, 43, 7, 43, 8, 43, + 43, 43, 11, 10, 43, 9, 0 } ; static yyconst flex_int32_t yy_ec[256] = @@ -410,15 +409,15 @@ static yyconst flex_int32_t yy_ec[256] = 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 4, 5, 1, 1, 1, 6, 1, 1, 1, 7, 1, 8, 9, 1, 10, 11, 11, - 11, 11, 11, 11, 11, 11, 11, 1, 12, 1, + 11, 11, 11, 11, 11, 12, 12, 1, 13, 1, 1, 1, 1, 1, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, - 1, 1, 1, 1, 13, 1, 14, 15, 16, 17, + 1, 1, 1, 1, 40, 1, 41, 42, 43, 44, - 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, - 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, - 38, 39, 1, 1, 1, 1, 1, 1, 1, 1, + 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, + 55, 56, 30, 57, 58, 59, 60, 61, 62, 63, + 64, 65, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -435,214 +434,291 @@ static yyconst flex_int32_t yy_ec[256] = 1, 1, 1, 1, 1 } ; -static yyconst flex_int32_t yy_meta[40] = +static yyconst flex_int32_t yy_meta[66] = { 0, - 1, 1, 2, 3, 1, 1, 1, 4, 4, 4, - 4, 1, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4 + 1, 1, 2, 1, 1, 1, 1, 3, 3, 3, + 3, 3, 1, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3 } ; -static yyconst flex_int16_t yy_base[268] = +static yyconst flex_int16_t yy_base[272] = { 0, - 0, 0, 547, 548, 544, 548, 0, 0, 539, 30, - 33, 36, 548, 535, 39, 40, 44, 46, 49, 43, - 41, 56, 68, 70, 62, 51, 60, 67, 73, 80, - 83, 84, 85, 86, 541, 538, 0, 535, 548, 91, - 531, 86, 101, 113, 107, 116, 117, 90, 118, 98, - 120, 124, 104, 125, 126, 130, 129, 133, 136, 140, - 141, 144, 137, 150, 145, 149, 152, 156, 159, 161, - 162, 164, 171, 175, 172, 188, 190, 177, 193, 196, - 200, 203, 204, 205, 206, 207, 185, 209, 212, 211, - 154, 214, 215, 217, 218, 226, 219, 225, 227, 231, - - 233, 235, 237, 232, 240, 238, 234, 242, 253, 239, - 250, 530, 252, 259, 529, 260, 261, 262, 264, 264, - 267, 269, 528, 527, 272, 270, 275, 273, 271, 526, - 525, 524, 284, 292, 278, 523, 295, 297, 296, 522, - 298, 281, 303, 521, 304, 305, 306, 311, 312, 313, - 315, 317, 316, 318, 319, 322, 320, 323, 326, 324, - 331, 338, 520, 519, 518, 334, 344, 335, 345, 517, - 333, 349, 352, 355, 358, 356, 361, 362, 359, 516, - 515, 514, 364, 366, 367, 369, 370, 372, 376, 375, - 374, 377, 513, 378, 390, 388, 394, 512, 386, 387, - - 398, 400, 404, 402, 511, 405, 510, 406, 503, 500, - 407, 408, 495, 410, 494, 493, 492, 409, 417, 491, - 489, 412, 414, 419, 488, 487, 413, 420, 427, 429, - 435, 486, 485, 484, 483, 482, 438, 457, 452, 430, - 443, 440, 445, 446, 447, 450, 448, 453, 454, 444, - 455, 464, 329, 461, 277, 471, 473, 478, 181, 94, - 479, 50, 548, 506, 510, 514, 52 + 0, 0, 824, 843, 821, 843, 818, 0, 815, 56, + 60, 64, 843, 810, 68, 74, 70, 71, 72, 75, + 90, 76, 112, 117, 109, 80, 132, 81, 115, 123, + 127, 133, 138, 147, 816, 812, 843, 0, 809, 159, + 187, 801, 172, 191, 201, 213, 238, 217, 146, 152, + 170, 166, 179, 177, 221, 181, 233, 249, 242, 252, + 167, 234, 266, 319, 268, 260, 228, 264, 267, 290, + 280, 288, 295, 296, 297, 302, 324, 307, 357, 366, + 370, 374, 331, 344, 384, 0, 354, 378, 380, 381, + 382, 389, 230, 391, 305, 390, 392, 394, 403, 397, + + 299, 401, 404, 407, 418, 409, 308, 412, 415, 432, + 413, 437, 442, 420, 439, 450, 453, 452, 799, 457, + 460, 796, 458, 463, 465, 469, 489, 466, 478, 786, + 782, 471, 483, 486, 498, 501, 763, 754, 738, 493, + 495, 494, 708, 684, 509, 517, 518, 520, 530, 639, + 534, 519, 528, 536, 532, 521, 540, 546, 547, 548, + 550, 542, 560, 558, 554, 563, 572, 573, 627, 555, + 474, 585, 472, 575, 577, 586, 596, 589, 587, 592, + 612, 597, 613, 599, 414, 411, 355, 614, 601, 616, + 617, 602, 624, 638, 626, 642, 640, 646, 647, 658, + + 663, 351, 653, 661, 665, 668, 673, 669, 341, 674, + 311, 298, 675, 286, 680, 664, 269, 689, 265, 259, + 235, 676, 698, 222, 208, 681, 695, 703, 207, 186, + 697, 709, 720, 722, 725, 144, 141, 140, 130, 102, + 705, 97, 771, 718, 701, 730, 735, 733, 741, 743, + 742, 745, 750, 759, 748, 785, 95, 749, 93, 767, + 768, 779, 87, 85, 755, 82, 843, 833, 836, 839, + 84 } ; -static yyconst flex_int16_t yy_def[268] = +static yyconst flex_int16_t yy_def[272] = { 0, - 263, 1, 263, 263, 263, 263, 264, 265, 266, 263, - 267, 267, 263, 267, 267, 267, 267, 267, 267, 267, - 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, - 267, 267, 267, 267, 263, 264, 265, 266, 263, 263, - 267, 263, 267, 267, 267, 267, 267, 267, 267, 267, - 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, - 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, - 267, 267, 267, 267, 267, 263, 263, 263, 267, 267, - 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, - 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, - - 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, - 267, 267, 267, 267, 267, 267, 267, 267, 267, 263, - 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, - 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, - 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, - 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, - 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, - 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, - 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, - 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, + 267, 1, 267, 267, 267, 267, 268, 269, 270, 267, + 271, 271, 267, 271, 271, 271, 271, 271, 271, 271, + 271, 271, 271, 271, 271, 271, 271, 271, 271, 271, + 271, 271, 271, 271, 267, 268, 267, 269, 270, 267, + 267, 271, 267, 271, 271, 271, 271, 271, 271, 271, + 271, 271, 271, 271, 271, 271, 271, 271, 271, 271, + 271, 271, 271, 271, 271, 271, 271, 271, 271, 271, + 271, 271, 271, 271, 271, 271, 271, 271, 267, 267, + 267, 267, 267, 271, 271, 47, 271, 271, 271, 271, + 271, 271, 271, 271, 271, 271, 271, 271, 271, 271, + + 271, 271, 271, 271, 271, 271, 271, 271, 271, 271, + 271, 271, 271, 271, 271, 271, 271, 271, 271, 271, + 271, 271, 271, 271, 271, 271, 267, 271, 271, 271, + 271, 271, 271, 271, 271, 271, 271, 271, 271, 271, + 271, 271, 271, 271, 271, 271, 271, 271, 271, 271, + 271, 271, 271, 271, 271, 271, 271, 271, 271, 271, + 271, 271, 271, 271, 271, 271, 271, 271, 271, 271, + 271, 271, 271, 271, 271, 271, 271, 271, 271, 271, + 271, 271, 271, 271, 271, 271, 271, 271, 271, 271, + 271, 271, 271, 271, 271, 271, 271, 271, 271, 271, + + 271, 271, 271, 271, 271, 271, 271, 271, 271, 271, + 271, 271, 271, 271, 271, 271, 271, 271, 271, 271, + 271, 271, 271, 271, 271, 271, 271, 271, 271, 271, + 271, 271, 271, 271, 271, 271, 271, 271, 271, 271, + 271, 271, 271, 271, 271, 271, 271, 271, 271, 271, + 271, 271, 271, 271, 271, 271, 271, 271, 271, 271, + 271, 271, 271, 271, 271, 271, 0, 267, 267, 267, + 267 + } ; +static yyconst flex_int16_t yy_nxt[909] = + { 0, + 4, 5, 6, 7, 8, 9, 10, 10, 4, 11, + 12, 12, 13, 14, 15, 16, 17, 18, 14, 19, + 20, 21, 14, 22, 23, 24, 25, 26, 27, 14, + 28, 29, 30, 14, 31, 32, 33, 34, 14, 14, + 14, 15, 16, 17, 18, 14, 19, 20, 21, 14, + 22, 23, 24, 25, 26, 27, 28, 29, 30, 14, + 31, 32, 33, 34, 14, 40, 41, 41, 43, 44, + 44, 45, 43, 48, 48, 48, 267, 46, 267, 267, + 267, 46, 267, 267, 267, 57, 42, 53, 267, 267, + 267, 62, 49, 267, 50, 267, 47, 55, 267, 51, + + 72, 267, 58, 267, 46, 267, 59, 56, 46, 54, + 267, 52, 57, 69, 53, 60, 61, 267, 62, 49, + 267, 50, 47, 267, 55, 267, 51, 72, 58, 63, + 65, 267, 59, 56, 66, 267, 68, 52, 267, 69, + 267, 267, 60, 61, 67, 70, 267, 73, 267, 267, + 74, 64, 267, 76, 267, 267, 63, 65, 75, 87, + 267, 66, 71, 68, 78, 88, 77, 43, 79, 79, + 79, 67, 70, 73, 267, 267, 80, 74, 267, 90, + 76, 82, 82, 82, 75, 267, 87, 267, 71, 267, + 101, 78, 88, 77, 267, 43, 81, 81, 81, 43, + + 44, 44, 45, 80, 80, 91, 90, 89, 46, 43, + 45, 45, 45, 94, 92, 267, 267, 101, 46, 83, + 84, 267, 85, 85, 85, 43, 48, 48, 48, 267, + 267, 80, 91, 89, 46, 46, 267, 93, 267, 94, + 92, 267, 267, 267, 112, 46, 267, 86, 86, 86, + 267, 86, 86, 86, 86, 86, 86, 267, 95, 102, + 267, 46, 96, 99, 93, 100, 97, 267, 267, 134, + 98, 112, 267, 267, 267, 267, 267, 267, 86, 86, + 86, 86, 86, 86, 103, 95, 102, 110, 267, 96, + 99, 111, 100, 97, 267, 113, 267, 98, 267, 114, + + 104, 118, 119, 267, 267, 267, 267, 267, 120, 115, + 267, 103, 121, 267, 110, 267, 267, 111, 123, 267, + 116, 113, 117, 124, 122, 114, 104, 267, 118, 119, + 136, 126, 267, 105, 106, 120, 115, 125, 142, 121, + 127, 127, 127, 107, 108, 123, 116, 147, 117, 267, + 124, 122, 267, 85, 85, 85, 109, 136, 126, 267, + 105, 106, 267, 267, 125, 43, 79, 79, 79, 128, + 107, 108, 83, 83, 80, 127, 127, 127, 43, 81, + 81, 81, 109, 82, 82, 82, 267, 80, 267, 267, + 267, 80, 267, 85, 85, 85, 128, 267, 267, 267, + + 267, 80, 267, 130, 129, 267, 133, 131, 135, 267, + 139, 267, 267, 132, 80, 267, 141, 267, 80, 267, + 267, 267, 267, 267, 145, 65, 267, 137, 267, 138, + 130, 129, 78, 133, 131, 135, 144, 139, 143, 132, + 267, 140, 146, 141, 149, 267, 52, 267, 152, 148, + 267, 145, 65, 137, 150, 138, 153, 151, 267, 78, + 267, 267, 144, 154, 143, 267, 267, 140, 267, 146, + 149, 267, 52, 267, 267, 152, 148, 267, 156, 267, + 267, 150, 267, 153, 151, 155, 267, 157, 158, 163, + 154, 267, 165, 162, 267, 160, 159, 161, 127, 127, + + 127, 267, 267, 267, 164, 156, 267, 166, 167, 267, + 170, 155, 171, 157, 169, 158, 163, 267, 172, 165, + 162, 160, 159, 161, 168, 267, 267, 267, 267, 267, + 174, 164, 175, 173, 166, 167, 267, 170, 267, 171, + 267, 169, 267, 177, 267, 172, 176, 178, 267, 182, + 267, 168, 179, 183, 267, 267, 267, 174, 267, 175, + 173, 181, 267, 267, 186, 187, 267, 180, 267, 189, + 177, 267, 184, 176, 178, 191, 182, 185, 179, 183, + 267, 267, 188, 267, 190, 267, 192, 193, 181, 195, + 197, 186, 187, 267, 267, 267, 189, 267, 184, 194, + + 267, 198, 191, 185, 267, 267, 196, 267, 188, 267, + 267, 190, 192, 201, 193, 200, 195, 197, 199, 202, + 267, 267, 267, 203, 267, 267, 194, 205, 198, 204, + 206, 208, 267, 196, 267, 267, 209, 210, 207, 212, + 201, 211, 200, 215, 199, 202, 267, 267, 267, 203, + 267, 213, 214, 205, 267, 267, 204, 206, 208, 218, + 219, 267, 209, 217, 210, 212, 267, 216, 211, 267, + 215, 267, 267, 267, 222, 220, 267, 267, 213, 214, + 221, 267, 267, 267, 267, 231, 218, 219, 267, 267, + 217, 224, 267, 223, 216, 226, 230, 267, 225, 227, + + 228, 222, 220, 267, 232, 267, 267, 221, 235, 267, + 229, 267, 231, 267, 233, 234, 267, 267, 224, 223, + 237, 236, 226, 230, 225, 227, 267, 228, 267, 238, + 267, 232, 239, 267, 250, 235, 229, 240, 267, 242, + 233, 267, 234, 267, 243, 249, 267, 237, 236, 267, + 267, 267, 241, 267, 251, 238, 267, 267, 267, 239, + 250, 252, 267, 267, 240, 253, 242, 267, 254, 256, + 262, 267, 249, 255, 266, 267, 267, 257, 241, 267, + 258, 251, 260, 259, 263, 244, 245, 267, 252, 246, + 267, 253, 247, 267, 267, 254, 256, 262, 261, 255, + + 264, 266, 248, 257, 267, 265, 258, 267, 260, 267, + 259, 263, 244, 245, 37, 37, 246, 35, 267, 247, + 37, 37, 35, 267, 267, 261, 264, 267, 248, 267, + 267, 267, 265, 36, 36, 36, 38, 267, 38, 39, + 39, 39, 3, 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, - 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, - 267, 267, 0, 263, 263, 263, 263 - } ; -static yyconst flex_int16_t yy_nxt[588] = - { 0, - 4, 5, 6, 7, 8, 9, 10, 10, 4, 11, - 12, 13, 14, 14, 15, 16, 17, 18, 14, 19, - 20, 21, 14, 22, 23, 24, 25, 26, 27, 14, - 28, 29, 30, 14, 31, 32, 33, 34, 14, 40, - 40, 42, 43, 43, 42, 43, 43, 263, 263, 263, - 44, 263, 263, 44, 263, 41, 50, 263, 263, 263, - 47, 51, 54, 46, 263, 48, 57, 58, 263, 45, - 263, 59, 52, 67, 56, 263, 263, 49, 263, 55, - 60, 263, 53, 62, 66, 61, 69, 63, 263, 65, - 68, 263, 263, 263, 263, 77, 77, 64, 263, 42, - - 40, 40, 263, 75, 73, 70, 263, 71, 76, 42, - 43, 43, 263, 74, 72, 263, 81, 81, 44, 78, - 79, 263, 80, 80, 263, 263, 263, 84, 263, 82, - 83, 85, 263, 263, 263, 86, 89, 263, 263, 91, - 88, 263, 95, 92, 263, 263, 87, 93, 263, 263, - 90, 94, 263, 263, 98, 99, 96, 263, 263, 101, - 263, 97, 263, 103, 263, 100, 105, 263, 104, 263, - 263, 108, 263, 112, 113, 102, 106, 111, 114, 263, - 263, 107, 109, 263, 110, 116, 120, 120, 118, 263, - 115, 130, 117, 263, 78, 78, 119, 120, 120, 77, - - 77, 263, 80, 80, 263, 80, 80, 76, 263, 81, - 81, 263, 263, 263, 263, 263, 126, 263, 121, 263, - 263, 127, 263, 263, 125, 263, 263, 263, 123, 128, - 122, 132, 124, 263, 263, 263, 129, 134, 135, 263, - 263, 263, 263, 263, 139, 263, 263, 263, 263, 137, - 263, 131, 141, 145, 142, 133, 136, 144, 263, 147, - 263, 263, 146, 143, 138, 140, 148, 263, 263, 263, - 263, 149, 263, 120, 120, 263, 150, 263, 263, 263, - 263, 263, 151, 263, 163, 263, 263, 152, 156, 263, - 157, 160, 263, 154, 155, 158, 159, 161, 153, 162, - - 263, 164, 166, 263, 263, 263, 263, 171, 167, 165, - 168, 263, 263, 263, 263, 169, 172, 173, 175, 263, - 263, 263, 170, 263, 263, 263, 263, 263, 263, 177, - 263, 263, 263, 181, 263, 182, 176, 263, 174, 263, - 186, 263, 263, 263, 185, 178, 263, 179, 180, 184, - 187, 183, 263, 263, 190, 191, 188, 263, 189, 192, - 263, 193, 194, 263, 263, 195, 263, 263, 196, 263, - 263, 203, 263, 200, 263, 263, 197, 263, 263, 202, - 263, 204, 263, 263, 263, 263, 263, 198, 206, 199, - 210, 201, 211, 207, 263, 263, 263, 208, 263, 212, - - 213, 205, 263, 215, 214, 216, 263, 218, 263, 209, - 263, 217, 263, 263, 263, 263, 263, 263, 263, 219, - 263, 263, 263, 226, 220, 263, 222, 263, 263, 227, - 221, 224, 223, 235, 230, 263, 233, 263, 263, 231, - 232, 225, 228, 263, 236, 234, 263, 229, 263, 238, - 239, 263, 263, 263, 263, 263, 263, 245, 263, 237, - 263, 263, 263, 263, 247, 263, 240, 241, 255, 263, - 242, 248, 263, 243, 250, 252, 246, 257, 249, 263, - 251, 263, 258, 244, 254, 253, 263, 263, 259, 256, - 263, 263, 263, 263, 263, 263, 263, 263, 262, 263, - - 263, 263, 263, 263, 261, 260, 36, 36, 263, 36, - 37, 263, 37, 37, 38, 38, 38, 38, 263, 263, - 263, 263, 263, 263, 263, 263, 263, 263, 263, 263, - 263, 263, 263, 263, 263, 263, 263, 263, 263, 263, - 39, 39, 35, 263, 39, 35, 263, 3, 263, 263, - 263, 263, 263, 263, 263, 263, 263, 263, 263, 263, - 263, 263, 263, 263, 263, 263, 263, 263, 263, 263, - 263, 263, 263, 263, 263, 263, 263, 263, 263, 263, - 263, 263, 263, 263, 263, 263, 263 + 267, 267, 267, 267, 267, 267, 267, 267 } ; -static yyconst flex_int16_t yy_chk[588] = +static yyconst flex_int16_t yy_chk[909] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 10, - 10, 11, 11, 11, 12, 12, 12, 15, 16, 21, - 11, 20, 17, 12, 18, 267, 17, 19, 262, 26, - 16, 17, 19, 15, 22, 16, 21, 21, 27, 11, - 25, 22, 18, 27, 20, 28, 23, 16, 24, 19, - 23, 29, 18, 24, 26, 23, 28, 24, 30, 25, - 27, 31, 32, 33, 34, 42, 42, 24, 48, 40, - - 40, 40, 260, 34, 32, 29, 50, 30, 40, 43, - 43, 43, 53, 33, 31, 45, 45, 45, 43, 44, - 44, 44, 44, 44, 46, 47, 49, 48, 51, 46, - 47, 49, 52, 54, 55, 50, 53, 57, 56, 55, - 52, 58, 57, 55, 59, 63, 51, 55, 60, 61, - 54, 56, 62, 65, 60, 60, 58, 66, 64, 61, - 67, 59, 91, 62, 68, 60, 64, 69, 63, 70, - 71, 67, 72, 69, 70, 61, 65, 68, 70, 73, - 75, 66, 67, 74, 67, 72, 78, 78, 74, 259, - 71, 91, 73, 87, 76, 76, 75, 76, 76, 77, - - 77, 79, 79, 79, 80, 80, 80, 77, 81, 81, - 81, 82, 83, 84, 85, 86, 87, 88, 82, 90, - 89, 88, 92, 93, 86, 94, 95, 97, 84, 89, - 83, 93, 85, 98, 96, 99, 90, 95, 96, 100, - 104, 101, 107, 102, 100, 103, 106, 110, 105, 98, - 108, 92, 102, 106, 103, 94, 97, 105, 111, 108, - 113, 109, 107, 104, 99, 101, 109, 114, 116, 117, - 118, 110, 119, 120, 120, 121, 111, 122, 126, 129, - 125, 128, 113, 127, 129, 255, 135, 114, 119, 142, - 121, 126, 133, 117, 118, 122, 125, 127, 116, 128, - - 134, 133, 135, 137, 139, 138, 141, 142, 137, 134, - 138, 143, 145, 146, 147, 139, 143, 145, 147, 148, - 149, 150, 141, 151, 153, 152, 154, 155, 157, 149, - 156, 158, 160, 153, 159, 154, 148, 253, 146, 161, - 158, 171, 166, 168, 157, 150, 162, 151, 152, 156, - 159, 155, 167, 169, 162, 166, 160, 172, 161, 167, - 173, 168, 169, 174, 176, 171, 175, 179, 172, 177, - 178, 179, 183, 176, 184, 185, 173, 186, 187, 178, - 188, 183, 191, 190, 189, 192, 194, 174, 185, 175, - 189, 177, 190, 186, 199, 200, 196, 187, 195, 191, - - 192, 184, 197, 195, 194, 196, 201, 199, 202, 188, - 204, 197, 203, 206, 208, 211, 212, 218, 214, 200, - 222, 227, 223, 211, 201, 219, 203, 224, 228, 212, - 202, 206, 204, 228, 219, 229, 224, 230, 240, 222, - 223, 208, 214, 231, 229, 227, 237, 218, 242, 231, - 237, 241, 250, 243, 244, 245, 247, 240, 246, 230, - 239, 248, 249, 251, 242, 238, 239, 239, 250, 254, - 239, 243, 252, 239, 245, 247, 241, 252, 244, 256, - 246, 257, 254, 239, 249, 248, 258, 261, 256, 251, - 236, 235, 234, 233, 232, 226, 225, 221, 261, 220, - - 217, 216, 215, 213, 258, 257, 264, 264, 210, 264, - 265, 209, 265, 265, 266, 266, 266, 266, 207, 205, - 198, 193, 182, 181, 180, 170, 165, 164, 163, 144, - 140, 136, 132, 131, 130, 124, 123, 115, 112, 41, - 38, 36, 35, 14, 9, 5, 3, 263, 263, 263, - 263, 263, 263, 263, 263, 263, 263, 263, 263, 263, - 263, 263, 263, 263, 263, 263, 263, 263, 263, 263, - 263, 263, 263, 263, 263, 263, 263, 263, 263, 263, - 263, 263, 263, 263, 263, 263, 263 + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 10, 10, 10, 11, 11, + 11, 11, 12, 12, 12, 12, 15, 11, 17, 18, + 19, 12, 16, 20, 22, 19, 271, 17, 26, 28, + 266, 22, 15, 264, 16, 263, 11, 18, 21, 16, + + 28, 259, 19, 257, 11, 242, 20, 18, 12, 17, + 240, 16, 19, 26, 17, 21, 21, 25, 22, 15, + 23, 16, 11, 29, 18, 24, 16, 28, 19, 23, + 24, 30, 20, 18, 24, 31, 25, 16, 239, 26, + 27, 32, 21, 21, 24, 27, 33, 29, 238, 237, + 30, 23, 236, 32, 49, 34, 23, 24, 31, 49, + 50, 24, 27, 25, 34, 50, 33, 40, 40, 40, + 40, 24, 27, 29, 52, 61, 40, 30, 51, 52, + 32, 43, 43, 43, 31, 54, 49, 53, 27, 56, + 61, 34, 50, 33, 230, 41, 41, 41, 41, 44, + + 44, 44, 44, 40, 41, 53, 52, 51, 44, 45, + 45, 45, 45, 56, 54, 229, 225, 61, 45, 46, + 46, 46, 46, 46, 46, 48, 48, 48, 48, 55, + 224, 41, 53, 51, 48, 44, 67, 55, 93, 56, + 54, 57, 62, 221, 67, 45, 47, 47, 47, 47, + 59, 47, 47, 47, 47, 47, 47, 58, 57, 62, + 60, 48, 58, 59, 55, 60, 58, 220, 66, 93, + 58, 67, 68, 219, 63, 69, 65, 217, 47, 47, + 47, 47, 47, 47, 63, 57, 62, 65, 71, 58, + 59, 66, 60, 58, 214, 68, 72, 58, 70, 69, + + 63, 71, 72, 73, 74, 75, 212, 101, 73, 70, + 76, 63, 73, 95, 65, 78, 107, 66, 75, 211, + 70, 68, 70, 76, 74, 69, 63, 64, 71, 72, + 95, 78, 77, 64, 64, 73, 70, 77, 101, 73, + 83, 83, 83, 64, 64, 75, 70, 107, 70, 209, + 76, 74, 84, 84, 84, 84, 64, 95, 78, 202, + 64, 64, 87, 187, 77, 79, 79, 79, 79, 87, + 64, 64, 80, 80, 79, 80, 80, 80, 81, 81, + 81, 81, 64, 82, 82, 82, 88, 81, 89, 90, + 91, 82, 85, 85, 85, 85, 87, 92, 96, 94, + + 97, 79, 98, 89, 88, 100, 92, 90, 94, 102, + 98, 99, 103, 91, 81, 104, 100, 106, 82, 186, + 108, 111, 185, 109, 104, 108, 105, 96, 114, 97, + 89, 88, 109, 92, 90, 94, 103, 98, 102, 91, + 110, 99, 105, 100, 111, 112, 106, 115, 114, 110, + 113, 104, 108, 96, 112, 97, 115, 113, 116, 109, + 118, 117, 103, 116, 102, 120, 123, 99, 121, 105, + 111, 124, 106, 125, 128, 114, 110, 126, 118, 132, + 173, 112, 171, 115, 113, 117, 129, 120, 121, 128, + 116, 133, 132, 126, 134, 124, 123, 125, 127, 127, + + 127, 140, 142, 141, 129, 118, 135, 133, 134, 136, + 140, 117, 141, 120, 136, 121, 128, 145, 142, 132, + 126, 124, 123, 125, 135, 146, 147, 152, 148, 156, + 146, 129, 147, 145, 133, 134, 153, 140, 149, 141, + 155, 136, 151, 149, 154, 142, 148, 151, 157, 155, + 162, 135, 152, 156, 158, 159, 160, 146, 161, 147, + 145, 154, 165, 170, 159, 160, 164, 153, 163, 162, + 149, 166, 157, 148, 151, 164, 155, 158, 152, 156, + 167, 168, 161, 174, 163, 175, 165, 166, 154, 168, + 174, 159, 160, 172, 176, 179, 162, 178, 157, 167, + + 180, 175, 164, 158, 177, 182, 172, 184, 161, 189, + 192, 163, 165, 178, 166, 177, 168, 174, 176, 179, + 181, 183, 188, 180, 190, 191, 167, 182, 175, 181, + 183, 188, 193, 172, 195, 169, 189, 190, 184, 192, + 178, 191, 177, 195, 176, 179, 194, 150, 197, 180, + 196, 193, 194, 182, 198, 199, 181, 183, 188, 198, + 199, 203, 189, 197, 190, 192, 200, 196, 191, 204, + 195, 201, 216, 205, 203, 200, 206, 208, 193, 194, + 201, 207, 210, 213, 222, 216, 198, 199, 215, 226, + 197, 205, 144, 204, 196, 207, 215, 218, 206, 208, + + 210, 203, 200, 227, 218, 231, 223, 201, 226, 245, + 213, 228, 216, 241, 222, 223, 143, 232, 205, 204, + 228, 227, 207, 215, 206, 208, 244, 210, 233, 231, + 234, 218, 232, 235, 245, 226, 213, 233, 246, 235, + 222, 248, 223, 247, 241, 244, 139, 228, 227, 249, + 251, 250, 234, 252, 246, 231, 255, 258, 253, 232, + 245, 247, 138, 265, 233, 248, 235, 254, 249, 251, + 258, 137, 244, 250, 265, 260, 261, 252, 234, 243, + 253, 246, 255, 254, 260, 243, 243, 262, 247, 243, + 131, 248, 243, 256, 130, 249, 251, 258, 256, 250, + + 261, 265, 243, 252, 122, 262, 253, 119, 255, 42, + 254, 260, 243, 243, 39, 36, 243, 35, 14, 243, + 9, 7, 5, 3, 0, 256, 261, 0, 243, 0, + 0, 0, 262, 268, 268, 268, 269, 0, 269, 270, + 270, 270, 267, 267, 267, 267, 267, 267, 267, 267, + 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, + 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, + 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, + 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, + 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, + + 267, 267, 267, 267, 267, 267, 267, 267 } ; static yy_state_type yy_last_accepting_state; @@ -661,7 +737,7 @@ int yy_flex_debug = 0; char *yytext; #line 1 "testpatternl.l" /* - * "$Id: testpatternl.l,v 1.22 2008/06/08 01:03:51 rlk Exp $" + * "$Id: testpatternl.l,v 1.25 2009/06/14 17:12:44 rlk Exp $" * * Test pattern generator for Gimp-Print * @@ -721,7 +797,7 @@ do \ while (0) -#line 725 "testpatternl.c" +#line 801 "testpatternl.c" #define INITIAL 0 @@ -739,6 +815,35 @@ do \ static int yy_init_globals (void ); +/* Accessor methods to globals. + These are made visible to non-reentrant scanners for convenience. */ + +int yylex_destroy (void ); + +int yyget_debug (void ); + +void yyset_debug (int debug_flag ); + +YY_EXTRA_TYPE yyget_extra (void ); + +void yyset_extra (YY_EXTRA_TYPE user_defined ); + +FILE *yyget_in (void ); + +void yyset_in (FILE * in_str ); + +FILE *yyget_out (void ); + +void yyset_out (FILE * out_str ); + +int yyget_leng (void ); + +char *yyget_text (void ); + +int yyget_lineno (void ); + +void yyset_lineno (int line_number ); + /* Macros after this point can all be overridden by user definitions in * section 1. */ @@ -781,7 +886,7 @@ static int input (void ); /* This used to be an fputs(), but since the string might contain NUL's, * we now use fwrite(). */ -#define ECHO (void) fwrite( yytext, yyleng, 1, yyout ) +#define ECHO fwrite( yytext, yyleng, 1, yyout ) #endif /* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, @@ -792,7 +897,7 @@ static int input (void ); if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ { \ int c = '*'; \ - size_t n; \ + int n; \ for ( n = 0; n < max_size && \ (c = getc( yyin )) != EOF && c != '\n'; ++n ) \ buf[n] = (char) c; \ @@ -874,10 +979,10 @@ YY_DECL register char *yy_cp, *yy_bp; register int yy_act; -#line 73 "testpatternl.l" +#line 77 "testpatternl.l" -#line 881 "testpatternl.c" +#line 986 "testpatternl.c" if ( !(yy_init) ) { @@ -930,13 +1035,13 @@ yy_match: while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 264 ) + if ( yy_current_state >= 268 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; ++yy_cp; } - while ( yy_base[yy_current_state] != 548 ); + while ( yy_base[yy_current_state] != 843 ); yy_find_action: yy_act = yy_accept[yy_current_state]; @@ -962,277 +1067,242 @@ do_action: /* This label is used only to access EOF actions. */ case 1: YY_RULE_SETUP -#line 75 "testpatternl.l" -yylval.sval = yytext;DBG(CYAN); return CYAN; - YY_BREAK -case 2: -YY_RULE_SETUP -#line 76 "testpatternl.l" -yylval.sval = yytext;DBG(L_CYAN); return L_CYAN; - YY_BREAK -case 3: -YY_RULE_SETUP -#line 77 "testpatternl.l" -yylval.sval = yytext;DBG(MAGENTA); return MAGENTA; - YY_BREAK -case 4: -YY_RULE_SETUP -#line 78 "testpatternl.l" -yylval.sval = yytext;DBG(L_MAGENTA); return L_MAGENTA; - YY_BREAK -case 5: -YY_RULE_SETUP #line 79 "testpatternl.l" -yylval.sval = yytext;DBG(YELLOW); return YELLOW; +DBG(GAMMA); return GAMMA; YY_BREAK -case 6: +case 2: YY_RULE_SETUP #line 80 "testpatternl.l" -yylval.sval = yytext;DBG(D_YELLOW); return D_YELLOW; +DBG(LEVEL); return LEVEL; YY_BREAK -case 7: +case 3: YY_RULE_SETUP #line 81 "testpatternl.l" -yylval.sval = yytext;DBG(BLACK); return BLACK; +DBG(STEPS); return STEPS; YY_BREAK -case 8: +case 4: YY_RULE_SETUP #line 82 "testpatternl.l" -yylval.sval = yytext;DBG(L_BLACK); return L_BLACK; +DBG(INK_LIMIT); return INK_LIMIT; YY_BREAK -case 9: +case 5: YY_RULE_SETUP #line 83 "testpatternl.l" -DBG(GAMMA); return GAMMA; +DBG(PRINTER); return PRINTER; YY_BREAK -case 10: +case 6: YY_RULE_SETUP #line 84 "testpatternl.l" -DBG(LEVEL); return LEVEL; +DBG(PARAMETER); return PARAMETER; YY_BREAK -case 11: +case 7: YY_RULE_SETUP #line 85 "testpatternl.l" -DBG(STEPS); return STEPS; +DBG(PARAMETER_INT); return PARAMETER_INT; YY_BREAK -case 12: +case 8: YY_RULE_SETUP #line 86 "testpatternl.l" -DBG(INK_LIMIT); return INK_LIMIT; +DBG(PARAMETER_BOOL); return PARAMETER_BOOL; YY_BREAK -case 13: +case 9: YY_RULE_SETUP #line 87 "testpatternl.l" -DBG(PRINTER); return PRINTER; +DBG(PARAMETER); return PARAMETER; YY_BREAK -case 14: +case 10: YY_RULE_SETUP #line 88 "testpatternl.l" -DBG(PARAMETER); return PARAMETER; +DBG(PARAMETER_FLOAT); return PARAMETER_FLOAT; YY_BREAK -case 15: +case 11: YY_RULE_SETUP #line 89 "testpatternl.l" -DBG(PARAMETER_INT); return PARAMETER_INT; +DBG(PARAMETER_CURVE); return PARAMETER_CURVE; YY_BREAK -case 16: +case 12: YY_RULE_SETUP #line 90 "testpatternl.l" -DBG(PARAMETER_BOOL); return PARAMETER_BOOL; +DBG(DENSITY); return DENSITY; YY_BREAK -case 17: +case 13: YY_RULE_SETUP #line 91 "testpatternl.l" -DBG(PARAMETER); return PARAMETER; +DBG(TOP); return TOP; YY_BREAK -case 18: +case 14: YY_RULE_SETUP #line 92 "testpatternl.l" -DBG(PARAMETER_FLOAT); return PARAMETER_FLOAT; +DBG(LEFT); return LEFT; YY_BREAK -case 19: +case 15: YY_RULE_SETUP #line 93 "testpatternl.l" -DBG(PARAMETER_CURVE); return PARAMETER_CURVE; +DBG(HSIZE); return HSIZE; YY_BREAK -case 20: +case 16: YY_RULE_SETUP #line 94 "testpatternl.l" -DBG(DENSITY); return DENSITY; +DBG(VSIZE); return VSIZE; YY_BREAK -case 21: +case 17: YY_RULE_SETUP #line 95 "testpatternl.l" -DBG(TOP); return TOP; +DBG(BLACKLINE); return BLACKLINE; YY_BREAK -case 22: +case 18: YY_RULE_SETUP #line 96 "testpatternl.l" -DBG(LEFT); return LEFT; +DBG(PATTERN); return PATTERN; YY_BREAK -case 23: +case 19: YY_RULE_SETUP #line 97 "testpatternl.l" -DBG(HSIZE); return HSIZE; +DBG(XPATTERN); return XPATTERN; YY_BREAK -case 24: +case 20: YY_RULE_SETUP #line 98 "testpatternl.l" -DBG(VSIZE); return VSIZE; +DBG(IMAGE); return IMAGE; YY_BREAK -case 25: +case 21: YY_RULE_SETUP #line 99 "testpatternl.l" -DBG(BLACKLINE); return BLACKLINE; +DBG(EXTENDED); return EXTENDED; YY_BREAK -case 26: +case 22: YY_RULE_SETUP #line 100 "testpatternl.l" -DBG(PATTERN); return PATTERN; +DBG(GRID); return GRID; YY_BREAK -case 27: +case 23: YY_RULE_SETUP #line 101 "testpatternl.l" -DBG(XPATTERN); return XPATTERN; +DBG(CHANNEL); return CHANNEL; YY_BREAK -case 28: +case 24: YY_RULE_SETUP #line 102 "testpatternl.l" -DBG(IMAGE); return IMAGE; +DBG(PAGESIZE); return PAGESIZE; YY_BREAK -case 29: +case 25: YY_RULE_SETUP #line 103 "testpatternl.l" -DBG(EXTENDED); return EXTENDED; +DBG(SEMI); return SEMI; YY_BREAK -case 30: +case 26: YY_RULE_SETUP #line 104 "testpatternl.l" -DBG(GRID); return GRID; +DBG(MODE); return MODE; YY_BREAK -case 31: +case 27: YY_RULE_SETUP #line 105 "testpatternl.l" -DBG(CHANNEL); return CHANNEL; +yylval.ival = CMYK;DBG(CMYK); return CMYK; YY_BREAK -case 32: +case 28: YY_RULE_SETUP #line 106 "testpatternl.l" -DBG(PAGESIZE); return PAGESIZE; +yylval.ival = CMYK;DBG(KCMY); return KCMY; YY_BREAK -case 33: +case 29: YY_RULE_SETUP #line 107 "testpatternl.l" -DBG(SEMI); return SEMI; +yylval.ival = RGB;DBG(RGB); return RGB; YY_BREAK -case 34: +case 30: YY_RULE_SETUP #line 108 "testpatternl.l" -DBG(MODE); return MODE; +yylval.ival = RGB;DBG(CMY); return CMY; YY_BREAK -case 35: +case 31: YY_RULE_SETUP #line 109 "testpatternl.l" -yylval.ival = CMYK;DBG(CMYK); return CMYK; +yylval.ival = GRAY;DBG(GRAY); return GRAY; YY_BREAK -case 36: +case 32: YY_RULE_SETUP #line 110 "testpatternl.l" -yylval.ival = CMYK;DBG(KCMY); return KCMY; +yylval.ival = GRAY;DBG(GRAY); return GRAY; YY_BREAK -case 37: +case 33: YY_RULE_SETUP #line 111 "testpatternl.l" -yylval.ival = RGB;DBG(RGB); return RGB; +yylval.ival = WHITE;DBG(WHITE); return WHITE; YY_BREAK -case 38: +case 34: YY_RULE_SETUP #line 112 "testpatternl.l" -yylval.ival = RGB;DBG(CMY); return CMY; +DBG(OUTPUT); return OUTPUT; YY_BREAK -case 39: +case 35: YY_RULE_SETUP #line 113 "testpatternl.l" -yylval.ival = GRAY;DBG(GRAY); return GRAY; +DBG(MESSAGE); return MESSAGE; YY_BREAK -case 40: +case 36: YY_RULE_SETUP #line 114 "testpatternl.l" -yylval.ival = GRAY;DBG(GRAY); return GRAY; +DBG(NOSCALE); return NOSCALE; YY_BREAK -case 41: +case 37: YY_RULE_SETUP #line 115 "testpatternl.l" -yylval.ival = WHITE;DBG(WHITE); return WHITE; +DBG(START_JOB); return START_JOB; YY_BREAK -case 42: +case 38: YY_RULE_SETUP #line 116 "testpatternl.l" -DBG(OUTPUT); return OUTPUT; +DBG(END_JOB); return END_JOB; YY_BREAK -case 43: +case 39: YY_RULE_SETUP #line 117 "testpatternl.l" -DBG(MESSAGE); return MESSAGE; - YY_BREAK -case 44: -YY_RULE_SETUP -#line 118 "testpatternl.l" -DBG(NOSCALE); return NOSCALE; +DBG(END); return END; YY_BREAK -case 45: +case 40: YY_RULE_SETUP #line 119 "testpatternl.l" -DBG(START_JOB); return START_JOB; +yylval.sval = yytext;DBG(COLOR); return COLOR; YY_BREAK -case 46: +case 41: YY_RULE_SETUP #line 120 "testpatternl.l" -DBG(END_JOB); return END_JOB; - YY_BREAK -case 47: -YY_RULE_SETUP -#line 121 "testpatternl.l" -DBG(END); return END; - YY_BREAK -case 48: -YY_RULE_SETUP -#line 124 "testpatternl.l" yylval.ival = strtol(yytext, NULL, 0); yylval.dval = (double) yylval.ival; DBG(tINT); return tINT; YY_BREAK -case 49: +case 42: YY_RULE_SETUP -#line 125 "testpatternl.l" +#line 121 "testpatternl.l" yylval.dval = strtod(yytext, NULL); DBG(tDOUBLE); return tDOUBLE; YY_BREAK -case 50: -/* rule 50 can match eol */ +case 43: +/* rule 43 can match eol */ YY_RULE_SETUP -#line 126 "testpatternl.l" +#line 122 "testpatternl.l" yylval.sval = c_strstrip(yytext); DBG(tSTRING); return tSTRING; YY_BREAK -case 51: +case 44: YY_RULE_SETUP -#line 127 "testpatternl.l" +#line 123 "testpatternl.l" DBG(whitespace); /* Skip blanks/tabs */ YY_BREAK -case 52: +case 45: YY_RULE_SETUP -#line 128 "testpatternl.l" +#line 124 "testpatternl.l" DBG(comment); /* Skip comments */ YY_BREAK -case 53: -/* rule 53 can match eol */ +case 46: +/* rule 46 can match eol */ YY_RULE_SETUP -#line 129 "testpatternl.l" +#line 125 "testpatternl.l" DBG(newline); mylineno++; YY_BREAK -case 54: +case 47: YY_RULE_SETUP -#line 130 "testpatternl.l" +#line 126 "testpatternl.l" ECHO; YY_BREAK -#line 1236 "testpatternl.c" +#line 1306 "testpatternl.c" case YY_STATE_EOF(INITIAL): yyterminate(); @@ -1463,7 +1533,7 @@ static int yy_get_next_buffer (void) /* Read in more data. */ YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]), - (yy_n_chars), num_to_read ); + (yy_n_chars), (size_t) num_to_read ); YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars); } @@ -1487,6 +1557,14 @@ static int yy_get_next_buffer (void) else ret_val = EOB_ACT_CONTINUE_SCAN; + if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) { + /* Extend the array by 50%, plus the number we really need. */ + yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1); + YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size ); + if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) + YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" ); + } + (yy_n_chars) += number_to_move; YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR; YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR; @@ -1516,7 +1594,7 @@ static int yy_get_next_buffer (void) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 264 ) + if ( yy_current_state >= 268 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; @@ -1544,11 +1622,11 @@ static int yy_get_next_buffer (void) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 264 ) + if ( yy_current_state >= 268 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; - yy_is_jam = (yy_current_state == 263); + yy_is_jam = (yy_current_state == 267); return yy_is_jam ? 0 : yy_current_state; } @@ -1902,7 +1980,9 @@ static void yyensure_buffer_stack (void) (yy_buffer_stack) = (struct yy_buffer_state**)yyalloc (num_to_alloc * sizeof(struct yy_buffer_state*) ); - + if ( ! (yy_buffer_stack) ) + YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" ); + memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*)); (yy_buffer_stack_max) = num_to_alloc; @@ -1920,6 +2000,8 @@ static void yyensure_buffer_stack (void) ((yy_buffer_stack), num_to_alloc * sizeof(struct yy_buffer_state*) ); + if ( ! (yy_buffer_stack) ) + YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" ); /* zero only the new slots.*/ memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*)); @@ -1964,7 +2046,7 @@ YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size ) /** Setup the input buffer state to scan a string. The next call to yylex() will * scan from a @e copy of @a str. - * @param str a NUL-terminated string to scan + * @param yystr a NUL-terminated string to scan * * @return the newly allocated buffer state object. * @note If you want to scan bytes that may contain NUL values, then use @@ -2042,6 +2124,15 @@ static void yy_fatal_error (yyconst char* msg ) /* Accessor methods (get/set functions) to struct members. */ +/** Get the current line number. + * + */ +int yyget_lineno (void) +{ + + return yylineno; +} + /** Get the input stream. * */ @@ -2075,6 +2166,16 @@ char *yyget_text (void) return yytext; } +/** Set the current line number. + * @param line_number + * + */ +void yyset_lineno (int line_number ) +{ + + yylineno = line_number; +} + /** Set the input stream. This does not discard the current * input buffer. * @param in_str A readable stream. @@ -2199,4 +2300,4 @@ void yyfree (void * ptr ) #define YYTABLES_NAME "yytables" -#line 130 "testpatternl.l" +#line 126 "testpatternl.l" diff --git a/src/testpattern/testpatternl.l b/src/testpattern/testpatternl.l index a6894c9..825bf08 100644 --- a/src/testpattern/testpatternl.l +++ b/src/testpattern/testpatternl.l @@ -1,5 +1,5 @@ /* - * "$Id: testpatternl.l,v 1.22 2008/06/08 01:03:51 rlk Exp $" + * "$Id: testpatternl.l,v 1.25 2009/06/14 17:12:44 rlk Exp $" * * Test pattern generator for Gimp-Print * @@ -64,22 +64,18 @@ do \ %option noyywrap +ldigit [1-9] digit [0-9] -integer ([-+]|0[xX])?{digit}+ +odigit [0-7] +xdigit [0-9a-fA-F] +integer ([-+]?(0|{ldigit}{digit}*))|(0{odigit}*)|(0[xX]{xdigit}+) float [-+]?{digit}+(\.{digit}+)?([eE][-+]?{digit}+)? -string ([\"][^\"]+[\"])|([a-zA-Z0-9_][-a-zA-Z0-9_]*)|([\'][^\']*[\']) +string ([\"][^\"]*[\"])|([a-zA-Z0-9_][-a-zA-Z0-9_]*)|([\'][^\']*[\']) ws [ \t]+ +color ((l_)?(cyan|magenta|yellow|black))|(l_l_black)|(d_yellow) %% -cyan yylval.sval = yytext;DBG(CYAN); return CYAN; -l_cyan yylval.sval = yytext;DBG(L_CYAN); return L_CYAN; -magenta yylval.sval = yytext;DBG(MAGENTA); return MAGENTA; -l_magenta yylval.sval = yytext;DBG(L_MAGENTA); return L_MAGENTA; -yellow yylval.sval = yytext;DBG(YELLOW); return YELLOW; -d_yellow yylval.sval = yytext;DBG(D_YELLOW); return D_YELLOW; -black yylval.sval = yytext;DBG(BLACK); return BLACK; -l_black yylval.sval = yytext;DBG(L_BLACK); return L_BLACK; gamma DBG(GAMMA); return GAMMA; level DBG(LEVEL); return LEVEL; steps DBG(STEPS); return STEPS; @@ -120,7 +116,7 @@ start_job DBG(START_JOB); return START_JOB; end_job DBG(END_JOB); return END_JOB; end DBG(END); return END; - +{color} yylval.sval = yytext;DBG(COLOR); return COLOR; {integer} yylval.ival = strtol(yytext, NULL, 0); yylval.dval = (double) yylval.ival; DBG(tINT); return tINT; {float} yylval.dval = strtod(yytext, NULL); DBG(tDOUBLE); return tDOUBLE; {string} yylval.sval = c_strstrip(yytext); DBG(tSTRING); return tSTRING; diff --git a/src/testpattern/testpatterny.c b/src/testpattern/testpatterny.c index 1b62843..c31b9e5 100644 --- a/src/testpattern/testpatterny.c +++ b/src/testpattern/testpatterny.c @@ -69,104 +69,88 @@ tINT = 258, tDOUBLE = 259, tSTRING = 260, - CYAN = 261, - L_CYAN = 262, - MAGENTA = 263, - L_MAGENTA = 264, - YELLOW = 265, - D_YELLOW = 266, - BLACK = 267, - L_BLACK = 268, - GAMMA = 269, - LEVEL = 270, - STEPS = 271, - INK_LIMIT = 272, - PRINTER = 273, - PARAMETER = 274, - PARAMETER_INT = 275, - PARAMETER_BOOL = 276, - PARAMETER_FLOAT = 277, - PARAMETER_CURVE = 278, - DENSITY = 279, - TOP = 280, - LEFT = 281, - HSIZE = 282, - VSIZE = 283, - BLACKLINE = 284, - NOSCALE = 285, - PATTERN = 286, - XPATTERN = 287, - EXTENDED = 288, - IMAGE = 289, - GRID = 290, - SEMI = 291, - CHANNEL = 292, - CMYK = 293, - KCMY = 294, - RGB = 295, - CMY = 296, - GRAY = 297, - WHITE = 298, - RAW = 299, - MODE = 300, - PAGESIZE = 301, - MESSAGE = 302, - OUTPUT = 303, - START_JOB = 304, - END_JOB = 305, - END = 306 + COLOR = 261, + GAMMA = 262, + LEVEL = 263, + STEPS = 264, + INK_LIMIT = 265, + PRINTER = 266, + PARAMETER = 267, + PARAMETER_INT = 268, + PARAMETER_BOOL = 269, + PARAMETER_FLOAT = 270, + PARAMETER_CURVE = 271, + DENSITY = 272, + TOP = 273, + LEFT = 274, + HSIZE = 275, + VSIZE = 276, + BLACKLINE = 277, + NOSCALE = 278, + PATTERN = 279, + XPATTERN = 280, + EXTENDED = 281, + IMAGE = 282, + GRID = 283, + SEMI = 284, + CHANNEL = 285, + CMYK = 286, + KCMY = 287, + RGB = 288, + CMY = 289, + GRAY = 290, + WHITE = 291, + MODE = 292, + PAGESIZE = 293, + MESSAGE = 294, + OUTPUT = 295, + START_JOB = 296, + END_JOB = 297, + END = 298 }; #endif /* Tokens. */ #define tINT 258 #define tDOUBLE 259 #define tSTRING 260 -#define CYAN 261 -#define L_CYAN 262 -#define MAGENTA 263 -#define L_MAGENTA 264 -#define YELLOW 265 -#define D_YELLOW 266 -#define BLACK 267 -#define L_BLACK 268 -#define GAMMA 269 -#define LEVEL 270 -#define STEPS 271 -#define INK_LIMIT 272 -#define PRINTER 273 -#define PARAMETER 274 -#define PARAMETER_INT 275 -#define PARAMETER_BOOL 276 -#define PARAMETER_FLOAT 277 -#define PARAMETER_CURVE 278 -#define DENSITY 279 -#define TOP 280 -#define LEFT 281 -#define HSIZE 282 -#define VSIZE 283 -#define BLACKLINE 284 -#define NOSCALE 285 -#define PATTERN 286 -#define XPATTERN 287 -#define EXTENDED 288 -#define IMAGE 289 -#define GRID 290 -#define SEMI 291 -#define CHANNEL 292 -#define CMYK 293 -#define KCMY 294 -#define RGB 295 -#define CMY 296 -#define GRAY 297 -#define WHITE 298 -#define RAW 299 -#define MODE 300 -#define PAGESIZE 301 -#define MESSAGE 302 -#define OUTPUT 303 -#define START_JOB 304 -#define END_JOB 305 -#define END 306 +#define COLOR 261 +#define GAMMA 262 +#define LEVEL 263 +#define STEPS 264 +#define INK_LIMIT 265 +#define PRINTER 266 +#define PARAMETER 267 +#define PARAMETER_INT 268 +#define PARAMETER_BOOL 269 +#define PARAMETER_FLOAT 270 +#define PARAMETER_CURVE 271 +#define DENSITY 272 +#define TOP 273 +#define LEFT 274 +#define HSIZE 275 +#define VSIZE 276 +#define BLACKLINE 277 +#define NOSCALE 278 +#define PATTERN 279 +#define XPATTERN 280 +#define EXTENDED 281 +#define IMAGE 282 +#define GRID 283 +#define SEMI 284 +#define CHANNEL 285 +#define CMYK 286 +#define KCMY 287 +#define RGB 288 +#define CMY 289 +#define GRAY 290 +#define WHITE 291 +#define MODE 292 +#define PAGESIZE 293 +#define MESSAGE 294 +#define OUTPUT 295 +#define START_JOB 296 +#define END_JOB 297 +#define END 298 @@ -271,7 +255,7 @@ typedef int YYSTYPE; /* Line 216 of yacc.c. */ -#line 275 "testpatterny.c" +#line 259 "testpatterny.c" #ifdef short # undef short @@ -484,22 +468,22 @@ union yyalloc #endif /* YYFINAL -- State number of the termination state. */ -#define YYFINAL 67 +#define YYFINAL 60 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 186 +#define YYLAST 166 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 52 +#define YYNTOKENS 44 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 75 +#define YYNNTS 71 /* YYNRULES -- Number of rules. */ -#define YYNRULES 133 +#define YYNRULES 120 /* YYNRULES -- Number of states. */ -#define YYNSTATES 193 +#define YYNSTATES 172 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 306 +#define YYMAXUTOK 298 #define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) @@ -536,8 +520,7 @@ static const yytype_uint8 yytranslate[] = 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, - 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, - 45, 46, 47, 48, 49, 50, 51 + 35, 36, 37, 38, 39, 40, 41, 42, 43 }; #if YYDEBUG @@ -546,78 +529,72 @@ static const yytype_uint8 yytranslate[] = static const yytype_uint16 yyprhs[] = { 0, 0, 3, 5, 7, 9, 11, 13, 15, 17, - 19, 21, 23, 26, 29, 32, 35, 38, 41, 45, - 47, 49, 51, 53, 55, 57, 59, 62, 66, 70, - 74, 78, 81, 84, 87, 90, 93, 97, 99, 101, - 105, 109, 113, 117, 121, 123, 125, 127, 129, 131, - 134, 137, 140, 143, 146, 149, 152, 156, 158, 161, - 162, 164, 167, 172, 178, 180, 182, 184, 187, 188, - 190, 192, 194, 200, 204, 207, 210, 214, 217, 221, - 226, 232, 239, 241, 243, 245, 247, 249, 251, 253, - 256, 258, 260, 262, 264, 266, 268, 270, 272, 274, - 276, 278, 280, 282, 284, 286, 288, 290, 292, 294, - 296, 298, 300, 302, 304, 306, 308, 310, 313, 315, - 317, 319, 321, 324, 325, 328, 330, 331, 334, 336, - 338, 339, 342, 343 + 19, 22, 24, 26, 28, 30, 32, 34, 36, 39, + 41, 43, 46, 50, 54, 58, 62, 65, 68, 71, + 74, 77, 81, 83, 85, 89, 93, 97, 101, 105, + 107, 109, 111, 113, 115, 118, 121, 124, 127, 130, + 133, 136, 140, 142, 145, 146, 148, 151, 156, 162, + 164, 166, 168, 171, 172, 174, 176, 178, 184, 188, + 191, 194, 198, 200, 201, 204, 207, 209, 212, 214, + 216, 218, 220, 222, 224, 226, 228, 230, 232, 234, + 236, 238, 240, 242, 244, 246, 248, 250, 252, 254, + 256, 258, 260, 262, 264, 267, 269, 271, 273, 275, + 278, 279, 282, 284, 285, 288, 290, 292, 293, 296, + 297 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ static const yytype_int8 yyrhs[] = { - 125, 0, -1, 6, -1, 7, -1, 8, -1, 9, - -1, 10, -1, 11, -1, 12, -1, 13, -1, 4, - -1, 3, -1, 38, 3, -1, 39, 3, -1, 40, - 3, -1, 41, 3, -1, 42, 3, -1, 43, 3, - -1, 33, 3, 3, -1, 55, -1, 56, -1, 57, - -1, 58, -1, 59, -1, 60, -1, 61, -1, 45, - 62, -1, 15, 53, 54, -1, 15, 3, 54, -1, - 14, 53, 54, -1, 14, 3, 54, -1, 14, 54, - -1, 16, 3, -1, 17, 54, -1, 18, 5, -1, - 46, 5, -1, 46, 3, 3, -1, 72, -1, 73, - -1, 19, 5, 5, -1, 20, 5, 3, -1, 21, - 5, 3, -1, 22, 5, 54, -1, 23, 5, 5, - -1, 75, -1, 76, -1, 78, -1, 79, -1, 77, - -1, 24, 54, -1, 25, 54, -1, 26, 54, -1, - 27, 54, -1, 28, 54, -1, 29, 3, -1, 30, - 3, -1, 54, 54, 54, -1, 88, -1, 89, 88, - -1, -1, 89, -1, 88, 90, -1, 53, 54, 54, - 54, -1, 37, 3, 54, 54, 54, -1, 92, -1, - 93, -1, 94, -1, 95, 94, -1, -1, 95, -1, - 91, -1, 96, -1, 54, 54, 54, 54, 54, -1, - 31, 98, 97, -1, 32, 97, -1, 35, 3, -1, - 34, 3, 3, -1, 47, 5, -1, 47, 5, 5, - -1, 47, 5, 5, 5, -1, 47, 5, 5, 5, - 5, -1, 47, 5, 5, 5, 5, 5, -1, 103, - -1, 104, -1, 105, -1, 106, -1, 107, -1, 108, - -1, 48, -1, 48, 5, -1, 110, -1, 111, -1, - 112, -1, 49, -1, 50, -1, 66, -1, 67, -1, - 64, -1, 65, -1, 68, -1, 69, -1, 70, -1, - 71, -1, 80, -1, 81, -1, 82, -1, 83, -1, - 84, -1, 85, -1, 86, -1, 87, -1, 63, -1, - 74, -1, 109, -1, 113, -1, 114, -1, 115, -1, - 116, 36, -1, 99, -1, 100, -1, 101, -1, 109, - -1, 118, 36, -1, -1, 120, 119, -1, 102, -1, - -1, 122, 117, -1, 120, -1, 121, -1, -1, 51, - 36, -1, -1, 122, 126, 123, 124, -1 + 113, 0, -1, 4, -1, 3, -1, 31, -1, 32, + -1, 33, -1, 34, -1, 35, -1, 36, -1, 26, + 3, -1, 46, -1, 47, -1, 48, -1, 49, -1, + 50, -1, 51, -1, 52, -1, 53, 3, -1, 53, + -1, 54, -1, 37, 55, -1, 8, 6, 45, -1, + 8, 3, 45, -1, 7, 6, 45, -1, 7, 3, + 45, -1, 7, 45, -1, 9, 3, -1, 10, 45, + -1, 11, 5, -1, 38, 5, -1, 38, 3, 3, + -1, 65, -1, 66, -1, 12, 5, 5, -1, 13, + 5, 3, -1, 14, 5, 3, -1, 15, 5, 45, + -1, 16, 5, 5, -1, 68, -1, 69, -1, 71, + -1, 72, -1, 70, -1, 17, 45, -1, 18, 45, + -1, 19, 45, -1, 20, 45, -1, 21, 45, -1, + 22, 3, -1, 23, 3, -1, 45, 45, 45, -1, + 81, -1, 82, 81, -1, -1, 82, -1, 81, 83, + -1, 6, 45, 45, 45, -1, 30, 3, 45, 45, + 45, -1, 85, -1, 86, -1, 87, -1, 88, 87, + -1, -1, 88, -1, 84, -1, 89, -1, 45, 45, + 45, 45, 45, -1, 24, 91, 90, -1, 25, 90, + -1, 28, 3, -1, 27, 3, 3, -1, 5, -1, + -1, 97, 96, -1, 39, 97, -1, 40, -1, 40, + 5, -1, 99, -1, 100, -1, 41, -1, 42, -1, + 59, -1, 60, -1, 57, -1, 58, -1, 61, -1, + 62, -1, 63, -1, 64, -1, 73, -1, 74, -1, + 75, -1, 76, -1, 77, -1, 78, -1, 79, -1, + 80, -1, 56, -1, 67, -1, 98, -1, 101, -1, + 102, -1, 103, -1, 104, 29, -1, 92, -1, 93, + -1, 94, -1, 98, -1, 106, 29, -1, -1, 108, + 107, -1, 95, -1, -1, 110, 105, -1, 108, -1, + 109, -1, -1, 43, 29, -1, -1, 110, 114, 111, + 112, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 145, 145, 145, 145, 145, 146, 146, 146, 146, - 148, 148, 151, 163, 175, 187, 199, 211, 223, 235, - 235, 235, 235, 235, 235, 235, 238, 241, 251, 260, - 270, 279, 286, 293, 300, 309, 318, 327, 327, 330, - 340, 349, 358, 367, 381, 381, 381, 381, 381, 383, - 390, 397, 404, 411, 418, 426, 434, 449, 449, 452, - 452, 455, 458, 472, 485, 485, 488, 488, 491, 491, - 494, 494, 497, 512, 515, 530, 541, 558, 564, 571, - 579, 588, 599, 599, 599, 599, 599, 602, 605, 614, - 619, 619, 622, 625, 629, 633, 633, 633, 633, 633, - 633, 634, 634, 634, 634, 634, 634, 634, 635, 635, - 635, 635, 635, 635, 636, 636, 636, 639, 643, 643, - 643, 643, 646, 650, 650, 653, 657, 657, 660, 660, - 663, 663, 668, 667 + 0, 139, 139, 139, 144, 154, 164, 174, 184, 194, + 204, 214, 214, 214, 214, 214, 214, 214, 217, 225, + 225, 228, 231, 241, 250, 260, 269, 276, 283, 290, + 299, 308, 317, 317, 320, 330, 339, 348, 357, 371, + 371, 371, 371, 371, 373, 380, 387, 394, 401, 408, + 416, 424, 439, 439, 442, 442, 445, 448, 462, 475, + 475, 478, 478, 481, 481, 484, 484, 487, 502, 505, + 520, 531, 548, 555, 555, 558, 561, 571, 577, 577, + 580, 584, 588, 588, 588, 588, 588, 588, 589, 589, + 589, 589, 589, 589, 589, 590, 590, 590, 590, 590, + 590, 591, 591, 591, 594, 598, 598, 598, 598, 601, + 605, 605, 608, 612, 612, 615, 615, 618, 618, 623, + 622 }; #endif @@ -626,28 +603,26 @@ static const yytype_uint16 yyrline[] = First, the terminals, then, starting at YYNTOKENS, nonterminals. */ static const char *const yytname[] = { - "$end", "error", "$undefined", "tINT", "tDOUBLE", "tSTRING", "CYAN", - "L_CYAN", "MAGENTA", "L_MAGENTA", "YELLOW", "D_YELLOW", "BLACK", - "L_BLACK", "GAMMA", "LEVEL", "STEPS", "INK_LIMIT", "PRINTER", - "PARAMETER", "PARAMETER_INT", "PARAMETER_BOOL", "PARAMETER_FLOAT", - "PARAMETER_CURVE", "DENSITY", "TOP", "LEFT", "HSIZE", "VSIZE", - "BLACKLINE", "NOSCALE", "PATTERN", "XPATTERN", "EXTENDED", "IMAGE", - "GRID", "SEMI", "CHANNEL", "CMYK", "KCMY", "RGB", "CMY", "GRAY", "WHITE", - "RAW", "MODE", "PAGESIZE", "MESSAGE", "OUTPUT", "START_JOB", "END_JOB", - "END", "$accept", "COLOR", "NUMBER", "cmykspec", "kcmyspec", "rgbspec", - "cmyspec", "grayspec", "whitespec", "extendedspec", "modespec", - "inputspec", "level", "channel_level", "gamma", "channel_gamma", - "global_gamma", "steps", "ink_limit", "printer", "page_size_name", - "page_size_custom", "page_size", "parameter_string", "parameter_int", - "parameter_bool", "parameter_float", "parameter_curve", "parameter", - "density", "top", "left", "hsize", "vsize", "blackline", "noscale", - "color_block1", "color_blocks1a", "color_blocks1b", "color_blocks1", - "color_block2a", "color_block2b", "color_block2", "color_blocks2a", - "color_blocks2", "color_blocks", "patvars", "pattern", "xpattern", - "grid", "image", "Message0", "Message1", "Message2", "Message3", - "Message4", "A_Message", "message", "Output0", "Output1", "A_Output", - "output", "start_job", "end_job", "A_Rule", "Rule", "A_Pattern", - "Pattern", "Patterns", "Image", "Rules", "Output", "EOF", "Thing", "@1", 0 + "$end", "error", "$undefined", "tINT", "tDOUBLE", "tSTRING", "COLOR", + "GAMMA", "LEVEL", "STEPS", "INK_LIMIT", "PRINTER", "PARAMETER", + "PARAMETER_INT", "PARAMETER_BOOL", "PARAMETER_FLOAT", "PARAMETER_CURVE", + "DENSITY", "TOP", "LEFT", "HSIZE", "VSIZE", "BLACKLINE", "NOSCALE", + "PATTERN", "XPATTERN", "EXTENDED", "IMAGE", "GRID", "SEMI", "CHANNEL", + "CMYK", "KCMY", "RGB", "CMY", "GRAY", "WHITE", "MODE", "PAGESIZE", + "MESSAGE", "OUTPUT", "START_JOB", "END_JOB", "END", "$accept", "NUMBER", + "cmykspec", "kcmyspec", "rgbspec", "cmyspec", "grayspec", "whitespec", + "extendedspec", "modespec1", "modespec2", "modespec", "inputspec", + "level", "channel_level", "gamma", "channel_gamma", "global_gamma", + "steps", "ink_limit", "printer", "page_size_name", "page_size_custom", + "page_size", "parameter_string", "parameter_int", "parameter_bool", + "parameter_float", "parameter_curve", "parameter", "density", "top", + "left", "hsize", "vsize", "blackline", "noscale", "color_block1", + "color_blocks1a", "color_blocks1b", "color_blocks1", "color_block2a", + "color_block2b", "color_block2", "color_blocks2a", "color_blocks2", + "color_blocks", "patvars", "pattern", "xpattern", "grid", "image", + "Message", "Messages", "message", "Output0", "Output1", "output", + "start_job", "end_job", "A_Rule", "Rule", "A_Pattern", "Pattern", + "Patterns", "Image", "Rules", "Print", "EOF", "Thing", "@1", 0 }; #endif @@ -660,47 +635,44 @@ static const yytype_uint16 yytoknum[] = 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, - 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, - 305, 306 + 295, 296, 297, 298 }; # endif /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const yytype_uint8 yyr1[] = { - 0, 52, 53, 53, 53, 53, 53, 53, 53, 53, - 54, 54, 55, 56, 57, 58, 59, 60, 61, 62, - 62, 62, 62, 62, 62, 62, 63, 64, 65, 66, - 67, 68, 69, 70, 71, 72, 73, 74, 74, 75, - 76, 77, 78, 79, 80, 80, 80, 80, 80, 81, - 82, 83, 84, 85, 86, 87, 88, 89, 89, 90, - 90, 91, 92, 93, 94, 94, 95, 95, 96, 96, - 97, 97, 98, 99, 100, 101, 102, 103, 104, 105, - 106, 107, 108, 108, 108, 108, 108, 109, 110, 111, - 112, 112, 113, 114, 115, 116, 116, 116, 116, 116, - 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, - 116, 116, 116, 116, 116, 116, 116, 117, 118, 118, - 118, 118, 119, 120, 120, 121, 122, 122, 123, 123, - 124, 124, 126, 125 + 0, 44, 45, 45, 46, 47, 48, 49, 50, 51, + 52, 53, 53, 53, 53, 53, 53, 53, 54, 55, + 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, + 65, 66, 67, 67, 68, 69, 70, 71, 72, 73, + 73, 73, 73, 73, 74, 75, 76, 77, 78, 79, + 80, 81, 82, 82, 83, 83, 84, 85, 86, 87, + 87, 88, 88, 89, 89, 90, 90, 91, 92, 93, + 94, 95, 96, 97, 97, 98, 99, 100, 101, 101, + 102, 103, 104, 104, 104, 104, 104, 104, 104, 104, + 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, + 104, 104, 104, 104, 105, 106, 106, 106, 106, 107, + 108, 108, 109, 110, 110, 111, 111, 112, 112, 114, + 113 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ static const yytype_uint8 yyr2[] = { 0, 2, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 2, 2, 2, 2, 2, 2, 3, 1, - 1, 1, 1, 1, 1, 1, 2, 3, 3, 3, - 3, 2, 2, 2, 2, 2, 3, 1, 1, 3, - 3, 3, 3, 3, 1, 1, 1, 1, 1, 2, - 2, 2, 2, 2, 2, 2, 3, 1, 2, 0, - 1, 2, 4, 5, 1, 1, 1, 2, 0, 1, - 1, 1, 5, 3, 2, 2, 3, 2, 3, 4, - 5, 6, 1, 1, 1, 1, 1, 1, 1, 2, + 2, 1, 1, 1, 1, 1, 1, 1, 2, 1, + 1, 2, 3, 3, 3, 3, 2, 2, 2, 2, + 2, 3, 1, 1, 3, 3, 3, 3, 3, 1, + 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, + 2, 3, 1, 2, 0, 1, 2, 4, 5, 1, + 1, 1, 2, 0, 1, 1, 1, 5, 3, 2, + 2, 3, 1, 0, 2, 2, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, - 1, 1, 2, 0, 2, 1, 0, 2, 1, 1, - 0, 2, 0, 4 + 1, 1, 1, 1, 2, 1, 1, 1, 1, 2, + 0, 2, 1, 0, 2, 1, 1, 0, 2, 0, + 4 }; /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state @@ -708,79 +680,75 @@ static const yytype_uint8 yyr2[] = means the default is an error. */ static const yytype_uint8 yydefact[] = { - 126, 132, 0, 0, 0, 0, 0, 0, 0, 0, + 113, 119, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 88, 93, 94, 111, 97, 98, 95, - 96, 99, 100, 101, 102, 37, 38, 112, 44, 45, - 48, 46, 47, 103, 104, 105, 106, 107, 108, 109, - 110, 82, 83, 84, 85, 86, 87, 113, 90, 91, - 92, 114, 115, 116, 0, 127, 123, 1, 11, 10, - 2, 3, 4, 5, 6, 7, 8, 9, 0, 31, - 0, 0, 32, 11, 33, 34, 0, 0, 0, 0, - 0, 49, 50, 51, 52, 53, 54, 55, 0, 0, - 0, 0, 0, 0, 0, 19, 20, 21, 22, 23, - 24, 25, 26, 0, 35, 77, 89, 117, 0, 125, - 128, 129, 130, 30, 29, 28, 27, 39, 40, 41, - 42, 43, 0, 12, 13, 14, 15, 16, 17, 36, - 78, 0, 0, 68, 0, 118, 119, 120, 121, 0, - 124, 0, 133, 18, 79, 76, 0, 68, 0, 0, - 0, 59, 70, 64, 65, 66, 69, 71, 74, 75, - 122, 131, 80, 0, 73, 0, 0, 0, 57, 60, - 61, 67, 81, 0, 0, 0, 56, 58, 0, 0, - 62, 72, 63 + 0, 0, 73, 76, 80, 81, 98, 84, 85, 82, + 83, 86, 87, 88, 89, 32, 33, 99, 39, 40, + 43, 41, 42, 90, 91, 92, 93, 94, 95, 96, + 97, 100, 78, 79, 101, 102, 103, 0, 114, 110, + 1, 3, 2, 0, 26, 0, 0, 27, 3, 28, + 29, 0, 0, 0, 0, 0, 44, 45, 46, 47, + 48, 49, 50, 0, 4, 5, 6, 7, 8, 9, + 11, 12, 13, 14, 15, 16, 17, 19, 20, 21, + 0, 30, 75, 77, 104, 0, 112, 115, 116, 117, + 25, 24, 23, 22, 34, 35, 36, 37, 38, 10, + 18, 31, 72, 74, 0, 0, 63, 0, 105, 106, + 107, 108, 0, 111, 0, 120, 71, 0, 63, 0, + 0, 0, 54, 65, 59, 60, 61, 64, 66, 69, + 70, 109, 118, 0, 68, 0, 0, 0, 52, 55, + 56, 62, 0, 0, 0, 51, 53, 0, 57, 0, + 67, 58 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { - -1, 159, 160, 105, 106, 107, 108, 109, 110, 111, - 112, 26, 27, 28, 29, 30, 31, 32, 33, 34, - 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, - 45, 46, 47, 48, 49, 50, 161, 179, 180, 162, - 163, 164, 165, 166, 167, 168, 157, 145, 146, 147, - 119, 51, 52, 53, 54, 55, 56, 57, 58, 59, - 60, 61, 62, 63, 64, 65, 149, 150, 120, 121, - 1, 122, 152, 2, 66 + -1, 141, 90, 91, 92, 93, 94, 95, 96, 97, + 98, 99, 26, 27, 28, 29, 30, 31, 32, 33, + 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, + 44, 45, 46, 47, 48, 49, 50, 142, 159, 160, + 143, 144, 145, 146, 147, 148, 149, 138, 128, 129, + 130, 106, 123, 102, 51, 52, 53, 54, 55, 56, + 57, 58, 132, 133, 107, 108, 1, 109, 135, 2, + 59 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -119 +#define YYPACT_NINF -109 static const yytype_int8 yypact[] = { - -119, 1, 9, 81, 92, -2, 2, 39, 40, 55, - 57, 63, 64, 2, 2, 2, 2, 2, 31, 67, - 73, -1, 66, 68, -119, -119, -119, -119, -119, -119, - -119, -119, -119, -119, -119, -119, -119, -119, -119, -119, - -119, -119, -119, -119, -119, -119, -119, -119, -119, -119, - -119, -119, -119, -119, -119, -119, -119, -119, -119, -119, - -119, -119, -119, -119, 36, -119, 42, -119, 2, -119, - -119, -119, -119, -119, -119, -119, -119, -119, 2, -119, - 2, 2, -119, -119, -119, -119, 69, 77, 78, 2, - 91, -119, -119, -119, -119, -119, -119, -119, 79, 94, - 104, 105, 106, 107, 114, -119, -119, -119, -119, -119, - -119, -119, -119, 115, -119, 116, -119, -119, 117, -119, - 32, -119, 71, -119, -119, -119, -119, -119, -119, -119, - -119, -119, 120, -119, -119, -119, -119, -119, -119, -119, - 119, 122, 2, 29, 123, -119, -119, -119, -119, 83, - -119, 93, -119, -119, 125, -119, 2, 29, 124, 2, - 2, 2, -119, -119, -119, -119, 46, -119, -119, -119, - -119, -119, 126, 2, -119, 2, 2, 2, -119, 2, - -119, -119, -119, 2, 2, 2, -119, -119, 2, 2, - -119, -119, -119 + -109, 8, 7, -2, 36, 37, 32, 38, 39, 49, + 51, 52, 56, 32, 32, 32, 32, 32, 67, 69, + 33, 50, -109, 68, -109, -109, -109, -109, -109, -109, + -109, -109, -109, -109, -109, -109, -109, -109, -109, -109, + -109, -109, -109, -109, -109, -109, -109, -109, -109, -109, + -109, -109, -109, -109, -109, -109, -109, 45, -109, 48, + -109, 32, -109, 32, -109, 32, 32, -109, -109, -109, + -109, 71, 74, 75, 32, 76, -109, -109, -109, -109, + -109, -109, -109, 77, -109, -109, -109, -109, -109, -109, + -109, -109, -109, -109, -109, -109, -109, 79, -109, -109, + 80, -109, 81, -109, -109, 82, -109, 13, -109, 41, + -109, -109, -109, -109, -109, -109, -109, -109, -109, -109, + -109, -109, -109, -109, 84, 32, 2, 85, -109, -109, + -109, -109, 60, -109, 61, -109, -109, 32, 2, 32, + 88, 32, 32, -109, -109, -109, -109, 3, -109, -109, + -109, -109, -109, 32, -109, 32, 32, 32, -109, 32, + -109, -109, 32, 32, 32, -109, -109, 32, -109, 32, + -109, -109 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int8 yypgoto[] = { - -119, 4, -3, -119, -119, -119, -119, -119, -119, -119, - -119, -119, -119, -119, -119, -119, -119, -119, -119, -119, - -119, -119, -119, -119, -119, -119, -119, -119, -119, -119, - -119, -119, -119, -119, -119, -119, -118, -119, -119, -119, - -119, -119, -38, -119, -119, -25, -119, -119, -119, -119, - -119, -119, -119, -119, -119, -119, -119, 13, -119, -119, - -119, -119, -119, -119, -119, -119, -119, -119, -119, -119, - -119, -119, -119, -119, -119 + -109, -3, -109, -109, -109, -109, -109, -109, -109, -109, + -109, -109, -109, -109, -109, -109, -109, -109, -109, -109, + -109, -109, -109, -109, -109, -109, -109, -109, -109, -109, + -109, -109, -109, -109, -109, -109, -109, -108, -109, -109, + -109, -109, -109, -68, -109, -109, -46, -109, -109, -109, + -109, -109, -109, -109, -14, -109, -109, -109, -109, -109, + -109, -109, -109, -109, -109, -109, -109, -109, -109, -109, + -109 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If @@ -790,74 +758,68 @@ static const yytype_int8 yypgoto[] = #define YYTABLE_NINF -1 static const yytype_uint8 yytable[] = { - 79, 82, 113, 84, 114, 83, 69, 78, 81, 67, - 91, 92, 93, 94, 95, 3, 4, 5, 6, 7, + 64, 61, 62, 69, 63, 68, 62, 60, 139, 139, + 76, 77, 78, 79, 80, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, - 18, 19, 83, 69, 96, 70, 71, 72, 73, 74, - 75, 76, 77, 178, 85, 86, 20, 21, 22, 23, - 24, 25, 70, 71, 72, 73, 74, 75, 76, 77, - 87, 187, 88, 142, 143, 123, 158, 144, 89, 90, - 97, 115, 117, 116, 127, 124, 118, 125, 126, 22, - 128, 129, 132, 158, 68, 69, 130, 70, 71, 72, - 73, 74, 75, 76, 77, 80, 131, 133, 70, 71, - 72, 73, 74, 75, 76, 77, 98, 134, 135, 136, - 137, 99, 100, 101, 102, 103, 104, 138, 139, 170, - 141, 140, 151, 153, 154, 155, 169, 175, 181, 171, - 172, 182, 174, 148, 0, 0, 0, 0, 0, 156, + 18, 19, 140, 140, 158, 68, 62, 125, 126, 65, + 67, 127, 66, 70, 71, 20, 21, 22, 23, 24, + 25, 166, 22, 100, 72, 101, 73, 74, 110, 83, + 111, 75, 112, 113, 84, 85, 86, 87, 88, 89, + 81, 117, 82, 103, 104, 105, 114, 115, 116, 161, + 119, 118, 120, 121, 134, 124, 122, 136, 150, 151, + 152, 156, 154, 131, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 173, 0, 0, 176, 177, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 183, 0, 184, 185, 186, 0, 0, 0, 0, 0, - 188, 189, 190, 0, 0, 191, 192 + 0, 0, 137, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 153, 0, 155, 0, 157, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 162, 0, 163, 164, 165, 0, 0, 0, 0, 167, + 168, 169, 0, 0, 170, 0, 171 }; static const yytype_int16 yycheck[] = { - 3, 3, 3, 6, 5, 3, 4, 3, 4, 0, - 13, 14, 15, 16, 17, 14, 15, 16, 17, 18, - 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, - 29, 30, 3, 4, 3, 6, 7, 8, 9, 10, - 11, 12, 13, 161, 5, 5, 45, 46, 47, 48, - 49, 50, 6, 7, 8, 9, 10, 11, 12, 13, - 5, 179, 5, 31, 32, 68, 37, 35, 5, 5, - 3, 5, 36, 5, 5, 78, 34, 80, 81, 47, - 3, 3, 3, 37, 3, 4, 89, 6, 7, 8, - 9, 10, 11, 12, 13, 3, 5, 3, 6, 7, - 8, 9, 10, 11, 12, 13, 33, 3, 3, 3, - 3, 38, 39, 40, 41, 42, 43, 3, 3, 36, - 3, 5, 51, 3, 5, 3, 3, 3, 166, 36, - 5, 5, 157, 120, -1, -1, -1, -1, -1, 142, + 3, 3, 4, 6, 6, 3, 4, 0, 6, 6, + 13, 14, 15, 16, 17, 7, 8, 9, 10, 11, + 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, + 22, 23, 30, 30, 142, 3, 4, 24, 25, 3, + 3, 28, 6, 5, 5, 37, 38, 39, 40, 41, + 42, 159, 39, 3, 5, 5, 5, 5, 61, 26, + 63, 5, 65, 66, 31, 32, 33, 34, 35, 36, + 3, 74, 3, 5, 29, 27, 5, 3, 3, 147, + 3, 5, 3, 3, 43, 3, 5, 3, 3, 29, + 29, 3, 138, 107, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 156, -1, -1, 159, 160, -1, -1, + -1, -1, 125, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 137, -1, 139, -1, 141, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 173, -1, 175, 176, 177, -1, -1, -1, -1, -1, - 183, 184, 185, -1, -1, 188, 189 + 153, -1, 155, 156, 157, -1, -1, -1, -1, 162, + 163, 164, -1, -1, 167, -1, 169 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM. */ static const yytype_uint8 yystos[] = { - 0, 122, 125, 14, 15, 16, 17, 18, 19, 20, - 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, - 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, - 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, - 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, - 87, 103, 104, 105, 106, 107, 108, 109, 110, 111, - 112, 113, 114, 115, 116, 117, 126, 0, 3, 4, - 6, 7, 8, 9, 10, 11, 12, 13, 53, 54, - 3, 53, 3, 3, 54, 5, 5, 5, 5, 5, - 5, 54, 54, 54, 54, 54, 3, 3, 33, 38, - 39, 40, 41, 42, 43, 55, 56, 57, 58, 59, - 60, 61, 62, 3, 5, 5, 5, 36, 34, 102, - 120, 121, 123, 54, 54, 54, 54, 5, 3, 3, - 54, 5, 3, 3, 3, 3, 3, 3, 3, 3, - 5, 3, 31, 32, 35, 99, 100, 101, 109, 118, - 119, 51, 124, 3, 5, 3, 54, 98, 37, 53, - 54, 88, 91, 92, 93, 94, 95, 96, 97, 3, - 36, 36, 5, 54, 97, 3, 54, 54, 88, 89, - 90, 94, 5, 54, 54, 54, 54, 88, 54, 54, - 54, 54, 54 + 0, 110, 113, 7, 8, 9, 10, 11, 12, 13, + 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, + 37, 38, 39, 40, 41, 42, 56, 57, 58, 59, + 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, + 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, + 80, 98, 99, 100, 101, 102, 103, 104, 105, 114, + 0, 3, 4, 6, 45, 3, 6, 3, 3, 45, + 5, 5, 5, 5, 5, 5, 45, 45, 45, 45, + 45, 3, 3, 26, 31, 32, 33, 34, 35, 36, + 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, + 3, 5, 97, 5, 29, 27, 95, 108, 109, 111, + 45, 45, 45, 45, 5, 3, 3, 45, 5, 3, + 3, 3, 5, 96, 3, 24, 25, 28, 92, 93, + 94, 98, 106, 107, 43, 112, 3, 45, 91, 6, + 30, 45, 81, 84, 85, 86, 87, 88, 89, 90, + 3, 29, 29, 45, 90, 45, 3, 45, 81, 82, + 83, 87, 45, 45, 45, 45, 81, 45, 45, 45, + 45, 45 }; #define yyerrok (yyerrstatus = 0) @@ -1671,150 +1633,152 @@ yyreduce: YY_REDUCE_PRINT (yyn); switch (yyn) { - case 12: -#line 152 "testpatterny.y" + case 3: +#line 140 "testpatterny.y" + { + } + break; + + case 4: +#line 145 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>cmykspec %d\n", (yyvsp[(2) - (2)].ival)); + fprintf(stderr, ">>>cmykspec\n"); global_image_type = "CMYK"; global_channel_depth = 4; global_invert_data = 0; - if ((yyvsp[(2) - (2)].ival) == 8 || (yyvsp[(2) - (2)].ival) == 16) - global_bit_depth = (yyvsp[(2) - (2)].ival); } break; - case 13: -#line 164 "testpatterny.y" + case 5: +#line 155 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>kcmyspec %d\n", (yyvsp[(2) - (2)].ival)); + fprintf(stderr, ">>>kcmyspec\n"); global_image_type = "KCMY"; global_channel_depth = 4; global_invert_data = 0; - if ((yyvsp[(2) - (2)].ival) == 8 || (yyvsp[(2) - (2)].ival) == 16) - global_bit_depth = (yyvsp[(2) - (2)].ival); } break; - case 14: -#line 176 "testpatterny.y" + case 6: +#line 165 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>rgbspec %d\n", (yyvsp[(2) - (2)].ival)); + fprintf(stderr, ">>>rgbspec\n"); global_image_type = "RGB"; global_channel_depth = 3; global_invert_data = 1; - if ((yyvsp[(2) - (2)].ival) == 8 || (yyvsp[(2) - (2)].ival) == 16) - global_bit_depth = (yyvsp[(2) - (2)].ival); } break; - case 15: -#line 188 "testpatterny.y" + case 7: +#line 175 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>cmyspec %d\n", (yyvsp[(2) - (2)].ival)); + fprintf(stderr, ">>>cmyspec\n"); global_image_type = "CMY"; global_channel_depth = 3; global_invert_data = 0; - if ((yyvsp[(2) - (2)].ival) == 8 || (yyvsp[(2) - (2)].ival) == 16) - global_bit_depth = (yyvsp[(2) - (2)].ival); } break; - case 16: -#line 200 "testpatterny.y" + case 8: +#line 185 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>grayspec %d\n", (yyvsp[(2) - (2)].ival)); + fprintf(stderr, ">>>grayspec\n"); global_image_type = "Grayscale"; global_channel_depth = 1; global_invert_data = 0; - if ((yyvsp[(2) - (2)].ival) == 8 || (yyvsp[(2) - (2)].ival) == 16) - global_bit_depth = (yyvsp[(2) - (2)].ival); } break; - case 17: -#line 212 "testpatterny.y" + case 9: +#line 195 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>whitespec %d\n", (yyvsp[(2) - (2)].ival)); + fprintf(stderr, ">>>whitespec\n"); global_image_type = "Whitescale"; global_channel_depth = 1; global_invert_data = 1; - if ((yyvsp[(2) - (2)].ival) == 8 || (yyvsp[(2) - (2)].ival) == 16) - global_bit_depth = (yyvsp[(2) - (2)].ival); } break; - case 18: -#line 224 "testpatterny.y" + case 10: +#line 205 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>extendedspec %d\n", (yyvsp[(2) - (3)].ival)); + fprintf(stderr, ">>>extendedspec %d\n", (yyvsp[(2) - (2)].ival)); global_image_type = "Raw"; global_invert_data = 0; - global_channel_depth = (yyvsp[(2) - (3)].ival); - if ((yyvsp[(2) - (3)].ival) == 8 || (yyvsp[(2) - (3)].ival) == 16) - global_bit_depth = (yyvsp[(3) - (3)].ival); + global_channel_depth = (yyvsp[(2) - (2)].ival); } break; - case 27: -#line 242 "testpatterny.y" + case 18: +#line 218 "testpatterny.y" { - int channel = find_color((yyvsp[(2) - (3)]).sval); if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>level %s %f\n", (yyvsp[(2) - (3)]).sval, (yyvsp[(3) - (3)]).dval); + fprintf(stderr, ">>>modespec2 %d\n", (yyvsp[(2) - (2)].ival)); + if ((yyvsp[(2) - (2)].ival) == 8 || (yyvsp[(2) - (2)].ival) == 16) + global_bit_depth = (yyvsp[(2) - (2)].ival); + } + break; + + case 22: +#line 232 "testpatterny.y" + { + int channel = find_color((yyvsp[(2) - (3)].sval)); + if (getenv("STP_TESTPATTERN_DEBUG")) + fprintf(stderr, ">>>level %s %f\n", (yyvsp[(2) - (3)].sval), (yyvsp[(3) - (3)].dval)); if (channel >= 0) - global_levels[channel] = (yyvsp[(3) - (3)]).dval; + global_levels[channel] = (yyvsp[(3) - (3)].dval); } break; - case 28: -#line 252 "testpatterny.y" + case 23: +#line 242 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>channel_level %d %f\n", (yyvsp[(2) - (3)].ival), (yyvsp[(3) - (3)]).dval); + fprintf(stderr, ">>>channel_level %d %f\n", (yyvsp[(2) - (3)].ival), (yyvsp[(3) - (3)].dval)); if ((yyvsp[(2) - (3)].ival) >= 0 && (yyvsp[(2) - (3)].ival) <= STP_CHANNEL_LIMIT) - global_levels[(yyvsp[(2) - (3)].ival)] = (yyvsp[(3) - (3)]).dval; + global_levels[(yyvsp[(2) - (3)].ival)] = (yyvsp[(3) - (3)].dval); } break; - case 29: -#line 261 "testpatterny.y" + case 24: +#line 251 "testpatterny.y" { - int channel = find_color((yyvsp[(2) - (3)]).sval); + int channel = find_color((yyvsp[(2) - (3)].sval)); if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>gamma %s %f\n", (yyvsp[(2) - (3)]).sval, (yyvsp[(3) - (3)]).dval); + fprintf(stderr, ">>>gamma %s %f\n", (yyvsp[(2) - (3)].sval), (yyvsp[(3) - (3)].dval)); if (channel >= 0) - global_gammas[channel] = (yyvsp[(3) - (3)]).dval; + global_gammas[channel] = (yyvsp[(3) - (3)].dval); } break; - case 30: -#line 271 "testpatterny.y" + case 25: +#line 261 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>channel_gamma %d %f\n", (yyvsp[(2) - (3)].ival), (yyvsp[(3) - (3)]).dval); + fprintf(stderr, ">>>channel_gamma %d %f\n", (yyvsp[(2) - (3)].ival), (yyvsp[(3) - (3)].dval)); if ((yyvsp[(2) - (3)].ival) >= 0 && (yyvsp[(2) - (3)].ival) <= STP_CHANNEL_LIMIT) - global_gammas[(yyvsp[(2) - (3)].ival)] = (yyvsp[(3) - (3)]).dval; + global_gammas[(yyvsp[(2) - (3)].ival)] = (yyvsp[(3) - (3)].dval); } break; - case 31: -#line 280 "testpatterny.y" + case 26: +#line 270 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>global_gamma %f\n", (yyvsp[(2) - (2)]).dval); - global_gamma = (yyvsp[(2) - (2)]).dval; + fprintf(stderr, ">>>global_gamma %f\n", (yyvsp[(2) - (2)].dval)); + global_gamma = (yyvsp[(2) - (2)].dval); } break; - case 32: -#line 287 "testpatterny.y" + case 27: +#line 277 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) fprintf(stderr, ">>>steps %d\n", (yyvsp[(2) - (2)].ival)); @@ -1822,17 +1786,17 @@ yyreduce: } break; - case 33: -#line 294 "testpatterny.y" + case 28: +#line 284 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>ink_limit %f\n", (yyvsp[(2) - (2)]).dval); - global_ink_limit = (yyvsp[(2) - (2)]).dval; + fprintf(stderr, ">>>ink_limit %f\n", (yyvsp[(2) - (2)].dval)); + global_ink_limit = (yyvsp[(2) - (2)].dval); } break; - case 34: -#line 301 "testpatterny.y" + case 29: +#line 291 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) fprintf(stderr, ">>>printer %s\n", (yyvsp[(2) - (2)].sval)); @@ -1841,8 +1805,8 @@ yyreduce: } break; - case 35: -#line 310 "testpatterny.y" + case 30: +#line 300 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) fprintf(stderr, ">>>page_size_name %s\n", (yyvsp[(2) - (2)].sval)); @@ -1851,8 +1815,8 @@ yyreduce: } break; - case 36: -#line 319 "testpatterny.y" + case 31: +#line 309 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) fprintf(stderr, ">>>page_size_custom %d %d\n", (yyvsp[(2) - (3)].ival), (yyvsp[(3) - (3)].ival)); @@ -1861,8 +1825,8 @@ yyreduce: } break; - case 39: -#line 331 "testpatterny.y" + case 34: +#line 321 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) fprintf(stderr, ">>>parameter_string %s %s\n", (yyvsp[(2) - (3)].sval), (yyvsp[(3) - (3)].sval)); @@ -1872,8 +1836,8 @@ yyreduce: } break; - case 40: -#line 341 "testpatterny.y" + case 35: +#line 331 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) fprintf(stderr, ">>>parameter_int %s %d\n", (yyvsp[(2) - (3)].sval), (yyvsp[(3) - (3)].ival)); @@ -1882,8 +1846,8 @@ yyreduce: } break; - case 41: -#line 350 "testpatterny.y" + case 36: +#line 340 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) fprintf(stderr, ">>>parameter_bool %s %d\n", (yyvsp[(2) - (3)].sval), (yyvsp[(3) - (3)].ival)); @@ -1892,18 +1856,18 @@ yyreduce: } break; - case 42: -#line 359 "testpatterny.y" + case 37: +#line 349 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>parameter_float %s %f\n", (yyvsp[(2) - (3)].sval), (yyvsp[(3) - (3)]).dval); - stp_set_float_parameter(global_vars, (yyvsp[(2) - (3)].sval), (yyvsp[(3) - (3)]).dval); + fprintf(stderr, ">>>parameter_float %s %f\n", (yyvsp[(2) - (3)].sval), (yyvsp[(3) - (3)].dval)); + stp_set_float_parameter(global_vars, (yyvsp[(2) - (3)].sval), (yyvsp[(3) - (3)].dval)); free((yyvsp[(2) - (3)].sval)); } break; - case 43: -#line 368 "testpatterny.y" + case 38: +#line 358 "testpatterny.y" { stp_curve_t *curve = stp_curve_create_from_string((yyvsp[(3) - (3)].sval)); if (getenv("STP_TESTPATTERN_DEBUG")) @@ -1917,53 +1881,53 @@ yyreduce: } break; - case 49: -#line 384 "testpatterny.y" + case 44: +#line 374 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>density %f\n", (yyvsp[(2) - (2)]).dval); - global_density = (yyvsp[(2) - (2)]).dval; + fprintf(stderr, ">>>density %f\n", (yyvsp[(2) - (2)].dval)); + global_density = (yyvsp[(2) - (2)].dval); } break; - case 50: -#line 391 "testpatterny.y" + case 45: +#line 381 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>top %f\n", (yyvsp[(2) - (2)]).dval); - global_xtop = (yyvsp[(2) - (2)]).dval; + fprintf(stderr, ">>>top %f\n", (yyvsp[(2) - (2)].dval)); + global_xtop = (yyvsp[(2) - (2)].dval); } break; - case 51: -#line 398 "testpatterny.y" + case 46: +#line 388 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>left %f\n", (yyvsp[(2) - (2)]).dval); - global_xleft = (yyvsp[(2) - (2)]).dval; + fprintf(stderr, ">>>left %f\n", (yyvsp[(2) - (2)].dval)); + global_xleft = (yyvsp[(2) - (2)].dval); } break; - case 52: -#line 405 "testpatterny.y" + case 47: +#line 395 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>hsize %f\n", (yyvsp[(2) - (2)]).dval); - global_hsize = (yyvsp[(2) - (2)]).dval; + fprintf(stderr, ">>>hsize %f\n", (yyvsp[(2) - (2)].dval)); + global_hsize = (yyvsp[(2) - (2)].dval); } break; - case 53: -#line 412 "testpatterny.y" + case 48: +#line 402 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>vsize %f\n", (yyvsp[(2) - (2)]).dval); - global_vsize = (yyvsp[(2) - (2)]).dval; + fprintf(stderr, ">>>vsize %f\n", (yyvsp[(2) - (2)].dval)); + global_vsize = (yyvsp[(2) - (2)].dval); } break; - case 54: -#line 419 "testpatterny.y" + case 49: +#line 409 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) fprintf(stderr, ">>>blackline %d\n", (yyvsp[(2) - (2)].ival)); @@ -1971,8 +1935,8 @@ yyreduce: } break; - case 55: -#line 427 "testpatterny.y" + case 50: +#line 417 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) fprintf(stderr, ">>>noscale %d\n", (yyvsp[(2) - (2)].ival)); @@ -1980,69 +1944,69 @@ yyreduce: } break; - case 56: -#line 435 "testpatterny.y" + case 51: +#line 425 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>color_block1 %f %f %f (%d)\n", (yyvsp[(1) - (3)]).dval, (yyvsp[(2) - (3)]).dval, (yyvsp[(3) - (3)]).dval, + fprintf(stderr, ">>>color_block1 %f %f %f (%d)\n", (yyvsp[(1) - (3)].dval), (yyvsp[(2) - (3)].dval), (yyvsp[(3) - (3)].dval), current_index); if (current_index < STP_CHANNEL_LIMIT) { - current_testpattern->d.pattern.mins[current_index] = (yyvsp[(1) - (3)]).dval; - current_testpattern->d.pattern.vals[current_index] = (yyvsp[(2) - (3)]).dval; - current_testpattern->d.pattern.gammas[current_index] = (yyvsp[(3) - (3)]).dval; + current_testpattern->d.pattern.mins[current_index] = (yyvsp[(1) - (3)].dval); + current_testpattern->d.pattern.vals[current_index] = (yyvsp[(2) - (3)].dval); + current_testpattern->d.pattern.gammas[current_index] = (yyvsp[(3) - (3)].dval); current_index++; } } break; - case 62: -#line 459 "testpatterny.y" + case 57: +#line 449 "testpatterny.y" { - int channel = find_color((yyvsp[(1) - (4)]).sval); + int channel = find_color((yyvsp[(1) - (4)].sval)); if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>color_block2a %s %f %f %f\n", (yyvsp[(1) - (4)]).sval, (yyvsp[(2) - (4)]).dval, (yyvsp[(3) - (4)]).dval, (yyvsp[(4) - (4)]).dval); + fprintf(stderr, ">>>color_block2a %s %f %f %f\n", (yyvsp[(1) - (4)].sval), (yyvsp[(2) - (4)].dval), (yyvsp[(3) - (4)].dval), (yyvsp[(4) - (4)].dval)); if (channel >= 0 && channel < STP_CHANNEL_LIMIT) { - current_testpattern->d.pattern.mins[channel] = (yyvsp[(2) - (4)]).dval; - current_testpattern->d.pattern.vals[channel] = (yyvsp[(3) - (4)]).dval; - current_testpattern->d.pattern.gammas[channel] = (yyvsp[(4) - (4)]).dval; + current_testpattern->d.pattern.mins[channel] = (yyvsp[(2) - (4)].dval); + current_testpattern->d.pattern.vals[channel] = (yyvsp[(3) - (4)].dval); + current_testpattern->d.pattern.gammas[channel] = (yyvsp[(4) - (4)].dval); } } break; - case 63: -#line 473 "testpatterny.y" + case 58: +#line 463 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>color_block2b %d %f %f %f\n", (yyvsp[(2) - (5)].ival), (yyvsp[(3) - (5)]).dval, (yyvsp[(4) - (5)]).dval, (yyvsp[(5) - (5)]).dval); + fprintf(stderr, ">>>color_block2b %d %f %f %f\n", (yyvsp[(2) - (5)].ival), (yyvsp[(3) - (5)].dval), (yyvsp[(4) - (5)].dval), (yyvsp[(5) - (5)].dval)); if ((yyvsp[(2) - (5)].ival) >= 0 && (yyvsp[(2) - (5)].ival) < STP_CHANNEL_LIMIT) { - current_testpattern->d.pattern.mins[(yyvsp[(2) - (5)].ival)] = (yyvsp[(3) - (5)]).dval; - current_testpattern->d.pattern.vals[(yyvsp[(2) - (5)].ival)] = (yyvsp[(4) - (5)]).dval; - current_testpattern->d.pattern.gammas[(yyvsp[(2) - (5)].ival)] = (yyvsp[(5) - (5)]).dval; + current_testpattern->d.pattern.mins[(yyvsp[(2) - (5)].ival)] = (yyvsp[(3) - (5)].dval); + current_testpattern->d.pattern.vals[(yyvsp[(2) - (5)].ival)] = (yyvsp[(4) - (5)].dval); + current_testpattern->d.pattern.gammas[(yyvsp[(2) - (5)].ival)] = (yyvsp[(5) - (5)].dval); } } break; - case 72: -#line 498 "testpatterny.y" + case 67: +#line 488 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>patvars %f %f %f %f %f\n", (yyvsp[(1) - (5)]).dval, (yyvsp[(2) - (5)]).dval, (yyvsp[(3) - (5)]).dval, (yyvsp[(4) - (5)]).dval, (yyvsp[(5) - (5)]).dval); + fprintf(stderr, ">>>patvars %f %f %f %f %f\n", (yyvsp[(1) - (5)].dval), (yyvsp[(2) - (5)].dval), (yyvsp[(3) - (5)].dval), (yyvsp[(4) - (5)].dval), (yyvsp[(5) - (5)].dval)); current_testpattern->type = E_PATTERN; - current_testpattern->d.pattern.lower = (yyvsp[(1) - (5)]).dval; - current_testpattern->d.pattern.upper = (yyvsp[(2) - (5)]).dval; - current_testpattern->d.pattern.levels[1] = (yyvsp[(3) - (5)]).dval; - current_testpattern->d.pattern.levels[2] = (yyvsp[(4) - (5)]).dval; - current_testpattern->d.pattern.levels[3] = (yyvsp[(5) - (5)]).dval; + current_testpattern->d.pattern.lower = (yyvsp[(1) - (5)].dval); + current_testpattern->d.pattern.upper = (yyvsp[(2) - (5)].dval); + current_testpattern->d.pattern.levels[1] = (yyvsp[(3) - (5)].dval); + current_testpattern->d.pattern.levels[2] = (yyvsp[(4) - (5)].dval); + current_testpattern->d.pattern.levels[3] = (yyvsp[(5) - (5)].dval); current_testpattern = get_next_testpattern(); current_index = 0; } break; - case 74: -#line 516 "testpatterny.y" + case 69: +#line 506 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) fprintf(stderr, ">>>xpattern\n"); @@ -2057,8 +2021,8 @@ yyreduce: } break; - case 75: -#line 531 "testpatterny.y" + case 70: +#line 521 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) fprintf(stderr, ">>>grid %d\n", (yyvsp[(2) - (2)].ival)); @@ -2069,8 +2033,8 @@ yyreduce: } break; - case 76: -#line 542 "testpatterny.y" + case 71: +#line 532 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) fprintf(stderr, ">>>image %d %d\n", (yyvsp[(2) - (3)].ival), (yyvsp[(3) - (3)].ival)); @@ -2087,58 +2051,16 @@ yyreduce: } break; - case 77: -#line 559 "testpatterny.y" - { - fprintf(stderr,"%s",(yyvsp[(2) - (2)].sval)); - free((yyvsp[(2) - (2)].sval)); - } - break; - - case 78: -#line 565 "testpatterny.y" - { - fprintf(stderr,"%s%s", (yyvsp[(2) - (3)].sval), (yyvsp[(3) - (3)].sval)); - free((yyvsp[(2) - (3)].sval)); - free((yyvsp[(3) - (3)].sval)); - } - break; - - case 79: -#line 572 "testpatterny.y" - { - fprintf(stderr,"%s%s%s", (yyvsp[(2) - (4)].sval), (yyvsp[(3) - (4)].sval), (yyvsp[(4) - (4)].sval)); - free((yyvsp[(2) - (4)].sval)); - free((yyvsp[(3) - (4)].sval)); - free((yyvsp[(4) - (4)].sval)); - } - break; - - case 80: -#line 580 "testpatterny.y" - { - fprintf(stderr, "%s%s%s%s", (yyvsp[(2) - (5)].sval), (yyvsp[(3) - (5)].sval), (yyvsp[(4) - (5)].sval), (yyvsp[(5) - (5)].sval)); - free((yyvsp[(2) - (5)].sval)); - free((yyvsp[(3) - (5)].sval)); - free((yyvsp[(4) - (5)].sval)); - free((yyvsp[(5) - (5)].sval)); - } - break; - - case 81: -#line 589 "testpatterny.y" + case 72: +#line 549 "testpatterny.y" { - fprintf(stderr, "%s%s%s%s%s", (yyvsp[(2) - (6)].sval), (yyvsp[(3) - (6)].sval), (yyvsp[(4) - (6)].sval), (yyvsp[(5) - (6)].sval), (yyvsp[(6) - (6)].sval)); - free((yyvsp[(2) - (6)].sval)); - free((yyvsp[(3) - (6)].sval)); - free((yyvsp[(4) - (6)].sval)); - free((yyvsp[(5) - (6)].sval)); - free((yyvsp[(6) - (6)].sval)); + fprintf(stderr,"%s",(yyvsp[(1) - (1)].sval)); + free((yyvsp[(1) - (1)].sval)); } break; - case 88: -#line 606 "testpatterny.y" + case 76: +#line 562 "testpatterny.y" { close_output(); if (global_output) @@ -2148,45 +2070,45 @@ yyreduce: } break; - case 89: -#line 615 "testpatterny.y" + case 77: +#line 572 "testpatterny.y" { global_output = (yyvsp[(2) - (2)].sval); } break; - case 93: -#line 626 "testpatterny.y" + case 80: +#line 581 "testpatterny.y" { start_job = 1; } break; - case 94: -#line 630 "testpatterny.y" + case 81: +#line 585 "testpatterny.y" { end_job = 1; } break; - case 117: -#line 640 "testpatterny.y" + case 104: +#line 595 "testpatterny.y" { global_did_something = 1; } break; - case 122: -#line 647 "testpatterny.y" + case 109: +#line 602 "testpatterny.y" { global_did_something = 1; } break; - case 125: -#line 654 "testpatterny.y" + case 112: +#line 609 "testpatterny.y" { global_did_something = 1; } break; - case 131: -#line 664 "testpatterny.y" + case 118: +#line 619 "testpatterny.y" { return 0; } break; - case 132: -#line 668 "testpatterny.y" + case 119: +#line 623 "testpatterny.y" { current_testpattern = get_next_testpattern(); } @@ -2194,7 +2116,7 @@ yyreduce: /* Line 1267 of yacc.c. */ -#line 2198 "testpatterny.c" +#line 2120 "testpatterny.c" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -2408,6 +2330,6 @@ yyreturn: } -#line 674 "testpatterny.y" +#line 629 "testpatterny.y" diff --git a/src/testpattern/testpatterny.h b/src/testpattern/testpatterny.h index c36836e..c0aea0f 100644 --- a/src/testpattern/testpatterny.h +++ b/src/testpattern/testpatterny.h @@ -42,104 +42,88 @@ tINT = 258, tDOUBLE = 259, tSTRING = 260, - CYAN = 261, - L_CYAN = 262, - MAGENTA = 263, - L_MAGENTA = 264, - YELLOW = 265, - D_YELLOW = 266, - BLACK = 267, - L_BLACK = 268, - GAMMA = 269, - LEVEL = 270, - STEPS = 271, - INK_LIMIT = 272, - PRINTER = 273, - PARAMETER = 274, - PARAMETER_INT = 275, - PARAMETER_BOOL = 276, - PARAMETER_FLOAT = 277, - PARAMETER_CURVE = 278, - DENSITY = 279, - TOP = 280, - LEFT = 281, - HSIZE = 282, - VSIZE = 283, - BLACKLINE = 284, - NOSCALE = 285, - PATTERN = 286, - XPATTERN = 287, - EXTENDED = 288, - IMAGE = 289, - GRID = 290, - SEMI = 291, - CHANNEL = 292, - CMYK = 293, - KCMY = 294, - RGB = 295, - CMY = 296, - GRAY = 297, - WHITE = 298, - RAW = 299, - MODE = 300, - PAGESIZE = 301, - MESSAGE = 302, - OUTPUT = 303, - START_JOB = 304, - END_JOB = 305, - END = 306 + COLOR = 261, + GAMMA = 262, + LEVEL = 263, + STEPS = 264, + INK_LIMIT = 265, + PRINTER = 266, + PARAMETER = 267, + PARAMETER_INT = 268, + PARAMETER_BOOL = 269, + PARAMETER_FLOAT = 270, + PARAMETER_CURVE = 271, + DENSITY = 272, + TOP = 273, + LEFT = 274, + HSIZE = 275, + VSIZE = 276, + BLACKLINE = 277, + NOSCALE = 278, + PATTERN = 279, + XPATTERN = 280, + EXTENDED = 281, + IMAGE = 282, + GRID = 283, + SEMI = 284, + CHANNEL = 285, + CMYK = 286, + KCMY = 287, + RGB = 288, + CMY = 289, + GRAY = 290, + WHITE = 291, + MODE = 292, + PAGESIZE = 293, + MESSAGE = 294, + OUTPUT = 295, + START_JOB = 296, + END_JOB = 297, + END = 298 }; #endif /* Tokens. */ #define tINT 258 #define tDOUBLE 259 #define tSTRING 260 -#define CYAN 261 -#define L_CYAN 262 -#define MAGENTA 263 -#define L_MAGENTA 264 -#define YELLOW 265 -#define D_YELLOW 266 -#define BLACK 267 -#define L_BLACK 268 -#define GAMMA 269 -#define LEVEL 270 -#define STEPS 271 -#define INK_LIMIT 272 -#define PRINTER 273 -#define PARAMETER 274 -#define PARAMETER_INT 275 -#define PARAMETER_BOOL 276 -#define PARAMETER_FLOAT 277 -#define PARAMETER_CURVE 278 -#define DENSITY 279 -#define TOP 280 -#define LEFT 281 -#define HSIZE 282 -#define VSIZE 283 -#define BLACKLINE 284 -#define NOSCALE 285 -#define PATTERN 286 -#define XPATTERN 287 -#define EXTENDED 288 -#define IMAGE 289 -#define GRID 290 -#define SEMI 291 -#define CHANNEL 292 -#define CMYK 293 -#define KCMY 294 -#define RGB 295 -#define CMY 296 -#define GRAY 297 -#define WHITE 298 -#define RAW 299 -#define MODE 300 -#define PAGESIZE 301 -#define MESSAGE 302 -#define OUTPUT 303 -#define START_JOB 304 -#define END_JOB 305 -#define END 306 +#define COLOR 261 +#define GAMMA 262 +#define LEVEL 263 +#define STEPS 264 +#define INK_LIMIT 265 +#define PRINTER 266 +#define PARAMETER 267 +#define PARAMETER_INT 268 +#define PARAMETER_BOOL 269 +#define PARAMETER_FLOAT 270 +#define PARAMETER_CURVE 271 +#define DENSITY 272 +#define TOP 273 +#define LEFT 274 +#define HSIZE 275 +#define VSIZE 276 +#define BLACKLINE 277 +#define NOSCALE 278 +#define PATTERN 279 +#define XPATTERN 280 +#define EXTENDED 281 +#define IMAGE 282 +#define GRID 283 +#define SEMI 284 +#define CHANNEL 285 +#define CMYK 286 +#define KCMY 287 +#define RGB 288 +#define CMY 289 +#define GRAY 290 +#define WHITE 291 +#define MODE 292 +#define PAGESIZE 293 +#define MESSAGE 294 +#define OUTPUT 295 +#define START_JOB 296 +#define END_JOB 297 +#define END 298 diff --git a/src/testpattern/testpatterny.y b/src/testpattern/testpatterny.y index 7682d8d..c00abeb 100644 --- a/src/testpattern/testpatterny.y +++ b/src/testpattern/testpatterny.y @@ -1,5 +1,5 @@ /* - * "$Id: testpatterny.y,v 1.33 2008/12/07 20:03:08 rlk Exp $" + * "$Id: testpatterny.y,v 1.39 2009/06/14 19:38:08 rlk Exp $" * * Test pattern generator for Gimp-Print * @@ -90,15 +90,8 @@ find_color(const char *name) %token <ival> tINT %token <dval> tDOUBLE %token <sval> tSTRING +%token <sval> COLOR -%token CYAN -%token L_CYAN -%token MAGENTA -%token L_MAGENTA -%token YELLOW -%token D_YELLOW -%token BLACK -%token L_BLACK %token GAMMA %token LEVEL %token STEPS @@ -129,7 +122,6 @@ find_color(const char *name) %token CMY %token GRAY %token WHITE -%token RAW %token MODE %token PAGESIZE %token MESSAGE @@ -138,101 +130,99 @@ find_color(const char *name) %token END_JOB %token END +%type <dval> NUMBER + %start Thing %% -COLOR: CYAN | L_CYAN | MAGENTA | L_MAGENTA - | YELLOW | D_YELLOW | BLACK | L_BLACK -; NUMBER: tDOUBLE | tINT + { + } ; -cmykspec: CMYK tINT +cmykspec: CMYK { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>cmykspec %d\n", $2); + fprintf(stderr, ">>>cmykspec\n"); global_image_type = "CMYK"; global_channel_depth = 4; global_invert_data = 0; - if ($2 == 8 || $2 == 16) - global_bit_depth = $2; } ; -kcmyspec: KCMY tINT +kcmyspec: KCMY { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>kcmyspec %d\n", $2); + fprintf(stderr, ">>>kcmyspec\n"); global_image_type = "KCMY"; global_channel_depth = 4; global_invert_data = 0; - if ($2 == 8 || $2 == 16) - global_bit_depth = $2; } ; -rgbspec: RGB tINT +rgbspec: RGB { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>rgbspec %d\n", $2); + fprintf(stderr, ">>>rgbspec\n"); global_image_type = "RGB"; global_channel_depth = 3; global_invert_data = 1; - if ($2 == 8 || $2 == 16) - global_bit_depth = $2; } ; -cmyspec: CMY tINT +cmyspec: CMY { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>cmyspec %d\n", $2); + fprintf(stderr, ">>>cmyspec\n"); global_image_type = "CMY"; global_channel_depth = 3; global_invert_data = 0; - if ($2 == 8 || $2 == 16) - global_bit_depth = $2; } ; -grayspec: GRAY tINT +grayspec: GRAY { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>grayspec %d\n", $2); + fprintf(stderr, ">>>grayspec\n"); global_image_type = "Grayscale"; global_channel_depth = 1; global_invert_data = 0; - if ($2 == 8 || $2 == 16) - global_bit_depth = $2; } ; -whitespec: WHITE tINT +whitespec: WHITE { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>whitespec %d\n", $2); + fprintf(stderr, ">>>whitespec\n"); global_image_type = "Whitescale"; global_channel_depth = 1; global_invert_data = 1; - if ($2 == 8 || $2 == 16) - global_bit_depth = $2; } ; -extendedspec: EXTENDED tINT tINT +extendedspec: EXTENDED tINT { if (getenv("STP_TESTPATTERN_DEBUG")) fprintf(stderr, ">>>extendedspec %d\n", $2); global_image_type = "Raw"; global_invert_data = 0; global_channel_depth = $2; - if ($2 == 8 || $2 == 16) - global_bit_depth = $3; } ; -modespec: cmykspec | kcmyspec | rgbspec | cmyspec | grayspec | whitespec | extendedspec +modespec1: cmykspec | kcmyspec | rgbspec | cmyspec | grayspec | whitespec | extendedspec +; + +modespec2: modespec1 tINT + { + if (getenv("STP_TESTPATTERN_DEBUG")) + fprintf(stderr, ">>>modespec2 %d\n", $2); + if ($2 == 8 || $2 == 16) + global_bit_depth = $2; + } + +modespec: modespec1 | modespec2 ; inputspec: MODE modespec @@ -240,47 +230,47 @@ inputspec: MODE modespec level: LEVEL COLOR NUMBER { - int channel = find_color($2.sval); + int channel = find_color($2); if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>level %s %f\n", $2.sval, $3.dval); + fprintf(stderr, ">>>level %s %f\n", $2, $3); if (channel >= 0) - global_levels[channel] = $3.dval; + global_levels[channel] = $3; } ; channel_level: LEVEL tINT NUMBER { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>channel_level %d %f\n", $2, $3.dval); + fprintf(stderr, ">>>channel_level %d %f\n", $2, $3); if ($2 >= 0 && $2 <= STP_CHANNEL_LIMIT) - global_levels[$2] = $3.dval; + global_levels[$2] = $3; } ; gamma: GAMMA COLOR NUMBER { - int channel = find_color($2.sval); + int channel = find_color($2); if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>gamma %s %f\n", $2.sval, $3.dval); + fprintf(stderr, ">>>gamma %s %f\n", $2, $3); if (channel >= 0) - global_gammas[channel] = $3.dval; + global_gammas[channel] = $3; } ; channel_gamma: GAMMA tINT NUMBER { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>channel_gamma %d %f\n", $2, $3.dval); + fprintf(stderr, ">>>channel_gamma %d %f\n", $2, $3); if ($2 >= 0 && $2 <= STP_CHANNEL_LIMIT) - global_gammas[$2] = $3.dval; + global_gammas[$2] = $3; } ; global_gamma: GAMMA NUMBER { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>global_gamma %f\n", $2.dval); - global_gamma = $2.dval; + fprintf(stderr, ">>>global_gamma %f\n", $2); + global_gamma = $2; } ; steps: STEPS tINT @@ -293,8 +283,8 @@ steps: STEPS tINT ink_limit: INK_LIMIT NUMBER { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>ink_limit %f\n", $2.dval); - global_ink_limit = $2.dval; + fprintf(stderr, ">>>ink_limit %f\n", $2); + global_ink_limit = $2; } ; printer: PRINTER tSTRING @@ -358,8 +348,8 @@ parameter_bool: PARAMETER_BOOL tSTRING tINT parameter_float: PARAMETER_FLOAT tSTRING NUMBER { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>parameter_float %s %f\n", $2, $3.dval); - stp_set_float_parameter(global_vars, $2, $3.dval); + fprintf(stderr, ">>>parameter_float %s %f\n", $2, $3); + stp_set_float_parameter(global_vars, $2, $3); free($2); } ; @@ -383,36 +373,36 @@ parameter: parameter_string | parameter_int | parameter_float | parameter_curve density: DENSITY NUMBER { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>density %f\n", $2.dval); - global_density = $2.dval; + fprintf(stderr, ">>>density %f\n", $2); + global_density = $2; } ; top: TOP NUMBER { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>top %f\n", $2.dval); - global_xtop = $2.dval; + fprintf(stderr, ">>>top %f\n", $2); + global_xtop = $2; } ; left: LEFT NUMBER { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>left %f\n", $2.dval); - global_xleft = $2.dval; + fprintf(stderr, ">>>left %f\n", $2); + global_xleft = $2; } ; hsize: HSIZE NUMBER { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>hsize %f\n", $2.dval); - global_hsize = $2.dval; + fprintf(stderr, ">>>hsize %f\n", $2); + global_hsize = $2; } ; vsize: VSIZE NUMBER { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>vsize %f\n", $2.dval); - global_vsize = $2.dval; + fprintf(stderr, ">>>vsize %f\n", $2); + global_vsize = $2; } ; blackline: BLACKLINE tINT @@ -434,13 +424,13 @@ noscale: NOSCALE tINT color_block1: NUMBER NUMBER NUMBER { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>color_block1 %f %f %f (%d)\n", $1.dval, $2.dval, $3.dval, + fprintf(stderr, ">>>color_block1 %f %f %f (%d)\n", $1, $2, $3, current_index); if (current_index < STP_CHANNEL_LIMIT) { - current_testpattern->d.pattern.mins[current_index] = $1.dval; - current_testpattern->d.pattern.vals[current_index] = $2.dval; - current_testpattern->d.pattern.gammas[current_index] = $3.dval; + current_testpattern->d.pattern.mins[current_index] = $1; + current_testpattern->d.pattern.vals[current_index] = $2; + current_testpattern->d.pattern.gammas[current_index] = $3; current_index++; } } @@ -457,14 +447,14 @@ color_blocks1: color_block1 color_blocks1b color_block2a: COLOR NUMBER NUMBER NUMBER { - int channel = find_color($1.sval); + int channel = find_color($1); if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>color_block2a %s %f %f %f\n", $1.sval, $2.dval, $3.dval, $4.dval); + fprintf(stderr, ">>>color_block2a %s %f %f %f\n", $1, $2, $3, $4); if (channel >= 0 && channel < STP_CHANNEL_LIMIT) { - current_testpattern->d.pattern.mins[channel] = $2.dval; - current_testpattern->d.pattern.vals[channel] = $3.dval; - current_testpattern->d.pattern.gammas[channel] = $4.dval; + current_testpattern->d.pattern.mins[channel] = $2; + current_testpattern->d.pattern.vals[channel] = $3; + current_testpattern->d.pattern.gammas[channel] = $4; } } ; @@ -472,12 +462,12 @@ color_block2a: COLOR NUMBER NUMBER NUMBER color_block2b: CHANNEL tINT NUMBER NUMBER NUMBER { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>color_block2b %d %f %f %f\n", $2, $3.dval, $4.dval, $5.dval); + fprintf(stderr, ">>>color_block2b %d %f %f %f\n", $2, $3, $4, $5); if ($2 >= 0 && $2 < STP_CHANNEL_LIMIT) { - current_testpattern->d.pattern.mins[$2] = $3.dval; - current_testpattern->d.pattern.vals[$2] = $4.dval; - current_testpattern->d.pattern.gammas[$2] = $5.dval; + current_testpattern->d.pattern.mins[$2] = $3; + current_testpattern->d.pattern.vals[$2] = $4; + current_testpattern->d.pattern.gammas[$2] = $5; } } ; @@ -497,13 +487,13 @@ color_blocks: color_blocks1 | color_blocks2 patvars: NUMBER NUMBER NUMBER NUMBER NUMBER { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>patvars %f %f %f %f %f\n", $1.dval, $2.dval, $3.dval, $4.dval, $5.dval); + fprintf(stderr, ">>>patvars %f %f %f %f %f\n", $1, $2, $3, $4, $5); current_testpattern->type = E_PATTERN; - current_testpattern->d.pattern.lower = $1.dval; - current_testpattern->d.pattern.upper = $2.dval; - current_testpattern->d.pattern.levels[1] = $3.dval; - current_testpattern->d.pattern.levels[2] = $4.dval; - current_testpattern->d.pattern.levels[3] = $5.dval; + current_testpattern->d.pattern.lower = $1; + current_testpattern->d.pattern.upper = $2; + current_testpattern->d.pattern.levels[1] = $3; + current_testpattern->d.pattern.levels[2] = $4; + current_testpattern->d.pattern.levels[3] = $5; current_testpattern = get_next_testpattern(); current_index = 0; } @@ -555,51 +545,17 @@ image: IMAGE tINT tINT } ; -Message0: MESSAGE tSTRING - { - fprintf(stderr,"%s",$2); - free($2); - } -; -Message1: MESSAGE tSTRING tSTRING - { - fprintf(stderr,"%s%s", $2, $3); - free($2); - free($3); - } -; -Message2: MESSAGE tSTRING tSTRING tSTRING - { - fprintf(stderr,"%s%s%s", $2, $3, $4); - free($2); - free($3); - free($4); - } -; -Message3: MESSAGE tSTRING tSTRING tSTRING tSTRING - { - fprintf(stderr, "%s%s%s%s", $2, $3, $4, $5); - free($2); - free($3); - free($4); - free($5); - } -; -Message4: MESSAGE tSTRING tSTRING tSTRING tSTRING tSTRING +Message: tSTRING { - fprintf(stderr, "%s%s%s%s%s", $2, $3, $4, $5, $6); - free($2); - free($3); - free($4); - free($5); - free($6); + fprintf(stderr,"%s",$1); + free($1); } ; -A_Message: Message0 | Message1 | Message2 | Message3 | Message4 +Messages: /* empty */ | Messages Message ; -message: A_Message +message: MESSAGE Messages ; Output0: OUTPUT @@ -610,16 +566,15 @@ Output0: OUTPUT global_output = NULL; output = stdout; } +; Output1: OUTPUT tSTRING { global_output = $2; } - -A_Output: Output0 | Output1 ; -output: A_Output +output: Output0 | Output1 ; start_job: START_JOB @@ -657,7 +612,7 @@ Image: image Rules: /* empty */ | Rules Rule ; -Output: Patterns | Image +Print: Patterns | Image ; EOF: /* empty */ | END SEMI @@ -668,7 +623,7 @@ Thing: Rules { current_testpattern = get_next_testpattern(); } - Output EOF + Print EOF ; %% diff --git a/src/xml/Makefile.am b/src/xml/Makefile.am index d202566..09ebcd8 100644 --- a/src/xml/Makefile.am +++ b/src/xml/Makefile.am @@ -1,4 +1,4 @@ -## $Id: Makefile.am,v 1.4 2008/11/01 18:42:11 rleigh Exp $ +## $Id: Makefile.am,v 1.5 2009/05/30 14:10:31 rlk Exp $ ## Copyright (C) 2008 Robert Krawitz ## ## This program is free software; you can redistribute it and/or modify @@ -56,7 +56,7 @@ xmli18n-tmp.h: xml-stamp extract-strings mv $@.tmp $@ -dist-hook: xmli18n-tmp.h +dist-hook: xmli18n-tmp.h xml-stamp # xmli18n-tmp.h is needed by po/POTFILES.in at dist time ## Clean diff --git a/src/xml/Makefile.in b/src/xml/Makefile.in index 1fbed1d..acf4061 100644 --- a/src/xml/Makefile.in +++ b/src/xml/Makefile.in @@ -46,11 +46,14 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \ - $(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \ - $(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/stp.m4 \ + $(top_srcdir)/m4/stp_cups.m4 $(top_srcdir)/m4/stp_gimp.m4 \ + $(top_srcdir)/m4/stp_option.m4 $(top_srcdir)/m4/stp_release.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs @@ -115,10 +118,6 @@ CUPS_CFLAGS = @CUPS_CFLAGS@ CUPS_CONFIG = @CUPS_CONFIG@ CUPS_LIBS = @CUPS_LIBS@ CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DB2HTML = @DB2HTML@ DB2PDF = @DB2PDF@ @@ -128,16 +127,15 @@ DEPDIR = @DEPDIR@ DIALOG = @DIALOG@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ DVIPDF = @DVIPDF@ DVIPS = @DVIPS@ -ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ FIND = @FIND@ FOOMATIC_CONFIGURE = @FOOMATIC_CONFIGURE@ FOOMATIC_KITLOAD = @FOOMATIC_KITLOAD@ @@ -182,6 +180,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTLLIBS = @INTLLIBS@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -193,6 +192,7 @@ LIBREADLINE_DEPS = @LIBREADLINE_DEPS@ LIBS = $(INTLLIBS) @LIBS@ LIBTOOL = @LIBTOOL@ LIBTOOL_DEPS = @LIBTOOL_DEPS@ +LIPO = @LIPO@ LN_S = @LN_S@ LTALLOCA = @LTALLOCA@ LTLIBICONV = @LTLIBICONV@ @@ -205,8 +205,12 @@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ +NM = @NM@ NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -240,8 +244,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -286,6 +289,7 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -298,6 +302,7 @@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS) @@ -731,7 +736,7 @@ xmli18n-tmp.h: xml-stamp extract-strings ./extract-strings `cat xml-stamp | sed -e 's;^;$(srcdir)/;'` > $@.tmp mv $@.tmp $@ -dist-hook: xmli18n-tmp.h +dist-hook: xmli18n-tmp.h xml-stamp # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/src/xml/escp2/Makefile.am b/src/xml/escp2/Makefile.am index 4673658..5e60f6f 100644 --- a/src/xml/escp2/Makefile.am +++ b/src/xml/escp2/Makefile.am @@ -1,4 +1,4 @@ -## $Id: Makefile.am,v 1.8 2008/10/24 00:37:14 rleigh Exp $ +## $Id: Makefile.am,v 1.9 2009/05/30 14:10:32 rlk Exp $ ## Copyright (C) 2008 Robert Krawitz ## ## This program is free software; you can redistribute it and/or modify @@ -50,6 +50,8 @@ xml-stamp: media/xml-stamp \ mv $@.tmp $@ all-local: xml-stamp + +dist-hook: xml-stamp ## Clean CLEANFILES = xml-stamp diff --git a/src/xml/escp2/Makefile.in b/src/xml/escp2/Makefile.in index 17852a1..f4a8999 100644 --- a/src/xml/escp2/Makefile.in +++ b/src/xml/escp2/Makefile.in @@ -43,11 +43,14 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \ - $(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \ - $(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/stp.m4 \ + $(top_srcdir)/m4/stp_cups.m4 $(top_srcdir)/m4/stp_gimp.m4 \ + $(top_srcdir)/m4/stp_option.m4 $(top_srcdir)/m4/stp_release.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs @@ -87,10 +90,6 @@ CUPS_CFLAGS = @CUPS_CFLAGS@ CUPS_CONFIG = @CUPS_CONFIG@ CUPS_LIBS = @CUPS_LIBS@ CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DB2HTML = @DB2HTML@ DB2PDF = @DB2PDF@ @@ -100,16 +99,15 @@ DEPDIR = @DEPDIR@ DIALOG = @DIALOG@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ DVIPDF = @DVIPDF@ DVIPS = @DVIPS@ -ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ FIND = @FIND@ FOOMATIC_CONFIGURE = @FOOMATIC_CONFIGURE@ FOOMATIC_KITLOAD = @FOOMATIC_KITLOAD@ @@ -154,6 +152,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTLLIBS = @INTLLIBS@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -165,6 +164,7 @@ LIBREADLINE_DEPS = @LIBREADLINE_DEPS@ LIBS = $(INTLLIBS) @LIBS@ LIBTOOL = @LIBTOOL@ LIBTOOL_DEPS = @LIBTOOL_DEPS@ +LIPO = @LIPO@ LN_S = @LN_S@ LTALLOCA = @LTALLOCA@ LTLIBICONV = @LTLIBICONV@ @@ -177,8 +177,12 @@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ +NM = @NM@ NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -212,8 +216,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -258,6 +261,7 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -270,6 +274,7 @@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS) @@ -497,6 +502,9 @@ distdir: $(DISTFILES) || exit 1; \ fi; \ done + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$(top_distdir)" distdir="$(distdir)" \ + dist-hook check-am: all-am check: check-recursive all-am: Makefile all-local @@ -587,7 +595,7 @@ uninstall-am: .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am all-local check check-am clean clean-generic \ - clean-libtool ctags ctags-recursive distclean \ + clean-libtool ctags ctags-recursive dist-hook distclean \ distclean-generic distclean-libtool distclean-tags distdir dvi \ dvi-am html html-am info info-am install install-am \ install-data install-data-am install-dvi install-dvi-am \ @@ -636,6 +644,8 @@ xml-stamp: media/xml-stamp \ mv $@.tmp $@ all-local: xml-stamp + +dist-hook: xml-stamp # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/src/xml/escp2/inks/Makefile.am b/src/xml/escp2/inks/Makefile.am index 5095c6a..9879089 100644 --- a/src/xml/escp2/inks/Makefile.am +++ b/src/xml/escp2/inks/Makefile.am @@ -1,4 +1,4 @@ -## $Id: Makefile.am,v 1.7 2008/12/07 20:03:09 rlk Exp $ +## $Id: Makefile.am,v 1.9 2009/05/30 14:10:32 rlk Exp $ ## Copyright (C) 2008 Robert Krawitz ## ## This program is free software; you can redistribute it and/or modify @@ -43,6 +43,7 @@ pkgxmldata_DATA = \ f360_photo7_japan.xml \ f360_ultrachrome.xml \ f360_ultrachrome_k3.xml \ + f360_ultrachrome_k3v.xml \ nx100.xml \ photo_gen0.xml \ photo_gen1.xml \ @@ -73,6 +74,7 @@ xml-stamp: $(pkgxmldata_DATA) Makefile.am all-local: xml-stamp +dist-hook: xml-stamp CLEANFILES = xmli18n-tmp.h xml-stamp xml-stamp.tmp EXTRA_DIST = $(pkgxmldata_DATA) diff --git a/src/xml/escp2/inks/Makefile.in b/src/xml/escp2/inks/Makefile.in index 904de98..993abe3 100644 --- a/src/xml/escp2/inks/Makefile.in +++ b/src/xml/escp2/inks/Makefile.in @@ -44,11 +44,14 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \ - $(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \ - $(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/stp.m4 \ + $(top_srcdir)/m4/stp_cups.m4 $(top_srcdir)/m4/stp_gimp.m4 \ + $(top_srcdir)/m4/stp_option.m4 $(top_srcdir)/m4/stp_release.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs @@ -85,10 +88,6 @@ CUPS_CFLAGS = @CUPS_CFLAGS@ CUPS_CONFIG = @CUPS_CONFIG@ CUPS_LIBS = @CUPS_LIBS@ CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DB2HTML = @DB2HTML@ DB2PDF = @DB2PDF@ @@ -98,16 +97,15 @@ DEPDIR = @DEPDIR@ DIALOG = @DIALOG@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ DVIPDF = @DVIPDF@ DVIPS = @DVIPS@ -ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ FIND = @FIND@ FOOMATIC_CONFIGURE = @FOOMATIC_CONFIGURE@ FOOMATIC_KITLOAD = @FOOMATIC_KITLOAD@ @@ -152,6 +150,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTLLIBS = @INTLLIBS@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -163,6 +162,7 @@ LIBREADLINE_DEPS = @LIBREADLINE_DEPS@ LIBS = $(INTLLIBS) @LIBS@ LIBTOOL = @LIBTOOL@ LIBTOOL_DEPS = @LIBTOOL_DEPS@ +LIPO = @LIPO@ LN_S = @LN_S@ LTALLOCA = @LTALLOCA@ LTLIBICONV = @LTLIBICONV@ @@ -175,8 +175,12 @@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ +NM = @NM@ NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -210,8 +214,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -256,6 +259,7 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -268,6 +272,7 @@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS) @@ -291,6 +296,7 @@ pkgxmldata_DATA = \ f360_photo7_japan.xml \ f360_ultrachrome.xml \ f360_ultrachrome_k3.xml \ + f360_ultrachrome_k3v.xml \ nx100.xml \ photo_gen0.xml \ photo_gen1.xml \ @@ -403,6 +409,9 @@ distdir: $(DISTFILES) || exit 1; \ fi; \ done + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$(top_distdir)" distdir="$(distdir)" \ + dist-hook check-am: all-am check: check-am all-am: Makefile $(DATA) all-local @@ -492,9 +501,9 @@ uninstall-am: uninstall-pkgxmldataDATA .MAKE: install-am install-strip .PHONY: all all-am all-local check check-am clean clean-generic \ - clean-libtool distclean distclean-generic distclean-libtool \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-dvi \ + clean-libtool dist-hook distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am install-man \ install-pdf install-pdf-am install-pkgxmldataDATA install-ps \ @@ -527,6 +536,8 @@ xml-stamp: $(pkgxmldata_DATA) Makefile.am mv $@.tmp $@ all-local: xml-stamp + +dist-hook: xml-stamp # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/src/xml/escp2/inks/artisan.xml b/src/xml/escp2/inks/artisan.xml index 791f6e1..283c12f 100644 --- a/src/xml/escp2/inks/artisan.xml +++ b/src/xml/escp2/inks/artisan.xml @@ -34,17 +34,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK"> <Channels> <channel name="artisan_black" index="0"> - <subchannel color="0" subchannel="0" headOffset="1"> + <subchannel color="0" subchannel="0" headOffset="1" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="artisan_photo_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2" subchannel="0" headOffset="1"> + <subchannel color="2" subchannel="0" headOffset="1" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> </subchannel> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> <SubchannelValueParam name="LightCyanValue"/> @@ -53,11 +53,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="artisan_photo_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1" subchannel="0" headOffset="1"> + <subchannel color="1" subchannel="0" headOffset="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> </subchannel> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> <SubchannelValueParam name="LightMagentaValue"/> @@ -66,7 +66,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="artisan_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4" subchannel="0"> + <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -77,11 +77,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <Channels> <channel name="artisan_photo_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2" subchannel="0" headOffset="1"> + <subchannel color="2" subchannel="0" headOffset="1" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> </subchannel> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> <SubchannelValueParam name="LightCyanValue"/> @@ -90,11 +90,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="artisan_photo_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1" subchannel="0" headOffset="1"> + <subchannel color="1" subchannel="0" headOffset="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> </subchannel> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> <SubchannelValueParam name="LightMagentaValue"/> @@ -103,7 +103,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="artisan_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4" subchannel="0"> + <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -113,25 +113,25 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK"> <Channels> <channel name="artisan_black" index="0"> - <subchannel color="0" subchannel="0" headOffset="1"> + <subchannel color="0" subchannel="0" headOffset="1" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="artisan_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2" subchannel="0" headOffset="1"> + <subchannel color="2" subchannel="0" headOffset="1" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="artisan_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1" subchannel="0" headOffset="1"> + <subchannel color="1" subchannel="0" headOffset="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="artisan_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4" subchannel="0"> + <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -142,19 +142,19 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <Channels> <channel name="artisan_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2" subchannel="0" headOffset="1"> + <subchannel color="2" subchannel="0" headOffset="1" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="artisan_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1" subchannel="0" headOffset="1"> + <subchannel color="1" subchannel="0" headOffset="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="artisan_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4" subchannel="0"> + <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -164,7 +164,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> @@ -174,17 +174,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended"> <Channels> <channel name="artisan_cyan" index="0"> - <subchannel color="2" subchannel="0" headOffset="1"> + <subchannel color="2" subchannel="0" headOffset="1" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="artisan_magenta" index="1"> - <subchannel color="1" subchannel="0" headOffset="1"> + <subchannel color="1" subchannel="0" headOffset="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="artisan_yellow" index="2"> - <subchannel color="4" subchannel="0"> + <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -194,22 +194,22 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended"> <Channels> <channel name="artisan_black" index="0"> - <subchannel color="0" subchannel="0" headOffset="1"> + <subchannel color="0" subchannel="0" headOffset="1" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="artisan_cyan" index="1"> - <subchannel color="2" subchannel="0" headOffset="1"> + <subchannel color="2" subchannel="0" headOffset="1" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="artisan_magenta" index="2"> - <subchannel color="1" subchannel="0" headOffset="1"> + <subchannel color="1" subchannel="0" headOffset="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="artisan_yellow" index="3"> - <subchannel color="4" subchannel="0"> + <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -219,27 +219,27 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCcMmY" text="Five Color Raw" InkID="Extended"> <Channels> <channel name="artisan_cyan" index="0"> - <subchannel color="2" subchannel="0" headOffset="1"> + <subchannel color="2" subchannel="0" headOffset="1" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="extended_artisan_cyan" index="1"> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="artisan_magenta" index="2"> - <subchannel color="1" subchannel="0" headOffset="1"> + <subchannel color="1" subchannel="0" headOffset="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="extended_artisan_magenta" index="3"> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="artisan_yellow" index="4"> - <subchannel color="4" subchannel="0"> + <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -249,32 +249,32 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCcMmYK" text="Six Color Raw" InkID="Extended"> <Channels> <channel name="artisan_black" index="0"> - <subchannel color="0" subchannel="0" headOffset="1"> + <subchannel color="0" subchannel="0" headOffset="1" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="artisan_cyan" index="1"> - <subchannel color="2" subchannel="0" headOffset="1"> + <subchannel color="2" subchannel="0" headOffset="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="extended_artisan_cyan" index="2"> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="artisan_magenta" index="3"> - <subchannel color="1" subchannel="0" headOffset="1"> + <subchannel color="1" subchannel="0" headOffset="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="extended_artisan_magenta" index="4"> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="artisan_yellow" index="5"> - <subchannel color="4" subchannel="0"> + <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> diff --git a/src/xml/escp2/inks/b500.xml b/src/xml/escp2/inks/b500.xml index 661b168..b05cc3a 100644 --- a/src/xml/escp2/inks/b500.xml +++ b/src/xml/escp2/inks/b500.xml @@ -32,28 +32,28 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK"> <Channels> <channel name="b500_black" index="0"> - <subchannel color="0" subchannel="4"> + <subchannel color="0" subchannel="4" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> <SplitChannels count="2">0 64</SplitChannels> </subchannel> </channel> <channel name="b500_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2" subchannel="4"> + <subchannel color="2" subchannel="4" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SplitChannels count="2">2 66</SplitChannels> </subchannel> </channel> <channel name="b500_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1" subchannel="4"> + <subchannel color="1" subchannel="4" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SplitChannels count="2">1 65</SplitChannels> </subchannel> </channel> <channel name="b500_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4" subchannel="4"> + <subchannel color="4" subchannel="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> <SplitChannels count="2">4 68</SplitChannels> </subchannel> @@ -65,21 +65,21 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <Channels> <channel name="b500_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2" subchannel="4"> + <subchannel color="2" subchannel="4" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SplitChannels count="2">2 66</SplitChannels> </subchannel> </channel> <channel name="b500_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1" subchannel="4"> + <subchannel color="1" subchannel="4" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SplitChannels count="2">1 65</SplitChannels> </subchannel> </channel> <channel name="b500_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/>e - <subchannel color="4" subchannel="4"> + <subchannel color="4" subchannel="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> <SplitChannels count="2">4 68</SplitChannels> </subchannel> @@ -90,7 +90,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended"> <Channels> <channel name="b500_black" index="0"> - <subchannel color="0" subchannel="4"> + <subchannel color="0" subchannel="4" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> <SplitChannels count="2">0 64</SplitChannels> </subchannel> @@ -101,19 +101,19 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended"> <Channels> <channel name="b500_cyan" index="0"> - <subchannel color="2" subchannel="4"> + <subchannel color="2" subchannel="4" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SplitChannels count="2">2 66</SplitChannels> </subchannel> </channel> <channel name="b500_magenta" index="1"> - <subchannel color="1" subchannel="4"> + <subchannel color="1" subchannel="4" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SplitChannels count="2">1 65</SplitChannels> </subchannel> </channel> <channel name="b500_yellow" index="2"> - <subchannel color="4" subchannel="4"> + <subchannel color="4" subchannel="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> <SplitChannels count="2">4 68</SplitChannels> </subchannel> @@ -124,25 +124,25 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended"> <Channels> <channel name="b500_black" index="0"> - <subchannel color="0" subchannel="4"> + <subchannel color="0" subchannel="4" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> <SplitChannels count="2">0 64</SplitChannels> </subchannel> </channel> <channel name="b500_cyan" index="1"> - <subchannel color="2" subchannel="4"> + <subchannel color="2" subchannel="4" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SplitChannels count="2">2 66</SplitChannels> </subchannel> </channel> <channel name="b500_magenta" index="2"> - <subchannel color="1" subchannel="4"> + <subchannel color="1" subchannel="4" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SplitChannels count="2">1 65</SplitChannels> </subchannel> </channel> <channel name="b500_yellow" index="3"> - <subchannel color="4" subchannel="4"> + <subchannel color="4" subchannel="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> <SplitChannels count="2">4 68</SplitChannels> </subchannel> diff --git a/src/xml/escp2/inks/c120.xml b/src/xml/escp2/inks/c120.xml index ca26273..40f360f 100644 --- a/src/xml/escp2/inks/c120.xml +++ b/src/xml/escp2/inks/c120.xml @@ -32,26 +32,26 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK"> <Channels> <channel name="c120_black" index="0"> - <subchannel color="0" subchannel="4"> + <subchannel color="0" subchannel="4" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> <SplitChannels count="2">0 64</SplitChannels> </subchannel> </channel> <channel name="c120_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="c120_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1" headOffset="120"> + <subchannel color="1" headOffset="120" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="c120_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4" headOffset="240"> + <subchannel color="4" headOffset="240" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -62,19 +62,19 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <Channels> <channel name="c120_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="c120_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1" headOffset="120"> + <subchannel color="1" headOffset="120" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="c120_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4" headOffset="240"> + <subchannel color="4" headOffset="240" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -84,7 +84,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended"> <Channels> <channel name="c120_black" index="0"> - <subchannel color="0" subchannel="4"> + <subchannel color="0" subchannel="4" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> <SplitChannels count="2">0 64</SplitChannels> </subchannel> @@ -95,17 +95,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended"> <Channels> <channel name="c120_cyan" index="0"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="c120_magenta" index="1"> - <subchannel color="1" headOffset="120"> + <subchannel color="1" headOffset="120" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="c120_yellow" index="2"> - <subchannel color="4" headOffset="240"> + <subchannel color="4" headOffset="240" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -115,23 +115,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended"> <Channels> <channel name="c120_black" index="0"> - <subchannel color="0" subchannel="4"> + <subchannel color="0" subchannel="4" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> <SplitChannels count="2">0 64</SplitChannels> </subchannel> </channel> <channel name="c120_cyan" index="1"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="c120_magenta" index="2"> - <subchannel color="1" headOffset="120"> + <subchannel color="1" headOffset="120" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="c120_yellow" index="3"> - <subchannel color="4" headOffset="240"> + <subchannel color="4" headOffset="240" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> diff --git a/src/xml/escp2/inks/c64.xml b/src/xml/escp2/inks/c64.xml index ee18fad..bcae2c3 100644 --- a/src/xml/escp2/inks/c64.xml +++ b/src/xml/escp2/inks/c64.xml @@ -32,25 +32,25 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK"> <Channels> <channel name="c64_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="c64_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="c64_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1" headOffset="90"> + <subchannel color="1" headOffset="90" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="c64_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4" headOffset="180"> + <subchannel color="4" headOffset="180" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -61,19 +61,19 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <Channels> <channel name="c64_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="c64_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1" headOffset="90"> + <subchannel color="1" headOffset="90" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="c64_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4" headOffset="180"> + <subchannel color="4" headOffset="180" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -83,7 +83,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> @@ -93,17 +93,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended"> <Channels> <channel name="c64_cyan" index="0"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="c64_magenta" index="1"> - <subchannel color="1" headOffset="90"> + <subchannel color="1" headOffset="90" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="c64_yellow" index="2"> - <subchannel color="4" headOffset="180"> + <subchannel color="4" headOffset="180" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -113,22 +113,22 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended"> <Channels> <channel name="c64_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="c64_cyan" index="1"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="c64_magenta" index="2"> - <subchannel color="1" headOffset="90"> + <subchannel color="1" headOffset="90" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="c64_yellow" index="3"> - <subchannel color="4" headOffset="180"> + <subchannel color="4" headOffset="180" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -143,23 +143,58 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="Quadtone" text="Quadtone" InkID="Quadtone"> <Channels> <channel name="c64_quadtone" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> - <SubchannelTransitionParam name="GrayTrans"/> + <SubchannelTransitionParam name="Gray3Trans"/> + </subchannel> + <subchannel color="2" name="Gray3" text="Gray 3" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="Gray3Trans"/> + <SubchannelValueParam name="Gray3Value"/> + <SubchannelScaleParam name="Gray3Scale"/> + </subchannel> + <subchannel color="1" headOffset="90" name="Gray2" text="Gray 2" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="Gray2Trans"/> + <SubchannelValueParam name="Gray2Value"/> + <SubchannelScaleParam name="Gray2Scale"/> + </subchannel> + <subchannel color="4" headOffset="180" name="Gray1" text="Gray 1" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="Gray1Trans"/> + <SubchannelValueParam name="Gray1Value"/> + <SubchannelScaleParam name="Gray1Scale"/> + </subchannel> + </channel> + </Channels> + </InkName> +</InkList> + +<InkList translate="text" name="MISQuadtone" text="MIS Quadtone"> + <Shades> + <shade count="4">1.000000 0.750000 0.500000 0.250000</shade> + </Shades> + + <InkName translate="text" name="Quadtone" text="Quadtone" InkID="Quadtone"> + <Channels> + <channel name="c64_quadtone" index="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="Gray3Trans"/> </subchannel> - <subchannel color="2"> + <subchannel color="1" headOffset="90" name="Gray3" text="Gray 3" translate="text"> <ChannelDensityParam name="BlackDensity"/> <SubchannelTransitionParam name="Gray3Trans"/> <SubchannelValueParam name="Gray3Value"/> <SubchannelScaleParam name="Gray3Scale"/> </subchannel> - <subchannel color="1" headOffset="90"> + <subchannel color="4" headOffset="180" name="Gray2" text="Gray 2" translate="text"> <ChannelDensityParam name="BlackDensity"/> <SubchannelTransitionParam name="Gray2Trans"/> <SubchannelValueParam name="Gray2Value"/> <SubchannelScaleParam name="Gray2Scale"/> </subchannel> - <subchannel color="4" headOffset="180"> + <subchannel color="2" name="Gray1" text="Gray 1" translate="text"> <ChannelDensityParam name="BlackDensity"/> <SubchannelTransitionParam name="Gray1Trans"/> <SubchannelValueParam name="Gray1Value"/> diff --git a/src/xml/escp2/inks/c80.xml b/src/xml/escp2/inks/c80.xml index 1012631..7528a47 100644 --- a/src/xml/escp2/inks/c80.xml +++ b/src/xml/escp2/inks/c80.xml @@ -32,25 +32,25 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK"> <Channels> <channel name="c80_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="c80_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="c80_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1" headOffset="120"> + <subchannel color="1" headOffset="120" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="c80_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4" headOffset="240"> + <subchannel color="4" headOffset="240" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -61,19 +61,19 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <Channels> <channel name="c80_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="c80_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1" headOffset="120"> + <subchannel color="1" headOffset="120" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="c80_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4" headOffset="240"> + <subchannel color="4" headOffset="240" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -83,7 +83,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> @@ -93,17 +93,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended"> <Channels> <channel name="c80_cyan" index="0"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="c80_magenta" index="1"> - <subchannel color="1" headOffset="120"> + <subchannel color="1" headOffset="120" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="c80_yellow" index="2"> - <subchannel color="4" headOffset="240"> + <subchannel color="4" headOffset="240" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -113,22 +113,22 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended"> <Channels> <channel name="c80_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="c80_cyan" index="1"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="c80_magenta" index="2"> - <subchannel color="1" headOffset="120"> + <subchannel color="1" headOffset="120" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="c80_yellow" index="3"> - <subchannel color="4" headOffset="240"> + <subchannel color="4" headOffset="240" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -144,25 +144,60 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="Quadtone" text="Quadtone" InkID="Quadtone"> <Channels> <channel name="c80_quadtone" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> - <SubchannelTransitionParam name="GrayTrans"/> + <SubchannelTransitionParam name="Gray3Trans"/> </subchannel> - <subchannel color="2"> + <subchannel color="2" name="Gray3" text="Gray 3" translate="text"> <ChannelDensityParam name="BlackDensity"/> - <SubchannelTransitionParam name="GrayTrans"/> + <SubchannelTransitionParam name="Gray3Trans"/> <SubchannelValueParam name="Gray3Value"/> <SubchannelScaleParam name="Gray3Scale"/> </subchannel> - <subchannel color="1" headOffset="120"> + <subchannel color="1" headOffset="120" name="Gray2" text="Gray 2" translate="text"> <ChannelDensityParam name="BlackDensity"/> - <SubchannelTransitionParam name="GrayTrans"/> + <SubchannelTransitionParam name="Gray2Trans"/> <SubchannelValueParam name="Gray2Value"/> <SubchannelScaleParam name="Gray2Scale"/> </subchannel> - <subchannel color="4" headOffset="240"> + <subchannel color="4" headOffset="240" name="Gray1" text="Gray 1" translate="text"> <ChannelDensityParam name="BlackDensity"/> - <SubchannelTransitionParam name="GrayTrans"/> + <SubchannelTransitionParam name="Gray1Trans"/> + <SubchannelValueParam name="Gray1Value"/> + <SubchannelScaleParam name="Gray1Scale"/> + </subchannel> + </channel> + </Channels> + </InkName> +</InkList> + +<InkList translate="text" name="MISQuadtone" text="MIS Quadtone"> + <Shades> + <shade count="4">1.000000 0.750000 0.500000 0.250000</shade> + </Shades> + + <InkName translate="text" name="Quadtone" text="Quadtone" InkID="Quadtone"> + <Channels> + <channel name="c80_quadtone" index="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="Gray3Trans"/> + </subchannel> + <subchannel color="1" headOffset="120" name="Gray3" text="Gray 3" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="Gray3Trans"/> + <SubchannelValueParam name="Gray3Value"/> + <SubchannelScaleParam name="Gray3Scale"/> + </subchannel> + <subchannel color="4" headOffset="240" name="Gray2" text="Gray 2" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="Gray2Trans"/> + <SubchannelValueParam name="Gray2Value"/> + <SubchannelScaleParam name="Gray2Scale"/> + </subchannel> + <subchannel color="2" name="Gray1" text="Gray 1" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="Gray1Trans"/> <SubchannelValueParam name="Gray1Value"/> <SubchannelScaleParam name="Gray1Scale"/> </subchannel> diff --git a/src/xml/escp2/inks/c82.xml b/src/xml/escp2/inks/c82.xml index 732a6c3..66d6e47 100644 --- a/src/xml/escp2/inks/c82.xml +++ b/src/xml/escp2/inks/c82.xml @@ -32,25 +32,25 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK"> <Channels> <channel name="c80_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="c80_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="c80_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1" headOffset="120"> + <subchannel color="1" headOffset="120" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="c80_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4" headOffset="240"> + <subchannel color="4" headOffset="240" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -61,19 +61,19 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <Channels> <channel name="c80_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="c80_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1" headOffset="120"> + <subchannel color="1" headOffset="120" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="c80_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4" headOffset="240"> + <subchannel color="4" headOffset="240" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -83,7 +83,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> @@ -93,17 +93,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended"> <Channels> <channel name="c80_cyan" index="0"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="c80_magenta" index="1"> - <subchannel color="1" headOffset="120"> + <subchannel color="1" headOffset="120" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="c80_yellow" index="2"> - <subchannel color="4" headOffset="240"> + <subchannel color="4" headOffset="240" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -113,22 +113,22 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended"> <Channels> <channel name="c80_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="c80_cyan" index="1"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="c80_magenta" index="2"> - <subchannel color="1" headOffset="120"> + <subchannel color="1" headOffset="120" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="c80_yellow" index="3"> - <subchannel color="4" headOffset="240"> + <subchannel color="4" headOffset="240" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -144,25 +144,60 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="Quadtone" text="Quadtone" InkID="Quadtone"> <Channels> <channel name="c80_quadtone" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> - <SubchannelTransitionParam name="GrayTrans"/> + <SubchannelTransitionParam name="Gray3Trans"/> </subchannel> - <subchannel color="2"> + <subchannel color="2" name="Gray3" text="Gray 3" translate="text"> <ChannelDensityParam name="BlackDensity"/> - <SubchannelTransitionParam name="GrayTrans"/> + <SubchannelTransitionParam name="Gray3Trans"/> <SubchannelValueParam name="Gray3Value"/> <SubchannelScaleParam name="Gray3Scale"/> </subchannel> - <subchannel color="1" headOffset="120"> + <subchannel color="1" headOffset="120" name="Gray2" text="Gray 2" translate="text"> <ChannelDensityParam name="BlackDensity"/> - <SubchannelTransitionParam name="GrayTrans"/> + <SubchannelTransitionParam name="Gray2Trans"/> <SubchannelValueParam name="Gray2Value"/> <SubchannelScaleParam name="Gray2Scale"/> </subchannel> - <subchannel color="4" headOffset="240"> + <subchannel color="4" headOffset="240" name="Gray1" text="Gray 1" translate="text"> <ChannelDensityParam name="BlackDensity"/> - <SubchannelTransitionParam name="GrayTrans"/> + <SubchannelTransitionParam name="Gray1Trans"/> + <SubchannelValueParam name="Gray1Value"/> + <SubchannelScaleParam name="Gray1Scale"/> + </subchannel> + </channel> + </Channels> + </InkName> +</InkList> + +<InkList translate="text" name="MISQuadtone" text="MIS Quadtone"> + <Shades> + <shade count="4">1.000000 0.750000 0.500000 0.250000</shade> + </Shades> + + <InkName translate="text" name="Quadtone" text="Quadtone" InkID="Quadtone"> + <Channels> + <channel name="c80_quadtone" index="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="Gray3Trans"/> + </subchannel> + <subchannel color="1" headOffset="120" name="Gray3" text="Gray 3" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="Gray3Trans"/> + <SubchannelValueParam name="Gray3Value"/> + <SubchannelScaleParam name="Gray3Scale"/> + </subchannel> + <subchannel color="4" headOffset="240" name="Gray2" text="Gray 2" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="Gray2Trans"/> + <SubchannelValueParam name="Gray2Value"/> + <SubchannelScaleParam name="Gray2Scale"/> + </subchannel> + <subchannel color="2" name="Gray1" text="Gray 1" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="Gray1Trans"/> <SubchannelValueParam name="Gray1Value"/> <SubchannelScaleParam name="Gray1Scale"/> </subchannel> diff --git a/src/xml/escp2/inks/claria.xml b/src/xml/escp2/inks/claria.xml index 30c0abb..5874a95 100644 --- a/src/xml/escp2/inks/claria.xml +++ b/src/xml/escp2/inks/claria.xml @@ -34,17 +34,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK"> <Channels> <channel name="claria_black" index="0"> - <subchannel color="0" subchannel="0"> + <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="claria_photo_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2" subchannel="0"> + <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> </subchannel> - <subchannel color="2" subchannel="1" headOffset="2"> + <subchannel color="2" subchannel="1" headOffset="2" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> <SubchannelValueParam name="LightCyanValue"/> @@ -53,11 +53,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="claria_photo_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1" subchannel="0" headOffset="2"> + <subchannel color="1" subchannel="0" headOffset="2" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> </subchannel> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> <SubchannelValueParam name="LightMagentaValue"/> @@ -66,7 +66,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="claria_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4" subchannel="0" headOffset="2"> + <subchannel color="4" subchannel="0" headOffset="2" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -77,11 +77,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <Channels> <channel name="claria_photo_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2" subchannel="0"> + <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> </subchannel> - <subchannel color="2" subchannel="1" headOffset="2"> + <subchannel color="2" subchannel="1" headOffset="2" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> <SubchannelValueParam name="LightCyanValue"/> @@ -90,11 +90,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="claria_photo_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1" subchannel="0" headOffset="2"> + <subchannel color="1" subchannel="0" headOffset="2" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> </subchannel> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> <SubchannelValueParam name="LightMagentaValue"/> @@ -103,7 +103,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="claria_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/>e - <subchannel color="4" subchannel="0" headOffset="2"> + <subchannel color="4" subchannel="0" headOffset="2" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -113,25 +113,25 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK"> <Channels> <channel name="claria_black" index="0"> - <subchannel color="0" subchannel="0"> + <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="claria_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2" subchannel="0"> + <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="claria_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1" subchannel="0" headOffset="2"> + <subchannel color="1" subchannel="0" headOffset="2" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="claria_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4" subchannel="0" headOffset="2"> + <subchannel color="4" subchannel="0" headOffset="2" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -142,19 +142,19 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <Channels> <channel name="claria_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2" subchannel="0"> + <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="claria_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1" subchannel="0" headOffset="2"> + <subchannel color="1" subchannel="0" headOffset="2" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="claria_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4" subchannel="0" headOffset="2"> + <subchannel color="4" subchannel="0" headOffset="2" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -164,7 +164,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> @@ -174,17 +174,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended"> <Channels> <channel name="claria_cyan" index="0"> - <subchannel color="2" subchannel="0"> + <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="claria_magenta" index="1"> - <subchannel color="1" subchannel="0" headOffset="2"> + <subchannel color="1" subchannel="0" headOffset="2" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="claria_yellow" index="2"> - <subchannel color="4" subchannel="0" headOffset="2"> + <subchannel color="4" subchannel="0" headOffset="2" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -194,22 +194,22 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended"> <Channels> <channel name="claria_black" index="0"> - <subchannel color="0" subchannel="0"> + <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="claria_cyan" index="1"> - <subchannel color="2" subchannel="0"> + <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="claria_magenta" index="2"> - <subchannel color="1" subchannel="0" headOffset="2"> + <subchannel color="1" subchannel="0" headOffset="2" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="claria_yellow" index="3"> - <subchannel color="4" subchannel="0" headOffset="2"> + <subchannel color="4" subchannel="0" headOffset="2" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -219,27 +219,27 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCcMmY" text="Five Color Raw" InkID="Extended"> <Channels> <channel name="claria_cyan" index="0"> - <subchannel color="2" subchannel="0"> + <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="extended_claria_cyan" index="1"> - <subchannel color="2" subchannel="1" headOffset="2"> + <subchannel color="2" subchannel="1" headOffset="2" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="claria_magenta" index="2"> - <subchannel color="1" subchannel="0" headOffset="2"> + <subchannel color="1" subchannel="0" headOffset="2" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="extended_claria_magenta" index="3"> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="claria_yellow" index="4"> - <subchannel color="4" subchannel="0" headOffset="2"> + <subchannel color="4" subchannel="0" headOffset="2" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -249,32 +249,32 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCcMmYK" text="Six Color Raw" InkID="Extended"> <Channels> <channel name="claria_black" index="0"> - <subchannel color="0" subchannel="0"> + <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="claria_cyan" index="1"> - <subchannel color="2" subchannel="0"> + <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="extended_claria_cyan" index="2"> - <subchannel color="2" subchannel="1" headOffset="2"> + <subchannel color="2" subchannel="1" headOffset="2" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="claria_magenta" index="3"> - <subchannel color="1" subchannel="0" headOffset="2"> + <subchannel color="1" subchannel="0" headOffset="2" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="extended_claria_magenta" index="4"> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="claria_yellow" index="5"> - <subchannel color="4" subchannel="0" headOffset="2"> + <subchannel color="4" subchannel="0" headOffset="2" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> diff --git a/src/xml/escp2/inks/cmy.xml b/src/xml/escp2/inks/cmy.xml index 8637a69..d6d362f 100644 --- a/src/xml/escp2/inks/cmy.xml +++ b/src/xml/escp2/inks/cmy.xml @@ -33,19 +33,19 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <Channels> <channel name="standard_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> diff --git a/src/xml/escp2/inks/cmykrb.xml b/src/xml/escp2/inks/cmykrb.xml index 4355a52..589ced0 100644 --- a/src/xml/escp2/inks/cmykrb.xml +++ b/src/xml/escp2/inks/cmykrb.xml @@ -89,49 +89,49 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="CMYKRBG" text="Six Color Photo" InkID="OTHER"> <Channels> <channel name="f360_photo_black" index="0"> - <subchannel color="0" subchannel="4" headOffset="1"> + <subchannel color="0" subchannel="4" headOffset="1" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="r800_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> <HueCurve ref="cmykrbCyan"/> - <subchannel color="2" headOffset="1"> + <subchannel color="2" headOffset="1" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="r800_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> <HueCurve ref="cmykrbMagenta"/> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="r800_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> <HueCurve ref="cmykrbYellow"/> - <subchannel color="4" headOffset="1"> + <subchannel color="4" headOffset="1" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> <channel name="r800_red" index="4"> <HueCurveParam name="RedHueCurve"/> <HueCurve ref="cmykrbRed"/> - <subchannel color="7"> + <subchannel color="7" name="Red" text="Red" translate="text"> <ChannelDensityParam name="RedDensity"/> </subchannel> </channel> <channel name="r800_blue" index="5"> <HueCurveParam name="BlueHueCurve"/> <HueCurve ref="cmykrbBlue"/> - <subchannel color="8" headOffset="1"> + <subchannel color="8" headOffset="1" name="Blue" text="Blue" translate="text"> <ChannelDensityParam name="BlueDensity"/> </subchannel> </channel> </Channels> <AuxChannels> <channel name="standard_gloss" index="0"> - <subchannel color="9"> + <subchannel color="9" name="Gloss" text="Gloss Optimizer" translate="text"> <ChannelDensityParam name="GlossDensity"/> </subchannel> </channel> @@ -143,42 +143,42 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <channel name="r800_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> <HueCurve ref="cmykrbCyan"/> - <subchannel color="2" headOffset="1"> + <subchannel color="2" headOffset="1" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="r800_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> <HueCurve ref="cmykrbMagenta"/> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="r800_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> <HueCurve ref="cmykrbYellow"/> - <subchannel color="4" headOffset="1"> + <subchannel color="4" headOffset="1" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> <channel name="r800_red" index="4"> <HueCurveParam name="RedHueCurve"/> <HueCurve ref="cmykrbRed"/> - <subchannel color="7"> + <subchannel color="7" name="Red" text="Red" translate="text"> <ChannelDensityParam name="RedDensity"/> </subchannel> </channel> <channel name="r800_blue" index="5"> <HueCurveParam name="BlueHueCurve"/> <HueCurve ref="cmykrbBlue"/> - <subchannel color="8" headOffset="1"> + <subchannel color="8" headOffset="1" name="Blue" text="Blue" translate="text"> <ChannelDensityParam name="BlueDensity"/> </subchannel> </channel> </Channels> <AuxChannels> <channel name="standard_gloss" index="0"> - <subchannel color="9"> + <subchannel color="9" name="Gloss" text="Gloss Optimizer" translate="text"> <ChannelDensityParam name="GlossDensity"/> </subchannel> </channel> @@ -188,29 +188,29 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="CMYKG" text="Four Color Standard" InkID="CMYK"> <Channels> <channel name="f360_photo_black" index="0"> - <subchannel color="0" subchannel="4" headOffset="1"> + <subchannel color="0" subchannel="4" headOffset="1" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="f360_standard_cyan" index="1"> - <subchannel color="2" headOffset="1"> + <subchannel color="2" headOffset="1" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="f360_standard_yellow" index="3"> - <subchannel color="4" headOffset="1"> + <subchannel color="4" headOffset="1" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> </Channels> <AuxChannels> <channel name="standard_gloss" index="0"> - <subchannel color="9"> + <subchannel color="9" name="Gloss" text="Gloss Optimizer" translate="text"> <ChannelDensityParam name="GlossDensity"/> </subchannel> </channel> @@ -220,24 +220,24 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="RGBG" text="Three Color Composite" InkID="CMYK"> <Channels> <channel name="f360_standard_cyan" index="1"> - <subchannel color="2" headOffset="1"> + <subchannel color="2" headOffset="1" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="f360_standard_yellow" index="3"> - <subchannel color="4" headOffset="1"> + <subchannel color="4" headOffset="1" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> </Channels> <AuxChannels> <channel name="standard_gloss" index="0"> - <subchannel color="9"> + <subchannel color="9" name="Gloss" text="Gloss Optimizer" translate="text"> <ChannelDensityParam name="GlossDensity"/> </subchannel> </channel> @@ -247,7 +247,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> @@ -257,12 +257,12 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalBlackGloss" text="One Color Raw Enhanced Gloss" InkID="Extended"> <Channels> <channel name="f360_photo_black" index="0"> - <subchannel color="0" subchannel="4" headOffset="1"> + <subchannel color="0" subchannel="4" headOffset="1" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="standard_gloss" index="1"> - <subchannel color="9"> + <subchannel color="9" name="Gloss" text="Gloss Optimizer" translate="text"> <ChannelDensityParam name="GlossDensity"/> </subchannel> </channel> @@ -272,17 +272,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended"> <Channels> <channel name="f360_standard_cyan" index="0"> - <subchannel color="2" headOffset="1"> + <subchannel color="2" headOffset="1" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="1"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="f360_standard_yellow" index="2"> - <subchannel color="4" headOffset="1"> + <subchannel color="4" headOffset="1" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -292,22 +292,22 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMYGloss" text="Three Color Raw Gloss" InkID="Extended"> <Channels> <channel name="f360_standard_cyan" index="0"> - <subchannel color="2" headOffset="1"> + <subchannel color="2" headOffset="1" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="1"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="f360_standard_yellow" index="2"> - <subchannel color="4" headOffset="1"> + <subchannel color="4" headOffset="1" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> <channel name="standard_gloss" index="3"> - <subchannel color="9"> + <subchannel color="9" name="Gloss" text="Gloss Optimizer" translate="text"> <ChannelDensityParam name="GlossDensity"/> </subchannel> </channel> @@ -317,27 +317,27 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMYKGloss" text="Four Color Raw Gloss" InkID="Extended"> <Channels> <channel name="f360_photo_black" index="0"> - <subchannel color="0" subchannel="4" headOffset="1"> + <subchannel color="0" subchannel="4" headOffset="1" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="f360_standard_cyan" index="1"> - <subchannel color="2" headOffset="1"> + <subchannel color="2" headOffset="1" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="f360_standard_yellow" index="3"> - <subchannel color="4" headOffset="1"> + <subchannel color="4" headOffset="1" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> <channel name="standard_gloss" index="4"> - <subchannel color="9"> + <subchannel color="9" name="Gloss" text="Gloss Optimizer" translate="text"> <ChannelDensityParam name="GlossDensity"/> </subchannel> </channel> @@ -347,37 +347,37 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMYKRB" text="Six Color Enhanced Gloss Raw" InkID="Extended"> <Channels> <channel name="f360_photo_black" index="0"> - <subchannel color="0" subchannel="4" headOffset="1"> + <subchannel color="0" subchannel="4" headOffset="1" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="f360_standard_cyan" index="1"> - <subchannel color="2" headOffset="1"> + <subchannel color="2" headOffset="1" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="r800_magenta" index="2"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="r800_yellow" index="3"> - <subchannel color="4" headOffset="1"> + <subchannel color="4" headOffset="1" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> <channel name="r800_red" index="4"> - <subchannel color="7"> + <subchannel color="7" name="Red" text="Red" translate="text"> <ChannelDensityParam name="RedDensity"/> </subchannel> </channel> <channel name="r800_blue" index="5"> - <subchannel color="8" headOffset="1"> + <subchannel color="8" headOffset="1" name="Blue" text="Blue" translate="text"> <ChannelDensityParam name="BlueDensity"/> </subchannel> </channel> <channel name="standard_gloss" index="6"> - <subchannel color="9"> + <subchannel color="9" name="Gloss" text="Gloss Optimizer" translate="text"> <ChannelDensityParam name="GlossDensity"/> </subchannel> </channel> @@ -387,42 +387,42 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMYKPRB" text="Seven Color Enhanced Gloss Raw" InkID="Extended"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="MatteBlack" text="Matte Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="f360_photo_black" index="1"> - <subchannel color="0" subchannel="4" headOffset="1"> + <subchannel color="0" subchannel="4" headOffset="1" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="r800_cyan" index="2"> - <subchannel color="2" headOffset="1"> + <subchannel color="2" headOffset="1" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="r800_magenta" index="3"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="r800_yellow" index="4"> - <subchannel color="4" headOffset="1"> + <subchannel color="4" headOffset="1" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> <channel name="r800_red" index="5"> - <subchannel color="7"> + <subchannel color="7" name="Red" text="Red" translate="text"> <ChannelDensityParam name="RedDensity"/> </subchannel> </channel> <channel name="r800_blue" index="6"> - <subchannel color="8" headOffset="1"> + <subchannel color="8" headOffset="1" name="Blue" text="Blue" translate="text"> <ChannelDensityParam name="BlueDensity"/> </subchannel> </channel> <channel name="standard_gloss" index="7"> - <subchannel color="9"> + <subchannel color="9" name="Gloss" text="Gloss Optimizer" translate="text"> <ChannelDensityParam name="GlossDensity"/> </subchannel> </channel> @@ -443,42 +443,42 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="CMYKRB" text="Six Color Photo" InkID="OTHER"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="r800_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> <HueCurve ref="cmykrbCyan"/> - <subchannel color="2" headOffset="1"> + <subchannel color="2" headOffset="1" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="r800_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> <HueCurve ref="cmykrbMagenta"/> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="r800_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> <HueCurve ref="cmykrbYellow"/> - <subchannel color="4" headOffset="1"> + <subchannel color="4" headOffset="1" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> <channel name="r800_red" index="4"> <HueCurveParam name="RedHueCurve"/> <HueCurve ref="cmykrbRed"/> - <subchannel color="7"> + <subchannel color="7" name="Red" text="Red" translate="text"> <ChannelDensityParam name="RedDensity"/> </subchannel> </channel> <channel name="r800_blue" index="5"> <HueCurveParam name="BlueHueCurve"/> <HueCurve ref="cmykrbBlue"/> - <subchannel color="8" headOffset="1"> + <subchannel color="8" headOffset="1" name="Blue" text="Blue" translate="text"> <ChannelDensityParam name="BlueDensity"/> </subchannel> </channel> @@ -490,35 +490,35 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <channel name="r800_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> <HueCurve ref="cmykrbCyan"/> - <subchannel color="2" headOffset="1"> + <subchannel color="2" headOffset="1" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="r800_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> <HueCurve ref="cmykrbMagenta"/> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="r800_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> <HueCurve ref="cmykrbYellow"/> - <subchannel color="4" headOffset="1"> + <subchannel color="4" headOffset="1" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> <channel name="r800_red" index="4"> <HueCurveParam name="RedHueCurve"/> <HueCurve ref="cmykrbRed"/> - <subchannel color="7"> + <subchannel color="7" name="Red" text="Red" translate="text"> <ChannelDensityParam name="RedDensity"/> </subchannel> </channel> <channel name="r800_blue" index="5"> <HueCurveParam name="BlueHueCurve"/> <HueCurve ref="cmykrbBlue"/> - <subchannel color="8" headOffset="1"> + <subchannel color="8" headOffset="1" name="Blue" text="Blue" translate="text"> <ChannelDensityParam name="BlueDensity"/> </subchannel> </channel> @@ -528,22 +528,22 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="CMYKG" text="Four Color Standard" InkID="CMYK"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="f360_standard_cyan" index="1"> - <subchannel color="2" headOffset="1"> + <subchannel color="2" headOffset="1" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="f360_standard_yellow" index="3"> - <subchannel color="4" headOffset="1"> + <subchannel color="4" headOffset="1" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -553,17 +553,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="RGBG" text="Three Color Composite" InkID="CMYK"> <Channels> <channel name="f360_standard_cyan" index="1"> - <subchannel color="2" headOffset="1"> + <subchannel color="2" headOffset="1" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="f360_standard_yellow" index="3"> - <subchannel color="4" headOffset="1"> + <subchannel color="4" headOffset="1" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -573,7 +573,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> @@ -583,17 +583,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended"> <Channels> <channel name="f360_standard_cyan" index="0"> - <subchannel color="2" headOffset="1"> + <subchannel color="2" headOffset="1" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="1"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="f360_standard_yellow" index="2"> - <subchannel color="4" headOffset="1"> + <subchannel color="4" headOffset="1" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -603,22 +603,22 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMYKGloss" text="Four Color Raw" InkID="Extended"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="f360_standard_cyan" index="1"> - <subchannel color="2" headOffset="1"> + <subchannel color="2" headOffset="1" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="f360_standard_yellow" index="3"> - <subchannel color="4" headOffset="1"> + <subchannel color="4" headOffset="1" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -628,32 +628,32 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMYKRB" text="Six Color Raw" InkID="Extended"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="r800_cyan" index="1"> - <subchannel color="2" headOffset="1"> + <subchannel color="2" headOffset="1" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="r800_magenta" index="2"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="r800_yellow" index="3"> - <subchannel color="4" headOffset="1"> + <subchannel color="4" headOffset="1" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> <channel name="r800_red" index="4"> - <subchannel color="7"> + <subchannel color="7" name="Red" text="Red" translate="text"> <ChannelDensityParam name="RedDensity"/> </subchannel> </channel> <channel name="r800_blue" index="5"> - <subchannel color="8" headOffset="1"> + <subchannel color="8" headOffset="1" name="Blue" text="Blue" translate="text"> <ChannelDensityParam name="BlueDensity"/> </subchannel> </channel> diff --git a/src/xml/escp2/inks/cmykro.xml b/src/xml/escp2/inks/cmykro.xml index 3a68f1b..d03abb9 100644 --- a/src/xml/escp2/inks/cmykro.xml +++ b/src/xml/escp2/inks/cmykro.xml @@ -88,49 +88,49 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="CMYKROG" text="Six Color Photo" InkID="OTHER"> <Channels> <channel name="f360_photo_black" index="0"> - <subchannel color="0" subchannel="4"> + <subchannel color="0" subchannel="4" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="r1900_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> <HueCurve ref="cmykroCyan"/> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="r1900_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> <HueCurve ref="cmykroMagenta"/> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="r1900_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> <HueCurve ref="cmykroYellow"/> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> <channel name="r1900_red" index="4"> <HueCurveParam name="RedHueCurve"/> <HueCurve ref="cmykroRed"/> - <subchannel color="7"> + <subchannel color="7" name="Red" text="Red" translate="text"> <ChannelDensityParam name="RedDensity"/> </subchannel> </channel> <channel name="r1900_orange" index="5"> <HueCurveParam name="OrangeHueCurve"/> <HueCurve ref="cmykroOrange"/> - <subchannel color="10"> + <subchannel color="10" name="Orange" text="Orange" translate="text"> <ChannelDensityParam name="OrangeDensity"/> </subchannel> </channel> </Channels> <AuxChannels> <channel name="standard_gloss" index="0"> - <subchannel color="9"> + <subchannel color="9" name="Gloss" text="Gloss Optimizer" translate="text"> <ChannelDensityParam name="GlossDensity"/> </subchannel> </channel> @@ -142,42 +142,42 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <channel name="r1900_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> <HueCurve ref="cmykroCyan"/> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="r1900_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> <HueCurve ref="cmykroMagenta"/> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="r1900_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> <HueCurve ref="cmykroYellow"/> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> <channel name="r1900_red" index="4"> <HueCurveParam name="RedHueCurve"/> <HueCurve ref="cmykroRed"/> - <subchannel color="7"> + <subchannel color="7" name="Red" text="Red" translate="text"> <ChannelDensityParam name="RedDensity"/> </subchannel> </channel> <channel name="r1900_orange" index="5"> <HueCurveParam name="OrangeHueCurve"/> <HueCurve ref="cmykroOrange"/> - <subchannel color="10"> + <subchannel color="10" name="Orange" text="Orange" translate="text"> <ChannelDensityParam name="OrangeDensity"/> </subchannel> </channel> </Channels> <AuxChannels> <channel name="standard_gloss" index="0"> - <subchannel color="9"> + <subchannel color="9" name="Gloss" text="Gloss Optimizer" translate="text"> <ChannelDensityParam name="GlossDensity"/> </subchannel> </channel> @@ -187,29 +187,29 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="CMYKG" text="Four Color Standard" InkID="CMYK"> <Channels> <channel name="f360_photo_black" index="0"> - <subchannel color="0" subchannel="4"> + <subchannel color="0" subchannel="4" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="f360_standard_cyan" index="1"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="f360_standard_yellow" index="3"> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> </Channels> <AuxChannels> <channel name="standard_gloss" index="0"> - <subchannel color="9"> + <subchannel color="9" name="Gloss" text="Gloss Optimizer" translate="text"> <ChannelDensityParam name="GlossDensity"/> </subchannel> </channel> @@ -219,24 +219,24 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="RGBG" text="Three Color Composite" InkID="CMYK"> <Channels> <channel name="f360_standard_cyan" index="1"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="f360_standard_yellow" index="3"> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> </Channels> <AuxChannels> <channel name="standard_gloss" index="0"> - <subchannel color="9"> + <subchannel color="9" name="Gloss" text="Gloss Optimizer" translate="text"> <ChannelDensityParam name="GlossDensity"/> </subchannel> </channel> @@ -246,7 +246,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> @@ -256,12 +256,12 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalBlackGloss" text="One Color Raw Enhanced Gloss" InkID="Extended"> <Channels> <channel name="f360_photo_black" index="0"> - <subchannel color="0" subchannel="4"> + <subchannel color="0" subchannel="4" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="standard_gloss" index="1"> - <subchannel color="9"> + <subchannel color="9" name="Gloss" text="Gloss Optimizer" translate="text"> <ChannelDensityParam name="GlossDensity"/> </subchannel> </channel> @@ -271,17 +271,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended"> <Channels> <channel name="f360_standard_cyan" index="0"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="1"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="f360_standard_yellow" index="2"> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -291,22 +291,22 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMYGloss" text="Three Color Raw Gloss" InkID="Extended"> <Channels> <channel name="f360_standard_cyan" index="0"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="1"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="f360_standard_yellow" index="2"> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> <channel name="standard_gloss" index="3"> - <subchannel color="9"> + <subchannel color="9" name="Gloss" text="Gloss Optimizer" translate="text"> <ChannelDensityParam name="GlossDensity"/> </subchannel> </channel> @@ -316,27 +316,27 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMYKGloss" text="Four Color Raw Gloss" InkID="Extended"> <Channels> <channel name="f360_photo_black" index="0"> - <subchannel color="0" subchannel="4"> + <subchannel color="0" subchannel="4" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="f360_standard_cyan" index="1"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="f360_standard_yellow" index="3"> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> <channel name="standard_gloss" index="4"> - <subchannel color="9"> + <subchannel color="9" name="Gloss" text="Gloss Optimizer" translate="text"> <ChannelDensityParam name="GlossDensity"/> </subchannel> </channel> @@ -346,37 +346,37 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMYKRO" text="Six Color Enhanced Gloss Raw" InkID="Extended"> <Channels> <channel name="f360_photo_black" index="0"> - <subchannel color="0" subchannel="4"> + <subchannel color="0" subchannel="4" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="f360_standard_cyan" index="1"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="r1900_magenta" index="2"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="r1900_yellow" index="3"> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> <channel name="r1900_red" index="4"> - <subchannel color="7"> + <subchannel color="7" name="Red" text="Red" translate="text"> <ChannelDensityParam name="RedDensity"/> </subchannel> </channel> <channel name="r1900_orange" index="5"> - <subchannel color="10"> + <subchannel color="10" name="Orange" text="Orange" translate="text"> <ChannelDensityParam name="OrangeDensity"/> </subchannel> </channel> <channel name="standard_gloss" index="6"> - <subchannel color="9"> + <subchannel color="9" name="Gloss" text="Gloss Optimizer" translate="text"> <ChannelDensityParam name="GlossDensity"/> </subchannel> </channel> @@ -386,42 +386,42 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMYKPRO" text="Seven Color Enhanced Gloss Raw" InkID="Extended"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="MatteBlack" text="MatteBlack" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="f360_photo_black" index="1"> - <subchannel color="0" subchannel="4"> + <subchannel color="0" subchannel="4" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="r1900_cyan" index="2"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="r1900_magenta" index="3"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="r1900_yellow" index="4"> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> <channel name="r1900_red" index="5"> - <subchannel color="7"> + <subchannel color="7" name="Red" text="Red" translate="text"> <ChannelDensityParam name="RedDensity"/> </subchannel> </channel> <channel name="r1900_orange" index="6"> - <subchannel color="10"> + <subchannel color="10" name="Orange" text="Orange" translate="text"> <ChannelDensityParam name="OrangeDensity"/> </subchannel> </channel> <channel name="standard_gloss" index="7"> - <subchannel color="9"> + <subchannel color="9" name="Gloss" text="Gloss Optimizer" translate="text"> <ChannelDensityParam name="GlossDensity"/> </subchannel> </channel> @@ -442,42 +442,42 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="CMYKRO" text="Six Color Photo" InkID="OTHER"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0" headOffset="1"> + <subchannel color="0" headOffset="1" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="r1900_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> <HueCurve ref="cmykroCyan"/> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="r1900_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> <HueCurve ref="cmykroMagenta"/> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="r1900_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> <HueCurve ref="cmykroYellow"/> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> <channel name="r1900_red" index="4"> <HueCurveParam name="RedHueCurve"/> <HueCurve ref="cmykroRed"/> - <subchannel color="7"> + <subchannel color="7" name="Red" text="Red" translate="text"> <ChannelDensityParam name="RedDensity"/> </subchannel> </channel> <channel name="r1900_orange" index="5"> <HueCurveParam name="OrangeHueCurve"/> <HueCurve ref="cmykroOrange"/> - <subchannel color="10"> + <subchannel color="10" name="Orange" text="Orange" translate="text"> <ChannelDensityParam name="OrangeDensity"/> </subchannel> </channel> @@ -489,35 +489,35 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <channel name="r1900_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> <HueCurve ref="cmykroCyan"/> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="r1900_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> <HueCurve ref="cmykroMagenta"/> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="r1900_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> <HueCurve ref="cmykroYellow"/> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> <channel name="r1900_red" index="4"> <HueCurveParam name="RedHueCurve"/> <HueCurve ref="cmykroRed"/> - <subchannel color="7"> + <subchannel color="7" name="Red" text="Red" translate="text"> <ChannelDensityParam name="RedDensity"/> </subchannel> </channel> <channel name="r1900_orange" index="5"> <HueCurveParam name="OrangeHueCurve"/> <HueCurve ref="cmykroOrange"/> - <subchannel color="10"> + <subchannel color="10" name="Orange" text="Orange" translate="text"> <ChannelDensityParam name="OrangeDensity"/> </subchannel> </channel> @@ -527,22 +527,22 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="CMYKG" text="Four Color Standard" InkID="CMYK"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0" headOffset="1"> + <subchannel color="0" headOffset="1" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="f360_standard_cyan" index="1"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="f360_standard_yellow" index="3"> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -552,17 +552,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="RGBG" text="Three Color Composite" InkID="CMYK"> <Channels> <channel name="f360_standard_cyan" index="1"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="f360_standard_yellow" index="3"> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -572,7 +572,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0" headOffset="1"> + <subchannel color="0" headOffset="1" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> @@ -582,42 +582,42 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended"> <Channels> <channel name="f360_standard_cyan" index="0"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="1"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="f360_standard_yellow" index="2"> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> </Channels> </InkName> - <InkName translate="text" name="PhysicalCMYKGloss" text="Four Color Raw" InkID="Extended"> + <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0" headOffset="1"> + <subchannel color="0" headOffset="1" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="f360_standard_cyan" index="1"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="f360_standard_yellow" index="3"> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -627,32 +627,32 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMYKRO" text="Six Color Raw" InkID="Extended"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0" headOffset="1"> + <subchannel color="0" headOffset="1" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="r1900_cyan" index="1"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="r1900_magenta" index="2"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="r1900_yellow" index="3"> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> <channel name="r1900_red" index="4"> - <subchannel color="7"> + <subchannel color="7" name="Red" text="Red" translate="text"> <ChannelDensityParam name="RedDensity"/> </subchannel> </channel> <channel name="r1900_orange" index="5"> - <subchannel color="10"> + <subchannel color="10" name="Orange" text="Orange" translate="text"> <ChannelDensityParam name="OrangeDensity"/> </subchannel> </channel> diff --git a/src/xml/escp2/inks/cx3650.xml b/src/xml/escp2/inks/cx3650.xml index c237561..77d908b 100644 --- a/src/xml/escp2/inks/cx3650.xml +++ b/src/xml/escp2/inks/cx3650.xml @@ -32,25 +32,25 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="cx3650_standard_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2" headOffset="2"> + <subchannel color="2" headOffset="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="f360_standard_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1" headOffset="1"> + <subchannel color="1" headOffset="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -61,19 +61,19 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <Channels> <channel name="cx3650_standard_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2" headOffset="2"> + <subchannel color="2" headOffset="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="f360_standard_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1" headOffset="1"> + <subchannel color="1" headOffset="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -83,7 +83,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> @@ -93,17 +93,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended"> <Channels> <channel name="cx3650_standard_cyan" index="0"> - <subchannel color="2" headOffset="2"> + <subchannel color="2" headOffset="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="f360_standard_magenta" index="1"> - <subchannel color="1" headOffset="1"> + <subchannel color="1" headOffset="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="2"> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -113,22 +113,22 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="cx3650_standard_cyan" index="1"> - <subchannel color="2" headOffset="2"> + <subchannel color="2" headOffset="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="f360_standard_magenta" index="2"> - <subchannel color="1" headOffset="1"> + <subchannel color="1" headOffset="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="3"> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -143,25 +143,60 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="Quadtone" text="Quadtone" InkID="Quadtone"> <Channels> <channel name="cx3650_quadtone" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> - <SubchannelTransitionParam name="GrayTrans"/> + <SubchannelTransitionParam name="Gray3Trans"/> </subchannel> - <subchannel color="2" headOffset="2"> + <subchannel color="2" headOffset="2" name="Gray3" text="Gray 3" translate="text"> <ChannelDensityParam name="BlackDensity"/> - <SubchannelTransitionParam name="GrayTrans"/> + <SubchannelTransitionParam name="Gray3Trans"/> <SubchannelValueParam name="Gray3Value"/> <SubchannelScaleParam name="Gray3Scale"/> </subchannel> - <subchannel color="1" headOffset="1"> + <subchannel color="1" headOffset="1" name="Gray2" text="Gray 2" translate="text"> <ChannelDensityParam name="BlackDensity"/> - <SubchannelTransitionParam name="GrayTrans"/> + <SubchannelTransitionParam name="Gray2Trans"/> <SubchannelValueParam name="Gray2Value"/> <SubchannelScaleParam name="Gray2Scale"/> </subchannel> - <subchannel color="4"> + <subchannel color="4" name="Gray1" text="Gray 1" translate="text"> <ChannelDensityParam name="BlackDensity"/> - <SubchannelTransitionParam name="GrayTrans"/> + <SubchannelTransitionParam name="Gray1Trans"/> + <SubchannelValueParam name="Gray1Value"/> + <SubchannelScaleParam name="Gray1Scale"/> + </subchannel> + </channel> + </Channels> + </InkName> +</InkList> + +<InkList translate="text" name="MISQuadtone" text="MIS Quadtone"> + <Shades> + <shade count="4">1.000000 0.750000 0.500000 0.250000</shade> + </Shades> + + <InkName translate="text" name="Quadtone" text="Quadtone" InkID="Quadtone"> + <Channels> + <channel name="cx3650_quadtone" index="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="Gray3Trans"/> + </subchannel> + <subchannel color="1" headOffset="2" name="Gray3" text="Gray 3" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="Gray3Trans"/> + <SubchannelValueParam name="Gray3Value"/> + <SubchannelScaleParam name="Gray3Scale"/> + </subchannel> + <subchannel color="4" name="Gray2" text="Gray 2" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="Gray2Trans"/> + <SubchannelValueParam name="Gray2Value"/> + <SubchannelScaleParam name="Gray2Scale"/> + </subchannel> + <subchannel color="2" headOffset="2" name="Gray1" text="Gray 1" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="Gray1Trans"/> <SubchannelValueParam name="Gray1Value"/> <SubchannelScaleParam name="Gray1Scale"/> </subchannel> diff --git a/src/xml/escp2/inks/defaultblack.xml b/src/xml/escp2/inks/defaultblack.xml index 3a12214..2d0f6e6 100644 --- a/src/xml/escp2/inks/defaultblack.xml +++ b/src/xml/escp2/inks/defaultblack.xml @@ -29,7 +29,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="CMYK" text="Default Black" InkID="CMYK"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0" shade="1.000000"> + <subchannel color="0" shade="1.000000" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> diff --git a/src/xml/escp2/inks/f360.xml b/src/xml/escp2/inks/f360.xml index 0a10492..ef33d13 100644 --- a/src/xml/escp2/inks/f360.xml +++ b/src/xml/escp2/inks/f360.xml @@ -32,25 +32,25 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="f360_standard_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2" headOffset="1"> + <subchannel color="2" headOffset="1" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="f360_standard_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1" headOffset="1"> + <subchannel color="1" headOffset="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -61,19 +61,19 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <Channels> <channel name="f360_standard_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2" headOffset="1"> + <subchannel color="2" headOffset="1" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="f360_standard_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1" headOffset="1"> + <subchannel color="1" headOffset="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -83,7 +83,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> @@ -93,17 +93,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended"> <Channels> <channel name="f360_standard_cyan" index="0"> - <subchannel color="2" headOffset="1"> + <subchannel color="2" headOffset="1" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="f360_standard_magenta" index="1"> - <subchannel color="1" headOffset="1"> + <subchannel color="1" headOffset="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="2"> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -113,22 +113,22 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="f360_standard_cyan" index="1"> - <subchannel color="2" headOffset="1"> + <subchannel color="2" headOffset="1" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="f360_standard_magenta" index="2"> - <subchannel color="1" headOffset="1"> + <subchannel color="1" headOffset="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="3"> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -144,25 +144,60 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="Quadtone" text="Quadtone" InkID="Quadtone"> <Channels> <channel name="f360_quadtone" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> - <SubchannelTransitionParam name="GrayTrans"/> + <SubchannelTransitionParam name="Gray3Trans"/> </subchannel> - <subchannel color="2" headOffset="1"> + <subchannel color="2" headOffset="1" name="Gray3" text="Gray 3" translate="text"> <ChannelDensityParam name="BlackDensity"/> - <SubchannelTransitionParam name="GrayTrans"/> + <SubchannelTransitionParam name="Gray3Trans"/> <SubchannelValueParam name="Gray3Value"/> <SubchannelScaleParam name="Gray3Scale"/> </subchannel> - <subchannel color="1" headOffset="1"> + <subchannel color="1" headOffset="1" name="Gray2" text="Gray 2" translate="text"> <ChannelDensityParam name="BlackDensity"/> - <SubchannelTransitionParam name="GrayTrans"/> + <SubchannelTransitionParam name="Gray2Trans"/> <SubchannelValueParam name="Gray2Value"/> <SubchannelScaleParam name="Gray2Scale"/> </subchannel> - <subchannel color="4"> + <subchannel color="4" name="Gray1" text="Gray 1" translate="text"> <ChannelDensityParam name="BlackDensity"/> - <SubchannelTransitionParam name="GrayTrans"/> + <SubchannelTransitionParam name="Gray1Trans"/> + <SubchannelValueParam name="Gray1Value"/> + <SubchannelScaleParam name="Gray1Scale"/> + </subchannel> + </channel> + </Channels> + </InkName> +</InkList> + +<InkList translate="text" name="MISQuadtone" text="MIS Quadtone"> + <Shades> + <shade count="4">1.000000 0.750000 0.500000 0.250000</shade> + </Shades> + + <InkName translate="text" name="Quadtone" text="Quadtone" InkID="Quadtone"> + <Channels> + <channel name="f360_quadtone" index="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="Gray3Trans"/> + </subchannel> + <subchannel color="1" headOffset="1" name="Gray3" text="Gray 3" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="Gray3Trans"/> + <SubchannelValueParam name="Gray3Value"/> + <SubchannelScaleParam name="Gray3Scale"/> + </subchannel> + <subchannel color="4" name="Gray2" text="Gray 2" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="Gray2Trans"/> + <SubchannelValueParam name="Gray2Value"/> + <SubchannelScaleParam name="Gray2Scale"/> + </subchannel> + <subchannel color="2" headOffset="1" name="Gray1" text="Gray 1" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="Gray1Trans"/> <SubchannelValueParam name="Gray1Value"/> <SubchannelScaleParam name="Gray1Scale"/> </subchannel> diff --git a/src/xml/escp2/inks/f360_photo.xml b/src/xml/escp2/inks/f360_photo.xml index e4e5295..0efd6b9 100644 --- a/src/xml/escp2/inks/f360_photo.xml +++ b/src/xml/escp2/inks/f360_photo.xml @@ -34,17 +34,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="f360_photo_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2" subchannel="0" headOffset="1"> + <subchannel color="2" subchannel="0" headOffset="1" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> </subchannel> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> <SubchannelValueParam name="LightCyanValue"/> @@ -53,11 +53,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="f360_photo_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1" subchannel="0" headOffset="1"> + <subchannel color="1" subchannel="0" headOffset="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> </subchannel> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> <SubchannelValueParam name="LightMagentaValue"/> @@ -66,7 +66,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="f360_photo_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4" subchannel="0" headOffset="1"> + <subchannel color="4" subchannel="0" headOffset="1" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -77,11 +77,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <Channels> <channel name="f360_photo_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2" subchannel="0" headOffset="1"> + <subchannel color="2" subchannel="0" headOffset="1" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> </subchannel> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> <SubchannelValueParam name="LightCyanValue"/> @@ -90,11 +90,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="f360_photo_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1" subchannel="0" headOffset="1"> + <subchannel color="1" subchannel="0" headOffset="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> </subchannel> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> <SubchannelValueParam name="LightMagentaValue"/> @@ -103,7 +103,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="f360_photo_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4" subchannel="0" headOffset="1"> + <subchannel color="4" subchannel="0" headOffset="1" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -113,25 +113,25 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="f360_standard_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2" headOffset="1"> + <subchannel color="2" headOffset="1" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="f360_standard_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1" headOffset="1"> + <subchannel color="1" headOffset="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -142,19 +142,19 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <Channels> <channel name="standard_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -164,7 +164,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> @@ -174,17 +174,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended"> <Channels> <channel name="standard_cyan" index="0"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="1"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="2"> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -194,22 +194,22 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="f360_standard_cyan" index="1"> - <subchannel color="2" headOffset="1"> + <subchannel color="2" headOffset="1" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="f360_standard_magenta" index="2"> - <subchannel color="1" headOffset="1"> + <subchannel color="1" headOffset="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="3"> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -219,27 +219,27 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCcMmY" text="Five Color Raw" InkID="Extended"> <Channels> <channel name="f360_standard_cyan" index="0"> - <subchannel color="2" headOffset="1"> + <subchannel color="2" headOffset="1" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="extended_cyan" index="1"> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="f360_standard_magenta" index="2"> - <subchannel color="1" headOffset="1"> + <subchannel color="1" headOffset="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="extended_magenta" index="3"> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="f360_photo_yellow" index="4"> - <subchannel color="4" subchannel="0" headOffset="1"> + <subchannel color="4" subchannel="0" headOffset="1" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -249,32 +249,32 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCcMmYK" text="Six Color Raw" InkID="Extended"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="f360_standard_cyan" index="1"> - <subchannel color="2" headOffset="1"> + <subchannel color="2" headOffset="1" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="extended_cyan" index="2"> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="f360_standard_magenta" index="3"> - <subchannel color="1" headOffset="1"> + <subchannel color="1" headOffset="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="extended_magenta" index="4"> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="f360_photo_yellow" index="5"> - <subchannel color="4" subchannel="0" headOffset="1"> + <subchannel color="4" subchannel="0" headOffset="1" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> diff --git a/src/xml/escp2/inks/f360_photo7_japan.xml b/src/xml/escp2/inks/f360_photo7_japan.xml index 9f821a7..bc18d1f 100644 --- a/src/xml/escp2/inks/f360_photo7_japan.xml +++ b/src/xml/escp2/inks/f360_photo7_japan.xml @@ -35,17 +35,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="Photo7J" text="Seven Color Photo" InkID="CcMmYKk"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="f360_photo_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2" subchannel="0" headOffset="1"> + <subchannel color="2" subchannel="0" headOffset="1" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> </subchannel> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> <SubchannelValueParam name="LightCyanValue"/> @@ -54,11 +54,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="f360_photo_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1" subchannel="0" headOffset="1"> + <subchannel color="1" subchannel="0" headOffset="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> </subchannel> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> <SubchannelValueParam name="LightMagentaValue"/> @@ -67,11 +67,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="f360_photo2_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4" subchannel="2"> + <subchannel color="4" subchannel="2" name="DarkYellow" text="Dark Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> <SubchannelTransitionParam name="DarkYellowTrans"/> </subchannel> - <subchannel color="4" subchannel="0" headOffset="1"> + <subchannel color="4" subchannel="0" headOffset="1" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> <SubchannelTransitionParam name="DarkYellowTrans"/> <SubchannelValueParam name="DarkYellowValue"/> @@ -85,11 +85,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <Channels> <channel name="f360_photo_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2" subchannel="0" headOffset="1"> + <subchannel color="2" subchannel="0" headOffset="1" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> </subchannel> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> <SubchannelValueParam name="LightCyanValue"/> @@ -98,11 +98,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="f360_photo_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1" subchannel="0" headOffset="1"> + <subchannel color="1" subchannel="0" headOffset="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> </subchannel> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> <SubchannelValueParam name="LightMagentaValue"/> @@ -111,11 +111,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="f360_photo2_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4" subchannel="2"> + <subchannel color="4" subchannel="2" name="DarkYellow" text="Dark Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> <SubchannelTransitionParam name="DarkYellowTrans"/> </subchannel> - <subchannel color="4" subchannel="0" headOffset="1"> + <subchannel color="4" subchannel="0" headOffset="1" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> <SubchannelTransitionParam name="DarkYellowTrans"/> <SubchannelValueParam name="DarkYellowValue"/> @@ -128,17 +128,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="f360_photo_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2" subchannel="0" headOffset="1"> + <subchannel color="2" subchannel="0" headOffset="1" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> </subchannel> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> <SubchannelValueParam name="LightCyanValue"/> @@ -147,11 +147,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="f360_photo_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1" subchannel="0" headOffset="1"> + <subchannel color="1" subchannel="0" headOffset="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> </subchannel> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> <SubchannelValueParam name="LightMagentaValue"/> @@ -160,7 +160,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="f360_photo_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4" subchannel="0" headOffset="1"> + <subchannel color="4" subchannel="0" headOffset="1" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -171,11 +171,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <Channels> <channel name="f360_photo_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2" subchannel="0" headOffset="1"> + <subchannel color="2" subchannel="0" headOffset="1" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> </subchannel> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> <SubchannelValueParam name="LightCyanValue"/> @@ -184,11 +184,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="f360_photo_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1" subchannel="0" headOffset="1"> + <subchannel color="1" subchannel="0" headOffset="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> </subchannel> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> <SubchannelValueParam name="LightMagentaValue"/> @@ -197,7 +197,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="f360_photo_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4" subchannel="0" headOffset="1"> + <subchannel color="4" subchannel="0" headOffset="1" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -207,25 +207,25 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="standard_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -236,19 +236,19 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <Channels> <channel name="standard_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -258,7 +258,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> @@ -268,17 +268,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended"> <Channels> <channel name="standard_cyan" index="0"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="1"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="2"> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -288,22 +288,22 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="standard_cyan" index="1"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="3"> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -313,27 +313,27 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCcMmY" text="Five Color Raw" InkID="Extended"> <Channels> <channel name="f360_standard_cyan" index="0"> - <subchannel color="2" headOffset="1"> + <subchannel color="2" headOffset="1" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="extended_cyan" index="1"> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="f360_standard_magenta" index="2"> - <subchannel color="1" headOffset="1"> + <subchannel color="1" headOffset="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="extended_magenta" index="3"> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="f360_photo_yellow" index="4"> - <subchannel color="4" subchannel="0" headOffset="1"> + <subchannel color="4" subchannel="0" headOffset="1" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -343,72 +343,72 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCcMmYK" text="Six Color Raw" InkID="Extended"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="f360_standard_cyan" index="1"> - <subchannel color="2" headOffset="1"> + <subchannel color="2" headOffset="1" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="extended_cyan" index="2"> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="f360_standard_magenta" index="3"> - <subchannel color="1" headOffset="1"> + <subchannel color="1" headOffset="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="extended_magenta" index="4"> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="f360_photo_yellow" index="5"> - <subchannel color="4" subchannel="0" headOffset="1"> + <subchannel color="4" subchannel="0" headOffset="1" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> </Channels> </InkName> - <InkName translate="text" name="PhysicalCcMmYKk" text="Seven Color Raw" InkID="Extended"> + <InkName translate="text" name="PhysicalCcMmYYk" text="Seven Color Raw" InkID="Extended"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> - <channel name="extended_black" index="1"> - <subchannel color="0" subchannel="1"> - <ChannelDensityParam name="BlackDensity"/> - </subchannel> - </channel> - <channel name="f360_standard_cyan" index="2"> - <subchannel color="2" headOffset="1"> + <channel name="f360_standard_cyan" index="1"> + <subchannel color="2" headOffset="1" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> - <channel name="extended_cyan" index="3"> - <subchannel color="2" subchannel="1"> + <channel name="extended_cyan" index="2"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> - <channel name="f360_standard_magenta" index="4"> - <subchannel color="1" headOffset="1"> + <channel name="f360_standard_magenta" index="3"> + <subchannel color="1" headOffset="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> - <channel name="extended_magenta" index="5"> - <subchannel color="1" subchannel="1"> + <channel name="extended_magenta" index="4"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> + <channel name="extended_yellow" index="5"> + <subchannel color="4" subchannel="2" name="DarkYellow" text="Dark Yellow" translate="text"> + <ChannelDensityParam name="YellowDensity"/> + </subchannel> + </channel> <channel name="f360_photo_yellow" index="6"> - <subchannel color="4" subchannel="0" headOffset="1"> + <subchannel color="4" subchannel="0" headOffset="1" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> diff --git a/src/xml/escp2/inks/f360_ultrachrome.xml b/src/xml/escp2/inks/f360_ultrachrome.xml index f565001..464e060 100644 --- a/src/xml/escp2/inks/f360_ultrachrome.xml +++ b/src/xml/escp2/inks/f360_ultrachrome.xml @@ -35,11 +35,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhotoCMYK7" text="Seven Color Photo" InkID="CcMmYKk"> <Channels> <channel name="f360_photo2_black" index="0"> - <subchannel color="0" subchannel="0" headOffset="1"> + <subchannel color="0" subchannel="0" headOffset="1" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> <SubchannelTransitionParam name="GrayTrans"/> </subchannel> - <subchannel color="0" subchannel="1"> + <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> <SubchannelTransitionParam name="GrayTrans"/> <SubchannelValueParam name="GrayValue"/> @@ -48,11 +48,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="f360_photo_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2" subchannel="0" headOffset="1"> + <subchannel color="2" subchannel="0" headOffset="1" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> </subchannel> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> <SubchannelValueParam name="LightCyanValue"/> @@ -61,11 +61,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="f360_photo_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1" subchannel="0" headOffset="1"> + <subchannel color="1" subchannel="0" headOffset="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> </subchannel> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> <SubchannelValueParam name="LightMagentaValue"/> @@ -74,7 +74,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="f360_photo_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4" subchannel="0" headOffset="1"> + <subchannel color="4" subchannel="0" headOffset="1" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -84,17 +84,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="f360_photo_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2" subchannel="0" headOffset="1"> + <subchannel color="2" subchannel="0" headOffset="1" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> </subchannel> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> <SubchannelValueParam name="LightCyanValue"/> @@ -103,11 +103,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="f360_photo_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1" subchannel="0" headOffset="1"> + <subchannel color="1" subchannel="0" headOffset="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> </subchannel> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> <SubchannelValueParam name="LightMagentaValue"/> @@ -116,7 +116,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="f360_photo_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4" subchannel="0" headOffset="1"> + <subchannel color="4" subchannel="0" headOffset="1" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -127,11 +127,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <Channels> <channel name="f360_photo_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2" subchannel="0" headOffset="1"> + <subchannel color="2" subchannel="0" headOffset="1" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> </subchannel> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> <SubchannelValueParam name="LightCyanValue"/> @@ -140,11 +140,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="f360_photo_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1" subchannel="0" headOffset="1"> + <subchannel color="1" subchannel="0" headOffset="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> </subchannel> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> <SubchannelValueParam name="LightMagentaValue"/> @@ -153,7 +153,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="f360_photo_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4" subchannel="0" headOffset="1"> + <subchannel color="4" subchannel="0" headOffset="1" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -163,25 +163,25 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="standard_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -192,19 +192,19 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <Channels> <channel name="standard_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -214,11 +214,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="Gray2" text="Two Level Grayscale" InkID="CcMmYKk"> <Channels> <channel name="f360_photo2_black" index="0"> - <subchannel color="0" subchannel="0" headOffset="1"> + <subchannel color="0" subchannel="0" headOffset="1" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> <SubchannelTransitionParam name="GrayTrans"/> </subchannel> - <subchannel color="0" subchannel="1"> + <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> <SubchannelTransitionParam name="GrayTrans"/> <SubchannelValueParam name="GrayValue"/> @@ -231,7 +231,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> @@ -241,12 +241,12 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalBlack2" text="Two Color Raw" InkID="Extended"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="extended_black" index="1"> - <subchannel color="0" subchannel="1"> + <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> @@ -256,17 +256,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended"> <Channels> <channel name="standard_cyan" index="0"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="1"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="2"> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -276,22 +276,22 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="standard_cyan" index="1"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="3"> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -301,27 +301,27 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCcMmY" text="Five Color Raw" InkID="Extended"> <Channels> <channel name="f360_standard_cyan" index="0"> - <subchannel color="2" headOffset="1"> + <subchannel color="2" headOffset="1" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="extended_cyan" index="1"> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="f360_standard_magenta" index="2"> - <subchannel color="1" headOffset="1"> + <subchannel color="1" headOffset="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="extended_magenta" index="3"> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="f360_photo_yellow" index="4"> - <subchannel color="4" subchannel="0" headOffset="1"> + <subchannel color="4" subchannel="0" headOffset="1" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -331,32 +331,32 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCcMmYK" text="Six Color Raw" InkID="Extended"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="f360_standard_cyan" index="1"> - <subchannel color="2" headOffset="1"> + <subchannel color="2" headOffset="1" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="extended_cyan" index="2"> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="f360_standard_magenta" index="3"> - <subchannel color="1" headOffset="1"> + <subchannel color="1" headOffset="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="extended_magenta" index="4"> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="f360_photo_yellow" index="5"> - <subchannel color="4" subchannel="0" headOffset="1"> + <subchannel color="4" subchannel="0" headOffset="1" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -366,45 +366,45 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCcMmYKk" text="Seven Color Raw" InkID="Extended"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="extended_black" index="1"> - <subchannel color="0" subchannel="1"> + <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="f360_standard_cyan" index="2"> - <subchannel color="2" headOffset="1"> + <subchannel color="2" headOffset="1" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="extended_cyan" index="3"> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="f360_standard_magenta" index="4"> - <subchannel color="1" headOffset="1"> + <subchannel color="1" headOffset="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="extended_magenta" index="5"> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="f360_photo_yellow" index="6"> - <subchannel color="4" subchannel="0" headOffset="1"> + <subchannel color="4" subchannel="0" headOffset="1" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> </Channels> </InkName> </InkList> - <InkList translate="text" name="ultramatte" - text="UltraChrome Matte Black"> + + <InkList translate="text" name="ultramatte" text="UltraChrome Matte Black"> <Shades> <shade count="2">1.000000 0.330000</shade> <shade count="2">1.000000 0.330000</shade> @@ -418,11 +418,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhotoCMYK7" text="Seven Color Photo" InkID="CcMmYKk"> <Channels> <channel name="f360_photo2_black" index="0"> - <subchannel color="0" subchannel="0" headOffset="1"> + <subchannel color="0" subchannel="0" headOffset="1" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> <SubchannelTransitionParam name="GrayTrans"/> </subchannel> - <subchannel color="0" subchannel="1"> + <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> <SubchannelTransitionParam name="GrayTrans"/> <SubchannelValueParam name="GrayValue"/> @@ -430,11 +430,12 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </subchannel> </channel> <channel name="f360_photo_cyan" index="1"> - <subchannel color="2" subchannel="0" headOffset="1"> + <HueCurveParam name="CyanHueCurve"/> + <subchannel color="2" subchannel="0" headOffset="1" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> </subchannel> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> <SubchannelValueParam name="LightCyanValue"/> @@ -442,11 +443,12 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </subchannel> </channel> <channel name="f360_photo_magenta" index="2"> - <subchannel color="1" subchannel="0" headOffset="1"> + <HueCurveParam name="MagentaHueCurve"/> + <subchannel color="1" subchannel="0" headOffset="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> </subchannel> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> <SubchannelValueParam name="LightMagentaValue"/> @@ -454,7 +456,8 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </subchannel> </channel> <channel name="f360_photo_yellow" index="3"> - <subchannel color="4" subchannel="0" headOffset="1"> + <HueCurveParam name="YellowHueCurve"/> + <subchannel color="4" subchannel="0" headOffset="1" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -464,16 +467,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="f360_photo_cyan" index="1"> - <subchannel color="2" subchannel="0" headOffset="1"> + <HueCurveParam name="CyanHueCurve"/> + <subchannel color="2" subchannel="0" headOffset="1" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> </subchannel> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> <SubchannelValueParam name="LightCyanValue"/> @@ -481,11 +485,12 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </subchannel> </channel> <channel name="f360_photo_magenta" index="2"> - <subchannel color="1" subchannel="0" headOffset="1"> + <HueCurveParam name="MagentaHueCurve"/> + <subchannel color="1" subchannel="0" headOffset="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> </subchannel> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> <SubchannelValueParam name="LightMagentaValue"/> @@ -493,7 +498,8 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </subchannel> </channel> <channel name="f360_photo_yellow" index="3"> - <subchannel color="4" subchannel="0" headOffset="1"> + <HueCurveParam name="YellowHueCurve"/> + <subchannel color="4" subchannel="0" headOffset="1" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -503,11 +509,12 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhotoCMY" text="Five Color Photo Composite" InkID="CcMmYK"> <Channels> <channel name="f360_photo_cyan" index="1"> - <subchannel color="2" subchannel="0" headOffset="1"> + <HueCurveParam name="CyanHueCurve"/> + <subchannel color="2" subchannel="0" headOffset="1" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> </subchannel> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> <SubchannelValueParam name="LightCyanValue"/> @@ -515,11 +522,12 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </subchannel> </channel> <channel name="f360_photo_magenta" index="2"> - <subchannel color="1" subchannel="0" headOffset="1"> + <HueCurveParam name="MagentaHueCurve"/> + <subchannel color="1" subchannel="0" headOffset="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> </subchannel> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> <SubchannelValueParam name="LightMagentaValue"/> @@ -527,7 +535,8 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </subchannel> </channel> <channel name="f360_photo_yellow" index="3"> - <subchannel color="4" subchannel="0" headOffset="1"> + <HueCurveParam name="YellowHueCurve"/> + <subchannel color="4" subchannel="0" headOffset="1" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -537,22 +546,25 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="standard_cyan" index="1"> - <subchannel color="2"> + <HueCurveParam name="CyanHueCurve"/> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> - <subchannel color="1"> + <HueCurveParam name="MagentaHueCurve"/> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="3"> - <subchannel color="4"> + <HueCurveParam name="YellowHueCurve"/> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -562,17 +574,20 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="RGB" text="Three Color Composite" InkID="CMYK"> <Channels> <channel name="standard_cyan" index="1"> - <subchannel color="2"> + <HueCurveParam name="CyanHueCurve"/> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> - <subchannel color="1"> + <HueCurveParam name="MagentaHueCurve"/> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="3"> - <subchannel color="4"> + <HueCurveParam name="YellowHueCurve"/> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -582,11 +597,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="Gray2" text="Two Level Grayscale" InkID="CcMmYKk"> <Channels> <channel name="f360_photo2_black" index="0"> - <subchannel color="0" subchannel="0" headOffset="1"> + <subchannel color="0" subchannel="0" headOffset="1" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> <SubchannelTransitionParam name="GrayTrans"/> </subchannel> - <subchannel color="0" subchannel="1"> + <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> <SubchannelTransitionParam name="GrayTrans"/> <SubchannelValueParam name="GrayValue"/> @@ -599,7 +614,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> @@ -609,12 +624,12 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalBlack2" text="Two Color Raw" InkID="Extended"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="extended_black" index="1"> - <subchannel color="0" subchannel="1"> + <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> @@ -624,17 +639,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended"> <Channels> <channel name="standard_cyan" index="0"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="1"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="2"> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -644,22 +659,22 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="standard_cyan" index="1"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="3"> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -669,27 +684,27 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCcMmY" text="Five Color Raw" InkID="Extended"> <Channels> <channel name="f360_standard_cyan" index="0"> - <subchannel color="2" headOffset="1"> + <subchannel color="2" headOffset="1" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="extended_cyan" index="1"> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="f360_standard_magenta" index="2"> - <subchannel color="1" headOffset="1"> + <subchannel color="1" headOffset="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="extended_magenta" index="3"> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="f360_photo_yellow" index="4"> - <subchannel color="4" subchannel="0" headOffset="1"> + <subchannel color="4" subchannel="0" headOffset="1" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -699,32 +714,32 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCcMmYK" text="Six Color Raw" InkID="Extended"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="f360_standard_cyan" index="1"> - <subchannel color="2" headOffset="1"> + <subchannel color="2" headOffset="1" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="extended_cyan" index="2"> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="f360_standard_magenta" index="3"> - <subchannel color="1" headOffset="1"> + <subchannel color="1" headOffset="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="extended_magenta" index="4"> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="f360_photo_yellow" index="5"> - <subchannel color="4" subchannel="0" headOffset="1"> + <subchannel color="4" subchannel="0" headOffset="1" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -734,37 +749,37 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCcMmYKk" text="Seven Color Raw" InkID="Extended"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="extended_black" index="1"> - <subchannel color="0" subchannel="1"> + <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="f360_standard_cyan" index="2"> - <subchannel color="2" headOffset="1"> + <subchannel color="2" headOffset="1" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="extended_cyan" index="3"> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="f360_standard_magenta" index="4"> - <subchannel color="1" headOffset="1"> + <subchannel color="1" headOffset="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="extended_magenta" index="5"> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="f360_photo_yellow" index="6"> - <subchannel color="4" subchannel="0" headOffset="1"> + <subchannel color="4" subchannel="0" headOffset="1" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> diff --git a/src/xml/escp2/inks/f360_ultrachrome_k3.xml b/src/xml/escp2/inks/f360_ultrachrome_k3.xml index d9a64f6..0d3b142 100644 --- a/src/xml/escp2/inks/f360_ultrachrome_k3.xml +++ b/src/xml/escp2/inks/f360_ultrachrome_k3.xml @@ -36,17 +36,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhotoCMYK8" text="Eight Color Photo" InkID="CcMmYKk"> <Channels> <channel name="f360_photo3_black" index="0"> - <subchannel color="0" subchannel="0" headOffset="1"> + <subchannel color="0" subchannel="0" headOffset="1" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> <SubchannelTransitionParam name="DarkGrayTrans"/> </subchannel> - <subchannel color="0" subchannel="1"> + <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> <SubchannelTransitionParam name="DarkGrayTrans"/> <SubchannelValueParam name="DarkGrayValue"/> <SubchannelScaleParam name="DarkGrayScale"/> </subchannel> - <subchannel color="0" subchannel="3" headOffset="1"> + <subchannel color="0" subchannel="3" headOffset="1" name="LightLightBlack" text="Light Light Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> <SubchannelTransitionParam name="LightGrayTrans"/> <SubchannelValueParam name="LightGrayValue"/> @@ -55,11 +55,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="f360x_photo_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2" subchannel="0"> + <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> </subchannel> - <subchannel color="2" subchannel="1" headOffset="1"> + <subchannel color="2" subchannel="1" headOffset="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> <SubchannelValueParam name="LightCyanValue"/> @@ -68,11 +68,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="f360_photo_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1" subchannel="0" headOffset="1"> + <subchannel color="1" subchannel="0" headOffset="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> </subchannel> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> <SubchannelValueParam name="LightMagentaValue"/> @@ -81,7 +81,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="standard_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -91,11 +91,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhotoCMYK7" text="Seven Color Photo" InkID="CcMmYKk"> <Channels> <channel name="f360_photo2_black" index="0"> - <subchannel color="0" subchannel="0" headOffset="1"> + <subchannel color="0" subchannel="0" headOffset="1" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> <SubchannelTransitionParam name="GrayTrans"/> </subchannel> - <subchannel color="0" subchannel="1"> + <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> <SubchannelTransitionParam name="GrayTrans"/> <SubchannelValueParam name="GrayValue"/> @@ -104,11 +104,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="f360x_photo_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2" subchannel="0"> + <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> </subchannel> - <subchannel color="2" subchannel="1" headOffset="1"> + <subchannel color="2" subchannel="1" headOffset="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> <SubchannelValueParam name="LightCyanValue"/> @@ -117,11 +117,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="f360_photo_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1" subchannel="0" headOffset="1"> + <subchannel color="1" subchannel="0" headOffset="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> </subchannel> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> <SubchannelValueParam name="LightMagentaValue"/> @@ -130,7 +130,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="standard_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -140,17 +140,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK"> <Channels> <channel name="f360_black" index="0"> - <subchannel color="0" subchannel="0" headOffset="1"> + <subchannel color="0" subchannel="0" headOffset="1" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="f360x_photo_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2" subchannel="0"> + <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> </subchannel> - <subchannel color="2" subchannel="1" headOffset="1"> + <subchannel color="2" subchannel="1" headOffset="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> <SubchannelValueParam name="LightCyanValue"/> @@ -159,11 +159,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="f360_photo_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1" subchannel="0" headOffset="1"> + <subchannel color="1" subchannel="0" headOffset="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> </subchannel> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> <SubchannelValueParam name="LightMagentaValue"/> @@ -172,7 +172,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="standard_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -183,11 +183,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <Channels> <channel name="f360x_photo_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2" subchannel="0"> + <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> </subchannel> - <subchannel color="2" subchannel="1" headOffset="1"> + <subchannel color="2" subchannel="1" headOffset="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> <SubchannelValueParam name="LightCyanValue"/> @@ -196,11 +196,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="f360_photo_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1" subchannel="0" headOffset="1"> + <subchannel color="1" subchannel="0" headOffset="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> </subchannel> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> <SubchannelValueParam name="LightMagentaValue"/> @@ -209,7 +209,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="standard_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -219,25 +219,25 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK"> <Channels> <channel name="f360_black" index="0"> - <subchannel color="0" subchannel="0" headOffset="1"> + <subchannel color="0" subchannel="0" headOffset="1" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="standard_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="f360_standard_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1" headOffset="1"> + <subchannel color="1" headOffset="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -248,19 +248,19 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <Channels> <channel name="standard_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="f360_standard_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1" headOffset="1"> + <subchannel color="1" headOffset="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -270,42 +270,42 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMYKkk" text="Eight Color Raw" InkID="Extended"> <Channels> <channel name="f360_black" index="0"> - <subchannel color="0" subchannel="0" headOffset="1"> + <subchannel color="0" subchannel="0" headOffset="1" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="extended_black" index="1"> - <subchannel color="0" subchannel="1"> + <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="f360_extended_photo3_black" index="2"> - <subchannel color="0" subchannel="3" headOffset="1"> + <subchannel color="0" subchannel="3" headOffset="1" name="LightLightBlack" text="Light Light Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="standard_cyan" index="3"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="f360_extended_cyan" index="4"> - <subchannel color="2" subchannel="1" headOffset="1"> + <subchannel color="2" subchannel="1" headOffset="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="f360_standard_magenta" index="5"> - <subchannel color="1" headOffset="1"> + <subchannel color="1" headOffset="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="extended_magenta" index="6"> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="7"> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -328,17 +328,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhotoCMYK8" text="Eight Color Photo" InkID="CcMmYKk"> <Channels> <channel name="f360_photo3_black" index="0"> - <subchannel color="0" subchannel="0" headOffset="1"> + <subchannel color="0" subchannel="0" headOffset="1" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> <SubchannelTransitionParam name="DarkGrayTrans"/> </subchannel> - <subchannel color="0" subchannel="1"> + <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> <SubchannelTransitionParam name="DarkGrayTrans"/> <SubchannelValueParam name="DarkGrayValue"/> <SubchannelScaleParam name="DarkGrayScale"/> </subchannel> - <subchannel color="0" subchannel="3" headOffset="1"> + <subchannel color="0" subchannel="3" headOffset="1" name="LightLightBlack" text="Light Light Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> <SubchannelTransitionParam name="LightGrayTrans"/> <SubchannelValueParam name="LightGrayValue"/> @@ -346,11 +346,12 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </subchannel> </channel> <channel name="f360x_photo_cyan" index="1"> - <subchannel color="2" subchannel="0"> + <HueCurveParam name="CyanHueCurve"/> + <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> </subchannel> - <subchannel color="2" subchannel="1" headOffset="1"> + <subchannel color="2" subchannel="1" headOffset="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> <SubchannelValueParam name="LightCyanValue"/> @@ -358,11 +359,12 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </subchannel> </channel> <channel name="f360_photo_magenta" index="2"> - <subchannel color="1" subchannel="0" headOffset="1"> + <HueCurveParam name="MagentaHueCurve"/> + <subchannel color="1" subchannel="0" headOffset="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> </subchannel> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> <SubchannelValueParam name="LightMagentaValue"/> @@ -370,7 +372,8 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </subchannel> </channel> <channel name="standard_yellow" index="3"> - <subchannel color="4"> + <HueCurveParam name="YellowHueCurve"/> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -380,11 +383,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhotoCMYK7" text="Seven Color Photo" InkID="CcMmYKk"> <Channels> <channel name="f360_photo2_black" index="0"> - <subchannel color="0" subchannel="0" headOffset="1"> + <subchannel color="0" subchannel="0" headOffset="1" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> <SubchannelTransitionParam name="GrayTrans"/> </subchannel> - <subchannel color="0" subchannel="1"> + <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> <SubchannelTransitionParam name="GrayTrans"/> <SubchannelValueParam name="GrayValue"/> @@ -392,11 +395,12 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </subchannel> </channel> <channel name="f360x_photo_cyan" index="1"> - <subchannel color="2" subchannel="0"> + <HueCurveParam name="CyanHueCurve"/> + <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> </subchannel> - <subchannel color="2" subchannel="1" headOffset="1"> + <subchannel color="2" subchannel="1" headOffset="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> <SubchannelValueParam name="LightCyanValue"/> @@ -404,11 +408,12 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </subchannel> </channel> <channel name="f360_photo_magenta" index="2"> - <subchannel color="1" subchannel="0" headOffset="1"> + <HueCurveParam name="MagentaHueCurve"/> + <subchannel color="1" subchannel="0" headOffset="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> </subchannel> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> <SubchannelValueParam name="LightMagentaValue"/> @@ -416,7 +421,8 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </subchannel> </channel> <channel name="standard_yellow" index="3"> - <subchannel color="4"> + <HueCurveParam name="YellowHueCurve"/> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -426,16 +432,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK"> <Channels> <channel name="f360_black" index="0"> - <subchannel color="0" subchannel="0" headOffset="1"> + <subchannel color="0" subchannel="0" headOffset="1" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="f360x_photo_cyan" index="1"> - <subchannel color="2" subchannel="0"> + <HueCurveParam name="CyanHueCurve"/> + <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> </subchannel> - <subchannel color="2" subchannel="1" headOffset="1"> + <subchannel color="2" subchannel="1" headOffset="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> <SubchannelValueParam name="LightCyanValue"/> @@ -443,11 +450,12 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </subchannel> </channel> <channel name="f360_photo_magenta" index="2"> - <subchannel color="1" subchannel="0" headOffset="1"> + <HueCurveParam name="MagentaHueCurve"/> + <subchannel color="1" subchannel="0" headOffset="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> </subchannel> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> <SubchannelValueParam name="LightMagentaValue"/> @@ -455,7 +463,8 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </subchannel> </channel> <channel name="standard_yellow" index="3"> - <subchannel color="4"> + <HueCurveParam name="YellowHueCurve"/> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -465,11 +474,12 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhotoCMY" text="Five Color Photo Composite" InkID="CcMmYK"> <Channels> <channel name="f360x_photo_cyan" index="1"> - <subchannel color="2" subchannel="0"> + <HueCurveParam name="CyanHueCurve"/> + <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> </subchannel> - <subchannel color="2" subchannel="1" headOffset="1"> + <subchannel color="2" subchannel="1" headOffset="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> <SubchannelValueParam name="LightCyanValue"/> @@ -477,11 +487,12 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </subchannel> </channel> <channel name="f360_photo_magenta" index="2"> - <subchannel color="1" subchannel="0" headOffset="1"> + <HueCurveParam name="MagentaHueCurve"/> + <subchannel color="1" subchannel="0" headOffset="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> </subchannel> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> <SubchannelValueParam name="LightMagentaValue"/> @@ -489,7 +500,8 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </subchannel> </channel> <channel name="standard_yellow" index="3"> - <subchannel color="4"> + <HueCurveParam name="YellowHueCurve"/> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -499,22 +511,25 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK"> <Channels> <channel name="f360_black" index="0"> - <subchannel color="0" subchannel="0" headOffset="1"> + <subchannel color="0" subchannel="0" headOffset="1" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="standard_cyan" index="1"> - <subchannel color="2"> + <HueCurveParam name="CyanHueCurve"/> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="f360_standard_magenta" index="2"> - <subchannel color="1" headOffset="1"> + <HueCurveParam name="MagentaHueCurve"/> + <subchannel color="1" headOffset="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="3"> - <subchannel color="4"> + <HueCurveParam name="YellowHueCurve"/> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -524,17 +539,20 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="CMY" text="Three Color Composite" InkID="CMYK"> <Channels> <channel name="standard_cyan" index="1"> - <subchannel color="2"> + <HueCurveParam name="CyanHueCurve"/> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="f360_standard_magenta" index="2"> - <subchannel color="1" headOffset="1"> + <HueCurveParam name="MagentaHueCurve"/> + <subchannel color="1" headOffset="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="3"> - <subchannel color="4"> + <HueCurveParam name="YellowHueCurve"/> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -544,42 +562,42 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMYKkk" text="Eight Color Raw" InkID="Extended"> <Channels> <channel name="f360_black" index="0"> - <subchannel color="0" subchannel="0" headOffset="1"> + <subchannel color="0" subchannel="0" headOffset="1" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="extended_black" index="1"> - <subchannel color="0" subchannel="1"> + <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="f360_extended_photo3_black" index="2"> - <subchannel color="0" subchannel="3" headOffset="1"> + <subchannel color="0" subchannel="3" headOffset="1" name="LightLightBlack" text="Light Light Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="standard_cyan" index="3"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="f360_extended_cyan" index="4"> - <subchannel color="2" subchannel="1" headOffset="1"> + <subchannel color="2" subchannel="1" headOffset="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="f360_standard_magenta" index="5"> - <subchannel color="1" headOffset="1"> + <subchannel color="1" headOffset="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="extended_magenta" index="6"> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="7"> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> diff --git a/src/xml/escp2/inks/f360_ultrachrome_k3v.xml b/src/xml/escp2/inks/f360_ultrachrome_k3v.xml new file mode 100644 index 0000000..4660f47 --- /dev/null +++ b/src/xml/escp2/inks/f360_ultrachrome_k3v.xml @@ -0,0 +1,608 @@ +<?xml version="1.0"?> + +<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0" +xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" +xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd"> +<copyright> + * Copyright 2008 Robert Krawitz (rlk@alum.mit.edu) + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the Free + * Software Foundation; either version 2 of the License, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +</copyright> +<escp2:InkGroup name="f360_ultrachrome_k3v"> +<InkList translate="text" name="ultra3photo" text="Photo Black"> + <Shades> + <shade count="3">1.000000 0.480000 0.160000</shade> + <shade count="2">1.000000 0.340000</shade> + <shade count="2">1.000000 0.250000</shade> + <shade count="1">1.000000</shade> + <shade count="1">1.000000</shade> + <shade count="1">1.000000</shade> + <shade count="1">1.000000</shade> + <shade count="1">1.000000</shade> + </Shades> + + <InkName translate="text" name="PhotoCMYK8" text="Eight Color Photo" InkID="CcMmYKk"> + <Channels> + <channel name="f360_photo3_black" index="0"> + <subchannel color="0" subchannel="0" headOffset="1" name="Black" text="Black" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="DarkGrayTrans"/> + </subchannel> + <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="DarkGrayTrans"/> + <SubchannelValueParam name="DarkGrayValue"/> + <SubchannelScaleParam name="DarkGrayScale"/> + </subchannel> + <subchannel color="0" subchannel="3" headOffset="1" name="LightLightBlack" text="Light Light Black" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="LightGrayTrans"/> + <SubchannelValueParam name="LightGrayValue"/> + <SubchannelScaleParam name="LightGrayScale"/> + </subchannel> + </channel> + <channel name="f360x_photo_cyan" index="1"> + <HueCurveParam name="CyanHueCurve"/> + <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text"> + <ChannelDensityParam name="CyanDensity"/> + <SubchannelTransitionParam name="LightCyanTrans"/> + </subchannel> + <subchannel color="2" subchannel="1" headOffset="1" name="LightCyan" text="Light Cyan" translate="text"> + <ChannelDensityParam name="CyanDensity"/> + <SubchannelTransitionParam name="LightCyanTrans"/> + <SubchannelValueParam name="LightCyanValue"/> + <SubchannelScaleParam name="LightCyanScale"/> + </subchannel> + </channel> + <channel name="f360_photo_magenta" index="2"> + <HueCurveParam name="MagentaHueCurve"/> + <subchannel color="1" subchannel="0" headOffset="1" name="Magenta" text="Magenta" translate="text"> + <ChannelDensityParam name="MagentaDensity"/> + <SubchannelTransitionParam name="LightMagentaTrans"/> + </subchannel> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> + <ChannelDensityParam name="MagentaDensity"/> + <SubchannelTransitionParam name="LightMagentaTrans"/> + <SubchannelValueParam name="LightMagentaValue"/> + <SubchannelScaleParam name="LightMagentaScale"/> + </subchannel> + </channel> + <channel name="standard_yellow" index="3"> + <HueCurveParam name="YellowHueCurve"/> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> + <ChannelDensityParam name="YellowDensity"/> + </subchannel> + </channel> + </Channels> + </InkName> + + <InkName translate="text" name="PhotoCMYK7" text="Seven Color Photo" InkID="CcMmYKk"> + <Channels> + <channel name="f360_photo2_black" index="0"> + <subchannel color="0" subchannel="0" headOffset="1" name="Black" text="Black" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="GrayTrans"/> + </subchannel> + <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="GrayTrans"/> + <SubchannelValueParam name="GrayValue"/> + <SubchannelScaleParam name="GrayScale"/> + </subchannel> + </channel> + <channel name="f360x_photo_cyan" index="1"> + <HueCurveParam name="CyanHueCurve"/> + <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text"> + <ChannelDensityParam name="CyanDensity"/> + <SubchannelTransitionParam name="LightCyanTrans"/> + </subchannel> + <subchannel color="2" subchannel="1" headOffset="1" name="LightCyan" text="Light Cyan" translate="text"> + <ChannelDensityParam name="CyanDensity"/> + <SubchannelTransitionParam name="LightCyanTrans"/> + <SubchannelValueParam name="LightCyanValue"/> + <SubchannelScaleParam name="LightCyanScale"/> + </subchannel> + </channel> + <channel name="f360_photo_magenta" index="2"> + <HueCurveParam name="MagentaHueCurve"/> + <subchannel color="1" subchannel="0" headOffset="1" name="Magenta" text="Magenta" translate="text"> + <ChannelDensityParam name="MagentaDensity"/> + <SubchannelTransitionParam name="LightMagentaTrans"/> + </subchannel> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> + <ChannelDensityParam name="MagentaDensity"/> + <SubchannelTransitionParam name="LightMagentaTrans"/> + <SubchannelValueParam name="LightMagentaValue"/> + <SubchannelScaleParam name="LightMagentaScale"/> + </subchannel> + </channel> + <channel name="standard_yellow" index="3"> + <HueCurveParam name="YellowHueCurve"/> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> + <ChannelDensityParam name="YellowDensity"/> + </subchannel> + </channel> + </Channels> + </InkName> + + <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK"> + <Channels> + <channel name="f360_black" index="0"> + <subchannel color="0" subchannel="0" headOffset="1" name="Black" text="Black" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + </subchannel> + </channel> + <channel name="f360x_photo_cyan" index="1"> + <HueCurveParam name="CyanHueCurve"/> + <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text"> + <ChannelDensityParam name="CyanDensity"/> + <SubchannelTransitionParam name="LightCyanTrans"/> + </subchannel> + <subchannel color="2" subchannel="1" headOffset="1" name="LightCyan" text="Light Cyan" translate="text"> + <ChannelDensityParam name="CyanDensity"/> + <SubchannelTransitionParam name="LightCyanTrans"/> + <SubchannelValueParam name="LightCyanValue"/> + <SubchannelScaleParam name="LightCyanScale"/> + </subchannel> + </channel> + <channel name="f360_photo_magenta" index="2"> + <HueCurveParam name="MagentaHueCurve"/> + <subchannel color="1" subchannel="0" headOffset="1" name="Magenta" text="Magenta" translate="text"> + <ChannelDensityParam name="MagentaDensity"/> + <SubchannelTransitionParam name="LightMagentaTrans"/> + </subchannel> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> + <ChannelDensityParam name="MagentaDensity"/> + <SubchannelTransitionParam name="LightMagentaTrans"/> + <SubchannelValueParam name="LightMagentaValue"/> + <SubchannelScaleParam name="LightMagentaScale"/> + </subchannel> + </channel> + <channel name="standard_yellow" index="3"> + <HueCurveParam name="YellowHueCurve"/> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> + <ChannelDensityParam name="YellowDensity"/> + </subchannel> + </channel> + </Channels> + </InkName> + + <InkName translate="text" name="PhotoCMY" text="Five Color Photo Composite" InkID="CcMmYK"> + <Channels> + <channel name="f360x_photo_cyan" index="1"> + <HueCurveParam name="CyanHueCurve"/> + <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text"> + <ChannelDensityParam name="CyanDensity"/> + <SubchannelTransitionParam name="LightCyanTrans"/> + </subchannel> + <subchannel color="2" subchannel="1" headOffset="1" name="LightCyan" text="Light Cyan" translate="text"> + <ChannelDensityParam name="CyanDensity"/> + <SubchannelTransitionParam name="LightCyanTrans"/> + <SubchannelValueParam name="LightCyanValue"/> + <SubchannelScaleParam name="LightCyanScale"/> + </subchannel> + </channel> + <channel name="f360_photo_magenta" index="2"> + <HueCurveParam name="MagentaHueCurve"/> + <subchannel color="1" subchannel="0" headOffset="1" name="Magenta" text="Magenta" translate="text"> + <ChannelDensityParam name="MagentaDensity"/> + <SubchannelTransitionParam name="LightMagentaTrans"/> + </subchannel> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> + <ChannelDensityParam name="MagentaDensity"/> + <SubchannelTransitionParam name="LightMagentaTrans"/> + <SubchannelValueParam name="LightMagentaValue"/> + <SubchannelScaleParam name="LightMagentaScale"/> + </subchannel> + </channel> + <channel name="standard_yellow" index="3"> + <HueCurveParam name="YellowHueCurve"/> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> + <ChannelDensityParam name="YellowDensity"/> + </subchannel> + </channel> + </Channels> + </InkName> + + <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK"> + <Channels> + <channel name="f360_black" index="0"> + <subchannel color="0" subchannel="0" headOffset="1" name="Black" text="Black" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + </subchannel> + </channel> + <channel name="standard_cyan" index="1"> + <HueCurveParam name="CyanHueCurve"/> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> + <ChannelDensityParam name="CyanDensity"/> + </subchannel> + </channel> + <channel name="f360_standard_magenta" index="2"> + <HueCurveParam name="MagentaHueCurve"/> + <subchannel color="1" headOffset="1" name="Magenta" text="Magenta" translate="text"> + <ChannelDensityParam name="MagentaDensity"/> + </subchannel> + </channel> + <channel name="standard_yellow" index="3"> + <HueCurveParam name="YellowHueCurve"/> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> + <ChannelDensityParam name="YellowDensity"/> + </subchannel> + </channel> + </Channels> + </InkName> + + <InkName translate="text" name="CMY" text="Three Color Composite" InkID="CMYK"> + <Channels> + <channel name="standard_cyan" index="1"> + <HueCurveParam name="CyanHueCurve"/> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> + <ChannelDensityParam name="CyanDensity"/> + </subchannel> + </channel> + <channel name="f360_standard_magenta" index="2"> + <HueCurveParam name="MagentaHueCurve"/> + <subchannel color="1" headOffset="1" name="Magenta" text="Magenta" translate="text"> + <ChannelDensityParam name="MagentaDensity"/> + </subchannel> + </channel> + <channel name="standard_yellow" index="3"> + <HueCurveParam name="YellowHueCurve"/> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> + <ChannelDensityParam name="YellowDensity"/> + </subchannel> + </channel> + </Channels> + </InkName> + + <InkName translate="text" name="PhysicalCMYKkk" text="Eight Color Raw" InkID="Extended"> + <Channels> + <channel name="f360_black" index="0"> + <subchannel color="0" subchannel="0" headOffset="1" name="Black" text="Black" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + </subchannel> + </channel> + <channel name="extended_black" index="1"> + <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + </subchannel> + </channel> + <channel name="f360_extended_photo3_black" index="2"> + <subchannel color="0" subchannel="3" headOffset="1" name="LightLightBlack" text="Light Light Black" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + </subchannel> + </channel> + <channel name="standard_cyan" index="3"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> + <ChannelDensityParam name="CyanDensity"/> + </subchannel> + </channel> + <channel name="f360_extended_cyan" index="4"> + <subchannel color="2" subchannel="1" headOffset="1" name="LightCyan" text="Light Cyan" translate="text"> + <ChannelDensityParam name="CyanDensity"/> + </subchannel> + </channel> + <channel name="f360_standard_magenta" index="5"> + <subchannel color="1" headOffset="1" name="Magenta" text="Magenta" translate="text"> + <ChannelDensityParam name="MagentaDensity"/> + </subchannel> + </channel> + <channel name="extended_magenta" index="6"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> + <ChannelDensityParam name="MagentaDensity"/> + </subchannel> + </channel> + <channel name="standard_yellow" index="7"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> + <ChannelDensityParam name="YellowDensity"/> + </subchannel> + </channel> + </Channels> + </InkName> +</InkList> + +<InkList translate="text" name="ultra3matte" text="Matte Black"> + <Shades> + <shade count="3">1.000000 0.278000 0.093000</shade> + <shade count="2">1.000000 0.340000</shade> + <shade count="2">1.000000 0.250000</shade> + <shade count="1">1.000000</shade> + <shade count="1">1.000000</shade> + <shade count="1">1.000000</shade> + <shade count="1">1.000000</shade> + <shade count="1">1.000000</shade> + </Shades> + + <InkName translate="text" name="PhotoCMYK8" text="Eight Color Photo" InkID="CcMmYKk"> + <Channels> + <channel name="f360_photo3_black" index="0"> + <subchannel color="0" subchannel="0" headOffset="1" name="Black" text="Black" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="DarkGrayTrans"/> + </subchannel> + <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="DarkGrayTrans"/> + <SubchannelValueParam name="DarkGrayValue"/> + <SubchannelScaleParam name="DarkGrayScale"/> + </subchannel> + <subchannel color="0" subchannel="3" headOffset="1" name="LightLightBlack" text="Light Light Black" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="LightGrayTrans"/> + <SubchannelValueParam name="LightGrayValue"/> + <SubchannelScaleParam name="LightGrayScale"/> + </subchannel> + </channel> + <channel name="f360x_photo_cyan" index="1"> + <HueCurveParam name="CyanHueCurve"/> + <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text"> + <ChannelDensityParam name="CyanDensity"/> + <SubchannelTransitionParam name="LightCyanTrans"/> + </subchannel> + <subchannel color="2" subchannel="1" headOffset="1" name="LightCyan" text="Light Cyan" translate="text"> + <ChannelDensityParam name="CyanDensity"/> + <SubchannelTransitionParam name="LightCyanTrans"/> + <SubchannelValueParam name="LightCyanValue"/> + <SubchannelScaleParam name="LightCyanScale"/> + </subchannel> + </channel> + <channel name="f360_photo_magenta" index="2"> + <HueCurveParam name="MagentaHueCurve"/> + <subchannel color="1" subchannel="0" headOffset="1" name="Magenta" text="Magenta" translate="text"> + <ChannelDensityParam name="MagentaDensity"/> + <SubchannelTransitionParam name="LightMagentaTrans"/> + </subchannel> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> + <ChannelDensityParam name="MagentaDensity"/> + <SubchannelTransitionParam name="LightMagentaTrans"/> + <SubchannelValueParam name="LightMagentaValue"/> + <SubchannelScaleParam name="LightMagentaScale"/> + </subchannel> + </channel> + <channel name="standard_yellow" index="3"> + <HueCurveParam name="YellowHueCurve"/> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> + <ChannelDensityParam name="YellowDensity"/> + </subchannel> + </channel> + </Channels> + </InkName> + + <InkName translate="text" name="PhotoCMYK7" text="Seven Color Photo" InkID="CcMmYKk"> + <Channels> + <channel name="f360_photo2_black" index="0"> + <subchannel color="0" subchannel="0" headOffset="1" name="Black" text="Black" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="GrayTrans"/> + </subchannel> + <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="GrayTrans"/> + <SubchannelValueParam name="GrayValue"/> + <SubchannelScaleParam name="GrayScale"/> + </subchannel> + </channel> + <channel name="f360x_photo_cyan" index="1"> + <HueCurveParam name="CyanHueCurve"/> + <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text"> + <ChannelDensityParam name="CyanDensity"/> + <SubchannelTransitionParam name="LightCyanTrans"/> + </subchannel> + <subchannel color="2" subchannel="1" headOffset="1" name="LightCyan" text="Light Cyan" translate="text"> + <ChannelDensityParam name="CyanDensity"/> + <SubchannelTransitionParam name="LightCyanTrans"/> + <SubchannelValueParam name="LightCyanValue"/> + <SubchannelScaleParam name="LightCyanScale"/> + </subchannel> + </channel> + <channel name="f360_photo_magenta" index="2"> + <HueCurveParam name="MagentaHueCurve"/> + <subchannel color="1" subchannel="0" headOffset="1" name="Magenta" text="Magenta" translate="text"> + <ChannelDensityParam name="MagentaDensity"/> + <SubchannelTransitionParam name="LightMagentaTrans"/> + </subchannel> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> + <ChannelDensityParam name="MagentaDensity"/> + <SubchannelTransitionParam name="LightMagentaTrans"/> + <SubchannelValueParam name="LightMagentaValue"/> + <SubchannelScaleParam name="LightMagentaScale"/> + </subchannel> + </channel> + <channel name="standard_yellow" index="3"> + <HueCurveParam name="YellowHueCurve"/> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> + <ChannelDensityParam name="YellowDensity"/> + </subchannel> + </channel> + </Channels> + </InkName> + + <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK"> + <Channels> + <channel name="f360_black" index="0"> + <subchannel color="0" subchannel="0" headOffset="1" name="Black" text="Black" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + </subchannel> + </channel> + <channel name="f360x_photo_cyan" index="1"> + <HueCurveParam name="CyanHueCurve"/> + <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text"> + <ChannelDensityParam name="CyanDensity"/> + <SubchannelTransitionParam name="LightCyanTrans"/> + </subchannel> + <subchannel color="2" subchannel="1" headOffset="1" name="LightCyan" text="Light Cyan" translate="text"> + <ChannelDensityParam name="CyanDensity"/> + <SubchannelTransitionParam name="LightCyanTrans"/> + <SubchannelValueParam name="LightCyanValue"/> + <SubchannelScaleParam name="LightCyanScale"/> + </subchannel> + </channel> + <channel name="f360_photo_magenta" index="2"> + <HueCurveParam name="MagentaHueCurve"/> + <subchannel color="1" subchannel="0" headOffset="1" name="Magenta" text="Magenta" translate="text"> + <ChannelDensityParam name="MagentaDensity"/> + <SubchannelTransitionParam name="LightMagentaTrans"/> + </subchannel> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> + <ChannelDensityParam name="MagentaDensity"/> + <SubchannelTransitionParam name="LightMagentaTrans"/> + <SubchannelValueParam name="LightMagentaValue"/> + <SubchannelScaleParam name="LightMagentaScale"/> + </subchannel> + </channel> + <channel name="standard_yellow" index="3"> + <HueCurveParam name="YellowHueCurve"/> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> + <ChannelDensityParam name="YellowDensity"/> + </subchannel> + </channel> + </Channels> + </InkName> + + <InkName translate="text" name="PhotoCMY" text="Five Color Photo Composite" InkID="CcMmYK"> + <Channels> + <channel name="f360x_photo_cyan" index="1"> + <HueCurveParam name="CyanHueCurve"/> + <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text"> + <ChannelDensityParam name="CyanDensity"/> + <SubchannelTransitionParam name="LightCyanTrans"/> + </subchannel> + <subchannel color="2" subchannel="1" headOffset="1" name="LightCyan" text="Light Cyan" translate="text"> + <ChannelDensityParam name="CyanDensity"/> + <SubchannelTransitionParam name="LightCyanTrans"/> + <SubchannelValueParam name="LightCyanValue"/> + <SubchannelScaleParam name="LightCyanScale"/> + </subchannel> + </channel> + <channel name="f360_photo_magenta" index="2"> + <HueCurveParam name="MagentaHueCurve"/> + <subchannel color="1" subchannel="0" headOffset="1" name="Magenta" text="Magenta" translate="text"> + <ChannelDensityParam name="MagentaDensity"/> + <SubchannelTransitionParam name="LightMagentaTrans"/> + </subchannel> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> + <ChannelDensityParam name="MagentaDensity"/> + <SubchannelTransitionParam name="LightMagentaTrans"/> + <SubchannelValueParam name="LightMagentaValue"/> + <SubchannelScaleParam name="LightMagentaScale"/> + </subchannel> + </channel> + <channel name="standard_yellow" index="3"> + <HueCurveParam name="YellowHueCurve"/> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> + <ChannelDensityParam name="YellowDensity"/> + </subchannel> + </channel> + </Channels> + </InkName> + + <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK"> + <Channels> + <channel name="f360_black" index="0"> + <subchannel color="0" subchannel="0" headOffset="1" name="Black" text="Black" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + </subchannel> + </channel> + <channel name="standard_cyan" index="1"> + <HueCurveParam name="CyanHueCurve"/> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> + <ChannelDensityParam name="CyanDensity"/> + </subchannel> + </channel> + <channel name="f360_standard_magenta" index="2"> + <HueCurveParam name="MagentaHueCurve"/> + <subchannel color="1" headOffset="1" name="Magenta" text="Magenta" translate="text"> + <ChannelDensityParam name="MagentaDensity"/> + </subchannel> + </channel> + <channel name="standard_yellow" index="3"> + <HueCurveParam name="YellowHueCurve"/> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> + <ChannelDensityParam name="YellowDensity"/> + </subchannel> + </channel> + </Channels> + </InkName> + + <InkName translate="text" name="CMY" text="Three Color Composite" InkID="CMYK"> + <Channels> + <channel name="standard_cyan" index="1"> + <HueCurveParam name="CyanHueCurve"/> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> + <ChannelDensityParam name="CyanDensity"/> + </subchannel> + </channel> + <channel name="f360_standard_magenta" index="2"> + <HueCurveParam name="MagentaHueCurve"/> + <subchannel color="1" headOffset="1" name="Magenta" text="Magenta" translate="text"> + <ChannelDensityParam name="MagentaDensity"/> + </subchannel> + </channel> + <channel name="standard_yellow" index="3"> + <HueCurveParam name="YellowHueCurve"/> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> + <ChannelDensityParam name="YellowDensity"/> + </subchannel> + </channel> + </Channels> + </InkName> + + <InkName translate="text" name="PhysicalCMYKkk" text="Eight Color Raw" InkID="Extended"> + <Channels> + <channel name="f360_black" index="0"> + <subchannel color="0" subchannel="0" headOffset="1" name="Black" text="Black" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + </subchannel> + </channel> + <channel name="extended_black" index="1"> + <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + </subchannel> + </channel> + <channel name="f360_extended_photo3_black" index="2"> + <subchannel color="0" subchannel="3" headOffset="1" name="LightLightBlack" text="Light Light Black" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + </subchannel> + </channel> + <channel name="standard_cyan" index="3"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> + <ChannelDensityParam name="CyanDensity"/> + </subchannel> + </channel> + <channel name="f360_extended_cyan" index="4"> + <subchannel color="2" subchannel="1" headOffset="1" name="LightCyan" text="Light Cyan" translate="text"> + <ChannelDensityParam name="CyanDensity"/> + </subchannel> + </channel> + <channel name="f360_standard_magenta" index="5"> + <subchannel color="1" headOffset="1" name="Magenta" text="Magenta" translate="text"> + <ChannelDensityParam name="MagentaDensity"/> + </subchannel> + </channel> + <channel name="extended_magenta" index="6"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> + <ChannelDensityParam name="MagentaDensity"/> + </subchannel> + </channel> + <channel name="standard_yellow" index="7"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> + <ChannelDensityParam name="YellowDensity"/> + </subchannel> + </channel> + </Channels> + </InkName> +</InkList> +</escp2:InkGroup> +</gutenprint> diff --git a/src/xml/escp2/inks/nx100.xml b/src/xml/escp2/inks/nx100.xml index f0a8d1c..7c3538f 100644 --- a/src/xml/escp2/inks/nx100.xml +++ b/src/xml/escp2/inks/nx100.xml @@ -32,25 +32,25 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK"> <Channels> <channel name="c64_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="c64_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="c64_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1" headOffset="90"> + <subchannel color="1" headOffset="90" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="c64_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4" headOffset="180"> + <subchannel color="4" headOffset="180" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -61,19 +61,19 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <Channels> <channel name="c64_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="c64_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1" headOffset="90"> + <subchannel color="1" headOffset="90" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="c64_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4" headOffset="180"> + <subchannel color="4" headOffset="180" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -83,7 +83,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> @@ -93,17 +93,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended"> <Channels> <channel name="c64_cyan" index="0"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="c64_magenta" index="1"> - <subchannel color="1" headOffset="90"> + <subchannel color="1" headOffset="90" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="c64_yellow" index="2"> - <subchannel color="4" headOffset="180"> + <subchannel color="4" headOffset="180" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -113,22 +113,22 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended"> <Channels> <channel name="c64_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="c64_cyan" index="1"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="c64_magenta" index="2"> - <subchannel color="1" headOffset="90"> + <subchannel color="1" headOffset="90" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="c64_yellow" index="3"> - <subchannel color="4" headOffset="180"> + <subchannel color="4" headOffset="180" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> diff --git a/src/xml/escp2/inks/photo_gen0.xml b/src/xml/escp2/inks/photo_gen0.xml index 8a61dcd..9231583 100644 --- a/src/xml/escp2/inks/photo_gen0.xml +++ b/src/xml/escp2/inks/photo_gen0.xml @@ -34,17 +34,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK"> <Channels> <channel name="photo_black" index="0"> - <subchannel color="0" subchannel="0"> + <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="photo_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2" subchannel="0"> + <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> </subchannel> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> <SubchannelValueParam name="LightCyanValue"/> @@ -53,11 +53,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="photo_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1" subchannel="0"> + <subchannel color="1" subchannel="0" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> </subchannel> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> <SubchannelValueParam name="LightMagentaValue"/> @@ -66,7 +66,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="photo_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4" subchannel="0"> + <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -77,11 +77,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <Channels> <channel name="photo_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2" subchannel="0"> + <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> </subchannel> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> <SubchannelValueParam name="LightCyanValue"/> @@ -90,11 +90,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="photo_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1" subchannel="0"> + <subchannel color="1" subchannel="0" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> </subchannel> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> <SubchannelValueParam name="LightMagentaValue"/> @@ -103,7 +103,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="photo_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4" subchannel="0"> + <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -113,25 +113,25 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="standard_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -142,19 +142,19 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <Channels> <channel name="standard_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -164,7 +164,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> @@ -174,17 +174,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended"> <Channels> <channel name="standard_cyan" index="0"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="1"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="2"> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -194,22 +194,22 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="standard_cyan" index="1"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="3"> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -219,27 +219,27 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCcMmY" text="Five Color Raw" InkID="Extended"> <Channels> <channel name="standard_cyan" index="0"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="extended_cyan" index="1"> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="extended_magenta" index="3"> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="photo_yellow" index="4"> - <subchannel color="4" subchannel="0"> + <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -249,32 +249,32 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCcMmYK" text="Six Color Raw" InkID="Extended"> <Channels> <channel name="photo_black" index="0"> - <subchannel color="0" subchannel="0"> + <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="standard_cyan" index="1"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="extended_cyan" index="2"> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="3"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="extended_magenta" index="4"> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="photo_yellow" index="5"> - <subchannel color="4" subchannel="0"> + <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -290,25 +290,60 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="Quadtone" text="Quadtone" InkID="Quadtone"> <Channels> <channel name="quadtone" index="0"> - <subchannel color="0"> - <ChannelDensityParam name="BlackDensity" /> - <SubchannelTransitionParam name="GrayTrans"/> + <subchannel color="0" name="Black" text="Black" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="Gray3Trans"/> + </subchannel> + <subchannel color="2" name="Gray3" text="Gray 3" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="Gray3Trans"/> + <SubchannelValueParam name="Gray3Value"/> + <SubchannelScaleParam name="Gray3Scale"/> + </subchannel> + <subchannel color="1" name="Gray2" text="Gray 2" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="Gray2Trans"/> + <SubchannelValueParam name="Gray2Value"/> + <SubchannelScaleParam name="Gray2Scale"/> + </subchannel> + <subchannel color="4" name="Gray1" text="Gray 1" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="Gray1Trans"/> + <SubchannelValueParam name="Gray1Value"/> + <SubchannelScaleParam name="Gray1Scale"/> + </subchannel> + </channel> + </Channels> + </InkName> +</InkList> + +<InkList translate="text" name="MISQuadtone" text="MIS Quadtone"> + <Shades> + <shade count="4">1.000000 0.750000 0.500000 0.250000</shade> + </Shades> + + <InkName translate="text" name="Quadtone" text="Quadtone" InkID="Quadtone"> + <Channels> + <channel name="quadtone" index="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="Gray3Trans"/> </subchannel> - <subchannel color="2"> + <subchannel color="1" name="Gray3" text="Gray 3" translate="text"> <ChannelDensityParam name="BlackDensity"/> - <SubchannelTransitionParam name="GrayTrans"/> + <SubchannelTransitionParam name="Gray3Trans"/> <SubchannelValueParam name="Gray3Value"/> <SubchannelScaleParam name="Gray3Scale"/> </subchannel> - <subchannel color="1"> + <subchannel color="4" name="Gray2" text="Gray 2" translate="text"> <ChannelDensityParam name="BlackDensity"/> - <SubchannelTransitionParam name="GrayTrans"/> + <SubchannelTransitionParam name="Gray2Trans"/> <SubchannelValueParam name="Gray2Value"/> <SubchannelScaleParam name="Gray2Scale"/> </subchannel> - <subchannel color="4"> + <subchannel color="2" name="Gray1" text="Gray 1" translate="text"> <ChannelDensityParam name="BlackDensity"/> - <SubchannelTransitionParam name="GrayTrans"/> + <SubchannelTransitionParam name="Gray1Trans"/> <SubchannelValueParam name="Gray1Value"/> <SubchannelScaleParam name="Gray1Scale"/> </subchannel> @@ -316,5 +351,52 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </Channels> </InkName> </InkList> + +<InkList translate="text" name="MISHextone" text="MIS Six Tone"> + <Shades> + <shade count="6">1.000000 0.750000 0.500000 0.450000 0.250000 0.150000</shade> + </Shades> + + <InkName translate="text" name="Hextone" text="Hextone" InkID="Hextone"> + <Channels> + <channel name="hextone" index="0"> + <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="HGray5Trans"/> + </subchannel> + <subchannel color="1" subchannel="0" name="Gray5" text="Gray 5" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="HGray5Trans"/> + <SubchannelValueParam name="HGray5Value"/> + <SubchannelScaleParam name="HGray5Scale"/> + </subchannel> + <subchannel color="4" subchannel="0" name="Gray4" text="Gray 4" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="HGray4Trans"/> + <SubchannelValueParam name="HGray4Value"/> + <SubchannelScaleParam name="HGray4Scale"/> + </subchannel> + <subchannel color="1" subchannel="1" name="Gray3" text="Gray 3" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="HGray3Trans"/> + <SubchannelValueParam name="HGray3Value"/> + <SubchannelScaleParam name="HGray3Scale"/> + </subchannel> + <subchannel color="2" subchannel="0" name="Gray2" text="Gray 2" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="HGray2Trans"/> + <SubchannelValueParam name="HGray2Value"/> + <SubchannelScaleParam name="HGray2Scale"/> + </subchannel> + <subchannel color="2" subchannel="1" name="Gray1" text="Gray 1" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="HGray1Trans"/> + <SubchannelValueParam name="HGray1Value"/> + <SubchannelScaleParam name="HGray1Scale"/> + </subchannel> + </channel> + </Channels> + </InkName> +</InkList> </escp2:InkGroup> </gutenprint> diff --git a/src/xml/escp2/inks/photo_gen1.xml b/src/xml/escp2/inks/photo_gen1.xml index e616e0e..7bf0e59 100644 --- a/src/xml/escp2/inks/photo_gen1.xml +++ b/src/xml/escp2/inks/photo_gen1.xml @@ -34,17 +34,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK"> <Channels> <channel name="photo_black" index="0"> - <subchannel color="0" subchannel="0"> + <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="photo_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2" subchannel="0"> + <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> </subchannel> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> <SubchannelValueParam name="LightCyanValue"/> @@ -53,11 +53,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="photo_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1" subchannel="0"> + <subchannel color="1" subchannel="0" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> </subchannel> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> <SubchannelValueParam name="LightMagentaValue"/> @@ -66,7 +66,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="photo_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4" subchannel="0"> + <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -77,11 +77,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <Channels> <channel name="photo_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2" subchannel="0"> + <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> </subchannel> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> <SubchannelValueParam name="LightCyanValue"/> @@ -90,11 +90,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="photo_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1" subchannel="0"> + <subchannel color="1" subchannel="0" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> </subchannel> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> <SubchannelValueParam name="LightMagentaValue"/> @@ -103,7 +103,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="photo_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4" subchannel="0"> + <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -113,25 +113,25 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="standard_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -142,19 +142,19 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <Channels> <channel name="standard_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -164,7 +164,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> @@ -174,17 +174,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended"> <Channels> <channel name="standard_cyan" index="0"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="1"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="2"> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -194,22 +194,22 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="standard_cyan" index="1"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="3"> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -219,27 +219,27 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCcMmY" text="Five Color Raw" InkID="Extended"> <Channels> <channel name="standard_cyan" index="0"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="extended_cyan" index="1"> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="extended_magenta" index="3"> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="photo_yellow" index="4"> - <subchannel color="4" subchannel="0"> + <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -249,32 +249,32 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCcMmYK" text="Six Color Raw" InkID="Extended"> <Channels> <channel name="photo_black" index="0"> - <subchannel color="0" subchannel="0"> + <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="standard_cyan" index="1"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="extended_cyan" index="2"> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="3"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="extended_magenta" index="4"> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="photo_yellow" index="5"> - <subchannel color="4" subchannel="0"> + <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -290,25 +290,25 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="Quadtone" text="Quadtone" InkID="Quadtone"> <Channels> <channel name="quadtone" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> - <SubchannelTransitionParam name="GrayTrans"/> + <SubchannelTransitionParam name="Gray3Trans"/> </subchannel> - <subchannel color="2"> + <subchannel color="2" name="Gray3" text="Gray 3" translate="text"> <ChannelDensityParam name="BlackDensity"/> - <SubchannelTransitionParam name="GrayTrans"/> + <SubchannelTransitionParam name="Gray3Trans"/> <SubchannelValueParam name="Gray3Value"/> <SubchannelScaleParam name="Gray3Scale"/> </subchannel> - <subchannel color="1"> + <subchannel color="1" name="Gray2" text="Gray 2" translate="text"> <ChannelDensityParam name="BlackDensity"/> - <SubchannelTransitionParam name="GrayTrans"/> + <SubchannelTransitionParam name="Gray2Trans"/> <SubchannelValueParam name="Gray2Value"/> <SubchannelScaleParam name="Gray2Scale"/> </subchannel> - <subchannel color="4"> + <subchannel color="4" name="Gray1" text="Gray 1" translate="text"> <ChannelDensityParam name="BlackDensity"/> - <SubchannelTransitionParam name="GrayTrans"/> + <SubchannelTransitionParam name="Gray1Trans"/> <SubchannelValueParam name="Gray1Value"/> <SubchannelScaleParam name="Gray1Scale"/> </subchannel> @@ -316,5 +316,87 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </Channels> </InkName> </InkList> + +<InkList translate="text" name="MISQuadtone" text="MIS Quadtone"> + <Shades> + <shade count="4">1.000000 0.750000 0.500000 0.250000</shade> + </Shades> + + <InkName translate="text" name="Quadtone" text="Quadtone" InkID="Quadtone"> + <Channels> + <channel name="quadtone" index="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="Gray3Trans"/> + </subchannel> + <subchannel color="1" name="Gray3" text="Gray 3" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="Gray3Trans"/> + <SubchannelValueParam name="Gray3Value"/> + <SubchannelScaleParam name="Gray3Scale"/> + </subchannel> + <subchannel color="4" name="Gray2" text="Gray 2" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="Gray2Trans"/> + <SubchannelValueParam name="Gray2Value"/> + <SubchannelScaleParam name="Gray2Scale"/> + </subchannel> + <subchannel color="2" name="Gray1" text="Gray 1" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="Gray1Trans"/> + <SubchannelValueParam name="Gray1Value"/> + <SubchannelScaleParam name="Gray1Scale"/> + </subchannel> + </channel> + </Channels> + </InkName> +</InkList> + +<InkList translate="text" name="MISHextone" text="MIS Six Tone"> + <Shades> + <shade count="6">1.000000 0.750000 0.500000 0.450000 0.250000 0.150000</shade> + </Shades> + + <InkName translate="text" name="Hextone" text="Hextone" InkID="Hextone"> + <Channels> + <channel name="hextone" index="0"> + <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="HGray5Trans"/> + </subchannel> + <subchannel color="1" subchannel="0" name="Gray5" text="Gray 5" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="HGray5Trans"/> + <SubchannelValueParam name="HGray5Value"/> + <SubchannelScaleParam name="HGray5Scale"/> + </subchannel> + <subchannel color="4" subchannel="0" name="Gray4" text="Gray 4" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="HGray4Trans"/> + <SubchannelValueParam name="HGray4Value"/> + <SubchannelScaleParam name="HGray4Scale"/> + </subchannel> + <subchannel color="1" subchannel="1" name="Gray3" text="Gray 3" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="HGray3Trans"/> + <SubchannelValueParam name="HGray3Value"/> + <SubchannelScaleParam name="HGray3Scale"/> + </subchannel> + <subchannel color="2" subchannel="0" name="Gray2" text="Gray 2" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="HGray2Trans"/> + <SubchannelValueParam name="HGray2Value"/> + <SubchannelScaleParam name="HGray2Scale"/> + </subchannel> + <subchannel color="2" subchannel="1" name="Gray1" text="Gray 1" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="HGray1Trans"/> + <SubchannelValueParam name="HGray1Value"/> + <SubchannelScaleParam name="HGray1Scale"/> + </subchannel> + </channel> + </Channels> + </InkName> +</InkList> </escp2:InkGroup> </gutenprint> diff --git a/src/xml/escp2/inks/photo_gen2.xml b/src/xml/escp2/inks/photo_gen2.xml index bb6d6eb..ebddcbc 100644 --- a/src/xml/escp2/inks/photo_gen2.xml +++ b/src/xml/escp2/inks/photo_gen2.xml @@ -34,17 +34,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK"> <Channels> <channel name="photo_black" index="0"> - <subchannel color="0" subchannel="0"> + <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="photo_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2" subchannel="0"> + <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> </subchannel> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> <SubchannelValueParam name="LightCyanValue"/> @@ -53,11 +53,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="photo_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1" subchannel="0"> + <subchannel color="1" subchannel="0" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> </subchannel> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> <SubchannelValueParam name="LightMagentaValue"/> @@ -66,7 +66,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="photo_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4" subchannel="0"> + <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -77,11 +77,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <Channels> <channel name="photo_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2" subchannel="0"> + <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> </subchannel> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> <SubchannelValueParam name="LightCyanValue"/> @@ -90,11 +90,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="photo_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1" subchannel="0"> + <subchannel color="1" subchannel="0" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> </subchannel> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> <SubchannelValueParam name="LightMagentaValue"/> @@ -103,7 +103,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="photo_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4" subchannel="0"> + <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -113,25 +113,25 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="standard_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -142,19 +142,19 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <Channels> <channel name="standard_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -164,7 +164,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> @@ -174,17 +174,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended"> <Channels> <channel name="standard_cyan" index="0"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="1"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="2"> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -194,22 +194,22 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="standard_cyan" index="1"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="3"> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -219,27 +219,27 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCcMmY" text="Five Color Raw" InkID="Extended"> <Channels> <channel name="standard_cyan" index="0"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="extended_cyan" index="1"> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="extended_magenta" index="3"> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="photo_yellow" index="4"> - <subchannel color="4" subchannel="0"> + <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -249,38 +249,39 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCcMmYK" text="Six Color Raw" InkID="Extended"> <Channels> <channel name="photo_black" index="0"> - <subchannel color="0" subchannel="0"> + <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="standard_cyan" index="1"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="extended_cyan" index="2"> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="3"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="extended_magenta" index="4"> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="photo_yellow" index="5"> - <subchannel color="4" subchannel="0"> + <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> </Channels> </InkName> </InkList> + <InkList translate="text" name="quadtone" text="Quadtone"> <Shades> <shade count="4">1.000000 0.750000 0.500000 0.250000</shade> @@ -289,25 +290,60 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="Quadtone" text="Quadtone" InkID="Quadtone"> <Channels> <channel name="quadtone" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> - <SubchannelTransitionParam name="GrayTrans"/> + <SubchannelTransitionParam name="Gray3Trans"/> </subchannel> - <subchannel color="2"> + <subchannel color="2" name="Gray3" text="Gray 3" translate="text"> <ChannelDensityParam name="BlackDensity"/> - <SubchannelTransitionParam name="GrayTrans"/> + <SubchannelTransitionParam name="Gray3Trans"/> <SubchannelValueParam name="Gray3Value"/> <SubchannelScaleParam name="Gray3Scale"/> </subchannel> - <subchannel color="1"> + <subchannel color="1" name="Gray2" text="Gray 2" translate="text"> <ChannelDensityParam name="BlackDensity"/> - <SubchannelTransitionParam name="GrayTrans"/> + <SubchannelTransitionParam name="Gray2Trans"/> <SubchannelValueParam name="Gray2Value"/> <SubchannelScaleParam name="Gray2Scale"/> </subchannel> - <subchannel color="4"> + <subchannel color="4" name="Gray1" text="Gray 1" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="Gray1Trans"/> + <SubchannelValueParam name="Gray1Value"/> + <SubchannelScaleParam name="Gray1Scale"/> + </subchannel> + </channel> + </Channels> + </InkName> +</InkList> + +<InkList translate="text" name="MISQuadtone" text="MIS Quadtone"> + <Shades> + <shade count="4">1.000000 0.750000 0.500000 0.250000</shade> + </Shades> + + <InkName translate="text" name="Quadtone" text="Quadtone" InkID="Quadtone"> + <Channels> + <channel name="quadtone" index="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> <SubchannelTransitionParam name="GrayTrans"/> + </subchannel> + <subchannel color="1" name="Gray3" text="Gray 3" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="Gray3Trans"/> + <SubchannelValueParam name="Gray3Value"/> + <SubchannelScaleParam name="Gray3Scale"/> + </subchannel> + <subchannel color="4" name="Gray2" text="Gray 2" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="Gray2Trans"/> + <SubchannelValueParam name="Gray2Value"/> + <SubchannelScaleParam name="Gray2Scale"/> + </subchannel> + <subchannel color="2" name="Gray1" text="Gray 1" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="Gray1Trans"/> <SubchannelValueParam name="Gray1Value"/> <SubchannelScaleParam name="Gray1Scale"/> </subchannel> @@ -315,5 +351,52 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </Channels> </InkName> </InkList> + +<InkList translate="text" name="MISHextone" text="MIS Six Tone"> + <Shades> + <shade count="6">1.000000 0.750000 0.500000 0.450000 0.250000 0.150000</shade> + </Shades> + + <InkName translate="text" name="Hextone" text="Hextone" InkID="Hextone"> + <Channels> + <channel name="hextone" index="0"> + <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="HGray5Trans"/> + </subchannel> + <subchannel color="1" subchannel="0" name="Gray5" text="Gray 5" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="HGray5Trans"/> + <SubchannelValueParam name="HGray5Value"/> + <SubchannelScaleParam name="HGray5Scale"/> + </subchannel> + <subchannel color="4" subchannel="0" name="Gray4" text="Gray 4" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="HGray4Trans"/> + <SubchannelValueParam name="HGray4Value"/> + <SubchannelScaleParam name="HGray4Scale"/> + </subchannel> + <subchannel color="1" subchannel="1" name="Gray3" text="Gray 3" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="HGray3Trans"/> + <SubchannelValueParam name="HGray3Value"/> + <SubchannelScaleParam name="HGray3Scale"/> + </subchannel> + <subchannel color="2" subchannel="0" name="Gray2" text="Gray 2" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="HGray2Trans"/> + <SubchannelValueParam name="HGray2Value"/> + <SubchannelScaleParam name="HGray2Scale"/> + </subchannel> + <subchannel color="2" subchannel="1" name="Gray1" text="Gray 1" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="HGray1Trans"/> + <SubchannelValueParam name="HGray1Value"/> + <SubchannelScaleParam name="HGray1Scale"/> + </subchannel> + </channel> + </Channels> + </InkName> +</InkList> </escp2:InkGroup> </gutenprint> diff --git a/src/xml/escp2/inks/photo_gen3.xml b/src/xml/escp2/inks/photo_gen3.xml index 923f2b6..9b23ff4 100644 --- a/src/xml/escp2/inks/photo_gen3.xml +++ b/src/xml/escp2/inks/photo_gen3.xml @@ -34,17 +34,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK"> <Channels> <channel name="photo_black" index="0"> - <subchannel color="0" subchannel="0"> + <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="photo_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2" subchannel="0"> + <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> </subchannel> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> <SubchannelValueParam name="LightCyanValue"/> @@ -53,11 +53,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="photo_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1" subchannel="0"> + <subchannel color="1" subchannel="0" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> </subchannel> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> <SubchannelValueParam name="LightMagentaValue"/> @@ -66,7 +66,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="photo_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4" subchannel="0"> + <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -77,11 +77,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <Channels> <channel name="photo_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2" subchannel="0"> + <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> </subchannel> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> <SubchannelValueParam name="LightCyanValue"/> @@ -90,11 +90,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="photo_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1" subchannel="0"> + <subchannel color="1" subchannel="0" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> </subchannel> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> <SubchannelValueParam name="LightMagentaValue"/> @@ -103,7 +103,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="photo_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4" subchannel="0"> + <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -113,25 +113,25 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="standard_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -142,19 +142,19 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <Channels> <channel name="standard_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -164,7 +164,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> @@ -174,17 +174,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended"> <Channels> <channel name="standard_cyan" index="0"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="1"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="2"> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -194,22 +194,22 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="standard_cyan" index="1"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="3"> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -219,27 +219,27 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCcMmY" text="Five Color Raw" InkID="Extended"> <Channels> <channel name="standard_cyan" index="0"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="extended_cyan" index="1"> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="extended_magenta" index="3"> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="photo_yellow" index="4"> - <subchannel color="4" subchannel="0"> + <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -249,32 +249,32 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCcMmYK" text="Six Color Raw" InkID="Extended"> <Channels> <channel name="photo_black" index="0"> - <subchannel color="0" subchannel="0"> + <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="standard_cyan" index="1"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="extended_cyan" index="2"> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="3"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="extended_magenta" index="4"> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="photo_yellow" index="5"> - <subchannel color="4" subchannel="0"> + <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -290,25 +290,25 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="Quadtone" text="Quadtone" InkID="Quadtone"> <Channels> <channel name="quadtone" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> - <SubchannelTransitionParam name="GrayTrans"/> + <SubchannelTransitionParam name="Gray3Trans"/> </subchannel> - <subchannel color="2"> + <subchannel color="2" name="Gray3" text="Gray 3" translate="text"> <ChannelDensityParam name="BlackDensity"/> - <SubchannelTransitionParam name="GrayTrans"/> + <SubchannelTransitionParam name="Gray3Trans"/> <SubchannelValueParam name="Gray3Value"/> <SubchannelScaleParam name="Gray3Scale"/> </subchannel> - <subchannel color="1"> + <subchannel color="1" name="Gray2" text="Gray 2" translate="text"> <ChannelDensityParam name="BlackDensity"/> - <SubchannelTransitionParam name="GrayTrans"/> + <SubchannelTransitionParam name="Gray2Trans"/> <SubchannelValueParam name="Gray2Value"/> <SubchannelScaleParam name="Gray2Scale"/> </subchannel> - <subchannel color="4"> + <subchannel color="4" name="Gray1" text="Gray 1" translate="text"> <ChannelDensityParam name="BlackDensity"/> - <SubchannelTransitionParam name="GrayTrans"/> + <SubchannelTransitionParam name="Gray1Trans"/> <SubchannelValueParam name="Gray1Value"/> <SubchannelScaleParam name="Gray1Scale"/> </subchannel> @@ -316,5 +316,87 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </Channels> </InkName> </InkList> + +<InkList translate="text" name="MISQuadtone" text="MIS Quadtone"> + <Shades> + <shade count="4">1.000000 0.750000 0.500000 0.250000</shade> + </Shades> + + <InkName translate="text" name="Quadtone" text="Quadtone" InkID="Quadtone"> + <Channels> + <channel name="quadtone" index="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="Gray3Trans"/> + </subchannel> + <subchannel color="1" name="Gray3" text="Gray 3" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="Gray3Trans"/> + <SubchannelValueParam name="Gray3Value"/> + <SubchannelScaleParam name="Gray3Scale"/> + </subchannel> + <subchannel color="4" name="Gray2" text="Gray 2" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="Gray2Trans"/> + <SubchannelValueParam name="Gray2Value"/> + <SubchannelScaleParam name="Gray2Scale"/> + </subchannel> + <subchannel color="2" name="Gray1" text="Gray 1" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="Gray1Trans"/> + <SubchannelValueParam name="Gray1Value"/> + <SubchannelScaleParam name="Gray1Scale"/> + </subchannel> + </channel> + </Channels> + </InkName> +</InkList> + +<InkList translate="text" name="MISHextone" text="MIS Six Tone"> + <Shades> + <shade count="6">1.000000 0.750000 0.500000 0.450000 0.250000 0.150000</shade> + </Shades> + + <InkName translate="text" name="Hextone" text="Hextone" InkID="Hextone"> + <Channels> + <channel name="hextone" index="0"> + <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="HGray5Trans"/> + </subchannel> + <subchannel color="1" subchannel="0" name="Gray5" text="Gray 5" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="HGray5Trans"/> + <SubchannelValueParam name="HGray5Value"/> + <SubchannelScaleParam name="HGray5Scale"/> + </subchannel> + <subchannel color="4" subchannel="0" name="Gray4" text="Gray 4" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="HGray4Trans"/> + <SubchannelValueParam name="HGray4Value"/> + <SubchannelScaleParam name="HGray4Scale"/> + </subchannel> + <subchannel color="1" subchannel="1" name="Gray3" text="Gray 3" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="HGray3Trans"/> + <SubchannelValueParam name="HGray3Value"/> + <SubchannelScaleParam name="HGray3Scale"/> + </subchannel> + <subchannel color="2" subchannel="0" name="Gray2" text="Gray 2" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="HGray2Trans"/> + <SubchannelValueParam name="HGray2Value"/> + <SubchannelScaleParam name="HGray2Scale"/> + </subchannel> + <subchannel color="2" subchannel="1" name="Gray1" text="Gray 1" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="HGray1Trans"/> + <SubchannelValueParam name="HGray1Value"/> + <SubchannelScaleParam name="HGray1Scale"/> + </subchannel> + </channel> + </Channels> + </InkName> +</InkList> </escp2:InkGroup> </gutenprint> diff --git a/src/xml/escp2/inks/photo_gen3_4.xml b/src/xml/escp2/inks/photo_gen3_4.xml index fb85d5e..7d40057 100644 --- a/src/xml/escp2/inks/photo_gen3_4.xml +++ b/src/xml/escp2/inks/photo_gen3_4.xml @@ -32,25 +32,25 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="standard_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -61,19 +61,19 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <Channels> <channel name="standard_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -83,7 +83,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> @@ -93,17 +93,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended"> <Channels> <channel name="standard_cyan" index="0"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="1"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="2"> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -113,22 +113,22 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="standard_cyan" index="1"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="3"> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -144,25 +144,60 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="Quadtone" text="Quadtone" InkID="Quadtone"> <Channels> <channel name="quadtone" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> - <SubchannelTransitionParam name="GrayTrans"/> + <SubchannelTransitionParam name="Gray3Trans"/> </subchannel> - <subchannel color="2"> + <subchannel color="2" name="Gray3" text="Gray 3" translate="text"> <ChannelDensityParam name="BlackDensity"/> - <SubchannelTransitionParam name="GrayTrans"/> + <SubchannelTransitionParam name="Gray3Trans"/> <SubchannelValueParam name="Gray3Value"/> <SubchannelScaleParam name="Gray3Scale"/> </subchannel> - <subchannel color="1"> + <subchannel color="1" name="Gray2" text="Gray 2" translate="text"> <ChannelDensityParam name="BlackDensity"/> - <SubchannelTransitionParam name="GrayTrans"/> + <SubchannelTransitionParam name="Gray2Trans"/> <SubchannelValueParam name="Gray2Value"/> <SubchannelScaleParam name="Gray2Scale"/> </subchannel> - <subchannel color="4"> + <subchannel color="4" name="Gray1" text="Gray 1" translate="text"> <ChannelDensityParam name="BlackDensity"/> - <SubchannelTransitionParam name="GrayTrans"/> + <SubchannelTransitionParam name="Gray1Trans"/> + <SubchannelValueParam name="Gray1Value"/> + <SubchannelScaleParam name="Gray1Scale"/> + </subchannel> + </channel> + </Channels> + </InkName> +</InkList> + +<InkList translate="text" name="MISQuadtone" text="MIS Quadtone"> + <Shades> + <shade count="4">1.000000 0.750000 0.500000 0.250000</shade> + </Shades> + + <InkName translate="text" name="Quadtone" text="Quadtone" InkID="Quadtone"> + <Channels> + <channel name="quadtone" index="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="Gray3Trans"/> + </subchannel> + <subchannel color="1" name="Gray3" text="Gray 3" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="Gray3Trans"/> + <SubchannelValueParam name="Gray3Value"/> + <SubchannelScaleParam name="Gray3Scale"/> + </subchannel> + <subchannel color="4" name="Gray2" text="Gray 2" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="Gray2Trans"/> + <SubchannelValueParam name="Gray2Value"/> + <SubchannelScaleParam name="Gray2Scale"/> + </subchannel> + <subchannel color="2" name="Gray1" text="Gray 1" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="Gray1Trans"/> <SubchannelValueParam name="Gray1Value"/> <SubchannelScaleParam name="Gray1Scale"/> </subchannel> diff --git a/src/xml/escp2/inks/photo_gen4.xml b/src/xml/escp2/inks/photo_gen4.xml index 6c08316..1457e32 100644 --- a/src/xml/escp2/inks/photo_gen4.xml +++ b/src/xml/escp2/inks/photo_gen4.xml @@ -34,17 +34,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK"> <Channels> <channel name="photo_black" index="0"> - <subchannel color="0" subchannel="0"> + <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="photo_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2" subchannel="0"> + <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> </subchannel> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> <SubchannelValueParam name="LightCyanValue"/> @@ -53,11 +53,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="photo_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1" subchannel="0"> + <subchannel color="1" subchannel="0" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> </subchannel> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> <SubchannelValueParam name="LightMagentaValue"/> @@ -66,7 +66,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="photo_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4" subchannel="0"> + <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -77,11 +77,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <Channels> <channel name="photo_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2" subchannel="0"> + <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> </subchannel> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> <SubchannelValueParam name="LightCyanValue"/> @@ -90,11 +90,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="photo_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1" subchannel="0"> + <subchannel color="1" subchannel="0" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> </subchannel> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> <SubchannelValueParam name="LightMagentaValue"/> @@ -103,7 +103,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="photo_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4" subchannel="0"> + <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -113,25 +113,25 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="standard_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -142,19 +142,19 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <Channels> <channel name="standard_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -164,7 +164,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> @@ -174,17 +174,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended"> <Channels> <channel name="standard_cyan" index="0"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="1"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="2"> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -194,22 +194,22 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="standard_cyan" index="1"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="3"> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -219,27 +219,27 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCcMmY" text="Five Color Raw" InkID="Extended"> <Channels> <channel name="standard_cyan" index="0"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="extended_cyan" index="1"> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="extended_magenta" index="3"> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="photo_yellow" index="4"> - <subchannel color="4" subchannel="0"> + <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -249,32 +249,32 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCcMmYK" text="Six Color Raw" InkID="Extended"> <Channels> <channel name="photo_black" index="0"> - <subchannel color="0" subchannel="0"> + <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="standard_cyan" index="1"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="extended_cyan" index="2"> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="3"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="extended_magenta" index="4"> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="photo_yellow" index="5"> - <subchannel color="4" subchannel="0"> + <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> diff --git a/src/xml/escp2/inks/photo_pigment.xml b/src/xml/escp2/inks/photo_pigment.xml index c5d047b..f7781ec 100644 --- a/src/xml/escp2/inks/photo_pigment.xml +++ b/src/xml/escp2/inks/photo_pigment.xml @@ -34,17 +34,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK"> <Channels> <channel name="photo_black" index="0"> - <subchannel color="0" subchannel="0"> + <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="photo_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2" subchannel="0"> + <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> </subchannel> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> <SubchannelValueParam name="LightCyanValue"/> @@ -53,11 +53,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="photo_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1" subchannel="0"> + <subchannel color="1" subchannel="0" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> </subchannel> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> <SubchannelValueParam name="LightMagentaValue"/> @@ -66,7 +66,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="photo_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4" subchannel="0"> + <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -77,11 +77,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <Channels> <channel name="photo_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2" subchannel="0"> + <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> </subchannel> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> <SubchannelValueParam name="LightCyanValue"/> @@ -90,11 +90,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="photo_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1" subchannel="0"> + <subchannel color="1" subchannel="0" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> </subchannel> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> <SubchannelValueParam name="LightMagentaValue"/> @@ -103,7 +103,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="photo_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4" subchannel="0"> + <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -113,25 +113,25 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="standard_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -142,19 +142,19 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <Channels> <channel name="standard_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -164,7 +164,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> @@ -174,17 +174,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended"> <Channels> <channel name="standard_cyan" index="0"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="1"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="2"> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -194,22 +194,22 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="standard_cyan" index="1"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="3"> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -219,27 +219,27 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCcMmY" text="Five Color Raw" InkID="Extended"> <Channels> <channel name="standard_cyan" index="0"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="extended_cyan" index="1"> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="extended_magenta" index="3"> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="photo_yellow" index="4"> - <subchannel color="4" subchannel="0"> + <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -249,32 +249,32 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCcMmYK" text="Six Color Raw" InkID="Extended"> <Channels> <channel name="photo_black" index="0"> - <subchannel color="0" subchannel="0"> + <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="standard_cyan" index="1"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="extended_cyan" index="2"> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="3"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="extended_magenta" index="4"> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="photo_yellow" index="5"> - <subchannel color="4" subchannel="0"> + <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> diff --git a/src/xml/escp2/inks/picturemate_4.xml b/src/xml/escp2/inks/picturemate_4.xml index 5b1e6fe..b48f5f3 100644 --- a/src/xml/escp2/inks/picturemate_4.xml +++ b/src/xml/escp2/inks/picturemate_4.xml @@ -32,25 +32,25 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="CMYK" text="Four Color Photo" InkID="CMYK"> <Channels> <channel name="photo_black" index="0"> - <subchannel color="0" subchannel="0"> + <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="picturemate_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="picturemate_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="picturemate_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -60,22 +60,22 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended"> <Channels> <channel name="photo_black" index="0"> - <subchannel color="0" subchannel="0"> + <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="picturemate_cyan" index="1"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="picturemate_magenta" index="2"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="picturemate_yellow" index="3"> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> diff --git a/src/xml/escp2/inks/picturemate_6.xml b/src/xml/escp2/inks/picturemate_6.xml index 9ccb684..fa5068a 100644 --- a/src/xml/escp2/inks/picturemate_6.xml +++ b/src/xml/escp2/inks/picturemate_6.xml @@ -34,7 +34,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="CMYKRB" text="Six Color Photo" InkID="OTHER"> <Channels> <channel name="photo_black" index="0"> - <subchannel color="0" subchannel="0"> + <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> @@ -52,7 +52,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </sequence> </curve> </HueCurve> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> @@ -70,7 +70,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </sequence> </curve> </HueCurve> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> @@ -88,7 +88,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </sequence> </curve> </HueCurve> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -106,7 +106,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </sequence> </curve> </HueCurve> - <subchannel color="7"> + <subchannel color="7" name="Red" text="Red" translate="text"> <ChannelDensityParam name="RedDensity"/> </subchannel> </channel> @@ -124,7 +124,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </sequence> </curve> </HueCurve> - <subchannel color="8" headOffset="1"> + <subchannel color="8" headOffset="1" name="Blue" text="Blue" translate="text"> <ChannelDensityParam name="BlueDensity"/> </subchannel> </channel> @@ -134,22 +134,22 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="CMYK" text="Four Color Photo" InkID="CMYK"> <Channels> <channel name="photo_black" index="0"> - <subchannel color="0" subchannel="0"> + <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="picturemate_cyan" index="1"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="picturemate_magenta" index="2"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="picturemate_yellow" index="3"> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -159,32 +159,32 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMYKRB" text="Six Color Raw" InkID="Extended"> <Channels> <channel name="photo_black" index="0"> - <subchannel color="0" subchannel="0"> + <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="picturemate_cyan" index="1"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="picturemate_magenta" index="2"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="picturemate_yellow" index="3"> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> <channel name="picturemate_red" index="4"> - <subchannel color="7"> + <subchannel color="7" name="Red" text="Red" translate="text"> <ChannelDensityParam name="RedDensity"/> </subchannel> </channel> <channel name="picturemate_blue" index="5"> - <subchannel color="8" headOffset="1"> + <subchannel color="8" headOffset="1" name="Blue" text="Blue" translate="text"> <ChannelDensityParam name="BlueDensity"/> </subchannel> </channel> @@ -194,22 +194,22 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended"> <Channels> <channel name="photo_black" index="0"> - <subchannel color="0" subchannel="0"> + <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="picturemate_cyan" index="1"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="picturemate_magenta" index="2"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="picturemate_yellow" index="3"> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> diff --git a/src/xml/escp2/inks/pro_gen1.xml b/src/xml/escp2/inks/pro_gen1.xml index 9d9dca6..dab731f 100644 --- a/src/xml/escp2/inks/pro_gen1.xml +++ b/src/xml/escp2/inks/pro_gen1.xml @@ -34,17 +34,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK"> <Channels> <channel name="photo_black" index="0"> - <subchannel color="0" subchannel="0"> + <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="photo_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2" subchannel="0"> + <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> </subchannel> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> <SubchannelValueParam name="LightCyanValue"/> @@ -53,11 +53,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="photo_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1" subchannel="0"> + <subchannel color="1" subchannel="0" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> </subchannel> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> <SubchannelValueParam name="LightMagentaValue"/> @@ -66,7 +66,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="photo_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4" subchannel="0"> + <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -77,11 +77,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <Channels> <channel name="photo_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2" subchannel="0"> + <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> </subchannel> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> <SubchannelValueParam name="LightCyanValue"/> @@ -90,11 +90,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="photo_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1" subchannel="0"> + <subchannel color="1" subchannel="0" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> </subchannel> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> <SubchannelValueParam name="LightMagentaValue"/> @@ -103,7 +103,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="photo_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4" subchannel="0"> + <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -113,25 +113,25 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="standard_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -142,19 +142,19 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <Channels> <channel name="standard_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -164,7 +164,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> @@ -174,17 +174,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended"> <Channels> <channel name="standard_cyan" index="0"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="1"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="2"> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -194,22 +194,22 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="standard_cyan" index="1"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="3"> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -219,27 +219,27 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCcMmY" text="Five Color Raw" InkID="Extended"> <Channels> <channel name="standard_cyan" index="0"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="extended_cyan" index="1"> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="extended_magenta" index="3"> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="photo_yellow" index="4"> - <subchannel color="4" subchannel="0"> + <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -249,32 +249,32 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCcMmYK" text="Six Color Raw" InkID="Extended"> <Channels> <channel name="photo_black" index="0"> - <subchannel color="0" subchannel="0"> + <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="standard_cyan" index="1"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="extended_cyan" index="2"> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="3"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="extended_magenta" index="4"> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="photo_yellow" index="5"> - <subchannel color="4" subchannel="0"> + <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -290,25 +290,25 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="Quadtone" text="Quadtone" InkID="Quadtone"> <Channels> <channel name="quadtone" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> - <SubchannelTransitionParam name="GrayTrans"/> + <SubchannelTransitionParam name="Gray3Trans"/> </subchannel> - <subchannel color="2"> + <subchannel color="2" name="Gray3" text="Gray 3" translate="text"> <ChannelDensityParam name="BlackDensity"/> - <SubchannelTransitionParam name="GrayTrans"/> + <SubchannelTransitionParam name="Gray3Trans"/> <SubchannelValueParam name="Gray3Value"/> <SubchannelScaleParam name="Gray3Scale"/> </subchannel> - <subchannel color="1"> + <subchannel color="1" name="Gray2" text="Gray 2" translate="text"> <ChannelDensityParam name="BlackDensity"/> - <SubchannelTransitionParam name="GrayTrans"/> + <SubchannelTransitionParam name="Gray2Trans"/> <SubchannelValueParam name="Gray2Value"/> <SubchannelScaleParam name="Gray2Scale"/> </subchannel> - <subchannel color="4"> + <subchannel color="4" name="Gray1" text="Gray 1" translate="text"> <ChannelDensityParam name="BlackDensity"/> - <SubchannelTransitionParam name="GrayTrans"/> + <SubchannelTransitionParam name="Gray1Trans"/> <SubchannelValueParam name="Gray1Value"/> <SubchannelScaleParam name="Gray1Scale"/> </subchannel> @@ -316,5 +316,87 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </Channels> </InkName> </InkList> + +<InkList translate="text" name="MISQuadtone" text="MIS Quadtone"> + <Shades> + <shade count="4">1.000000 0.750000 0.500000 0.250000</shade> + </Shades> + + <InkName translate="text" name="Quadtone" text="Quadtone" InkID="Quadtone"> + <Channels> + <channel name="quadtone" index="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="Gray3Trans"/> + </subchannel> + <subchannel color="1" name="Gray3" text="Gray 3" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="Gray3Trans"/> + <SubchannelValueParam name="Gray3Value"/> + <SubchannelScaleParam name="Gray3Scale"/> + </subchannel> + <subchannel color="4" name="Gray2" text="Gray 2" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="Gray2Trans"/> + <SubchannelValueParam name="Gray2Value"/> + <SubchannelScaleParam name="Gray2Scale"/> + </subchannel> + <subchannel color="2" name="Gray1" text="Gray 1" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="Gray1Trans"/> + <SubchannelValueParam name="Gray1Value"/> + <SubchannelScaleParam name="Gray1Scale"/> + </subchannel> + </channel> + </Channels> + </InkName> +</InkList> + +<InkList translate="text" name="MISHextone" text="MIS Six Tone"> + <Shades> + <shade count="6">1.000000 0.750000 0.500000 0.450000 0.250000 0.150000</shade> + </Shades> + + <InkName translate="text" name="Hextone" text="Hextone" InkID="Hextone"> + <Channels> + <channel name="hextone" index="0"> + <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="HGray5Trans"/> + </subchannel> + <subchannel color="1" subchannel="0" name="Gray5" text="Gray 5" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="HGray5Trans"/> + <SubchannelValueParam name="HGray5Value"/> + <SubchannelScaleParam name="HGray5Scale"/> + </subchannel> + <subchannel color="4" subchannel="0" name="Gray4" text="Gray 4" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="HGray4Trans"/> + <SubchannelValueParam name="HGray4Value"/> + <SubchannelScaleParam name="HGray4Scale"/> + </subchannel> + <subchannel color="1" subchannel="1" name="Gray3" text="Gray 3" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="HGray3Trans"/> + <SubchannelValueParam name="HGray3Value"/> + <SubchannelScaleParam name="HGray3Scale"/> + </subchannel> + <subchannel color="2" subchannel="0" name="Gray2" text="Gray 2" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="HGray2Trans"/> + <SubchannelValueParam name="HGray2Value"/> + <SubchannelScaleParam name="HGray2Scale"/> + </subchannel> + <subchannel color="2" subchannel="1" name="Gray1" text="Gray 1" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="HGray1Trans"/> + <SubchannelValueParam name="HGray1Value"/> + <SubchannelScaleParam name="HGray1Scale"/> + </subchannel> + </channel> + </Channels> + </InkName> +</InkList> </escp2:InkGroup> </gutenprint> diff --git a/src/xml/escp2/inks/pro_gen2.xml b/src/xml/escp2/inks/pro_gen2.xml index 0eaac3a..bf21a18 100644 --- a/src/xml/escp2/inks/pro_gen2.xml +++ b/src/xml/escp2/inks/pro_gen2.xml @@ -34,17 +34,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK"> <Channels> <channel name="photo_black" index="0"> - <subchannel color="0" subchannel="0"> + <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="photo_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2" subchannel="0"> + <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> </subchannel> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> <SubchannelValueParam name="LightCyanValue"/> @@ -53,11 +53,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="photo_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1" subchannel="0"> + <subchannel color="1" subchannel="0" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> </subchannel> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> <SubchannelValueParam name="LightMagentaValue"/> @@ -66,7 +66,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="photo_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4" subchannel="0"> + <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -77,11 +77,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <Channels> <channel name="photo_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2" subchannel="0"> + <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> </subchannel> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> <SubchannelValueParam name="LightCyanValue"/> @@ -90,11 +90,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="photo_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1" subchannel="0"> + <subchannel color="1" subchannel="0" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> </subchannel> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> <SubchannelValueParam name="LightMagentaValue"/> @@ -103,7 +103,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="photo_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4" subchannel="0"> + <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -113,25 +113,25 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="standard_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -142,19 +142,19 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <Channels> <channel name="standard_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -164,7 +164,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> @@ -174,17 +174,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended"> <Channels> <channel name="standard_cyan" index="0"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="1"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="2"> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -194,22 +194,22 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="standard_cyan" index="1"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="3"> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -219,27 +219,27 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCcMmY" text="Five Color Raw" InkID="Extended"> <Channels> <channel name="standard_cyan" index="0"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="extended_cyan" index="1"> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="extended_magenta" index="3"> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="photo_yellow" index="4"> - <subchannel color="4" subchannel="0"> + <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -249,32 +249,32 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCcMmYK" text="Six Color Raw" InkID="Extended"> <Channels> <channel name="photo_black" index="0"> - <subchannel color="0" subchannel="0"> + <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="standard_cyan" index="1"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="extended_cyan" index="2"> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="3"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="extended_magenta" index="4"> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="photo_yellow" index="5"> - <subchannel color="4" subchannel="0"> + <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -290,25 +290,25 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="Quadtone" text="Quadtone" InkID="Quadtone"> <Channels> <channel name="quadtone" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> - <SubchannelTransitionParam name="GrayTrans"/> + <SubchannelTransitionParam name="Gray3Trans"/> </subchannel> - <subchannel color="2"> + <subchannel color="2" name="Gray3" text="Gray 3" translate="text"> <ChannelDensityParam name="BlackDensity"/> - <SubchannelTransitionParam name="GrayTrans"/> + <SubchannelTransitionParam name="Gray3Trans"/> <SubchannelValueParam name="Gray3Value"/> <SubchannelScaleParam name="Gray3Scale"/> </subchannel> - <subchannel color="1"> + <subchannel color="1" name="Gray2" text="Gray 2" translate="text"> <ChannelDensityParam name="BlackDensity"/> - <SubchannelTransitionParam name="GrayTrans"/> + <SubchannelTransitionParam name="Gray2Trans"/> <SubchannelValueParam name="Gray2Value"/> <SubchannelScaleParam name="Gray2Scale"/> </subchannel> - <subchannel color="4"> + <subchannel color="4" name="Gray1" text="Gray 1" translate="text"> <ChannelDensityParam name="BlackDensity"/> - <SubchannelTransitionParam name="GrayTrans"/> + <SubchannelTransitionParam name="Gray1Trans"/> <SubchannelValueParam name="Gray1Value"/> <SubchannelScaleParam name="Gray1Scale"/> </subchannel> @@ -316,5 +316,87 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </Channels> </InkName> </InkList> + +<InkList translate="text" name="MISQuadtone" text="MIS Quadtone"> + <Shades> + <shade count="4">1.000000 0.750000 0.500000 0.250000</shade> + </Shades> + + <InkName translate="text" name="Quadtone" text="Quadtone" InkID="Quadtone"> + <Channels> + <channel name="quadtone" index="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="Gray3Trans"/> + </subchannel> + <subchannel color="1" name="Gray3" text="Gray 3" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="Gray3Trans"/> + <SubchannelValueParam name="Gray3Value"/> + <SubchannelScaleParam name="Gray3Scale"/> + </subchannel> + <subchannel color="4" name="Gray2" text="Gray 2" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="Gray2Trans"/> + <SubchannelValueParam name="Gray2Value"/> + <SubchannelScaleParam name="Gray2Scale"/> + </subchannel> + <subchannel color="2" name="Gray1" text="Gray 1" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="Gray1Trans"/> + <SubchannelValueParam name="Gray1Value"/> + <SubchannelScaleParam name="Gray1Scale"/> + </subchannel> + </channel> + </Channels> + </InkName> +</InkList> + +<InkList translate="text" name="MISHextone" text="MIS Six Tone"> + <Shades> + <shade count="6">1.000000 0.750000 0.500000 0.450000 0.250000 0.150000</shade> + </Shades> + + <InkName translate="text" name="Hextone" text="Hextone" InkID="Hextone"> + <Channels> + <channel name="hextone" index="0"> + <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="HGray5Trans"/> + </subchannel> + <subchannel color="1" subchannel="0" name="Gray5" text="Gray 5" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="HGray5Trans"/> + <SubchannelValueParam name="HGray5Value"/> + <SubchannelScaleParam name="HGray5Scale"/> + </subchannel> + <subchannel color="4" subchannel="0" name="Gray4" text="Gray 4" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="HGray4Trans"/> + <SubchannelValueParam name="HGray4Value"/> + <SubchannelScaleParam name="HGray4Scale"/> + </subchannel> + <subchannel color="1" subchannel="1" name="Gray3" text="Gray 3" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="HGray3Trans"/> + <SubchannelValueParam name="HGray3Value"/> + <SubchannelScaleParam name="HGray3Scale"/> + </subchannel> + <subchannel color="2" subchannel="0" name="Gray2" text="Gray 2" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="HGray2Trans"/> + <SubchannelValueParam name="HGray2Value"/> + <SubchannelScaleParam name="HGray2Scale"/> + </subchannel> + <subchannel color="2" subchannel="1" name="Gray1" text="Gray 1" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="HGray1Trans"/> + <SubchannelValueParam name="HGray1Value"/> + <SubchannelScaleParam name="HGray1Scale"/> + </subchannel> + </channel> + </Channels> + </InkName> +</InkList> </escp2:InkGroup> </gutenprint> diff --git a/src/xml/escp2/inks/pro_pigment.xml b/src/xml/escp2/inks/pro_pigment.xml index 59caecb..baf5b93 100644 --- a/src/xml/escp2/inks/pro_pigment.xml +++ b/src/xml/escp2/inks/pro_pigment.xml @@ -34,17 +34,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK"> <Channels> <channel name="photo_black" index="0"> - <subchannel color="0" subchannel="0"> + <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="photo_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2" subchannel="0"> + <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> </subchannel> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> <SubchannelValueParam name="LightCyanValue"/> @@ -53,11 +53,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="photo_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1" subchannel="0"> + <subchannel color="1" subchannel="0" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> </subchannel> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> <SubchannelValueParam name="LightMagentaValue"/> @@ -66,7 +66,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="photo_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4" subchannel="0"> + <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -77,11 +77,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <Channels> <channel name="photo_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2" subchannel="0"> + <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> </subchannel> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> <SubchannelValueParam name="LightCyanValue"/> @@ -90,11 +90,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="photo_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1" subchannel="0"> + <subchannel color="1" subchannel="0" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> </subchannel> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> <SubchannelValueParam name="LightMagentaValue"/> @@ -103,7 +103,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="photo_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4" subchannel="0"> + <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -113,25 +113,25 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="standard_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -142,19 +142,19 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <Channels> <channel name="standard_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -164,7 +164,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> @@ -174,17 +174,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended"> <Channels> <channel name="standard_cyan" index="0"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="1"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="2"> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -194,22 +194,22 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="standard_cyan" index="1"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="3"> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -219,27 +219,27 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCcMmY" text="Five Color Raw" InkID="Extended"> <Channels> <channel name="standard_cyan" index="0"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="extended_cyan" index="1"> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="extended_magenta" index="3"> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="photo_yellow" index="4"> - <subchannel color="4" subchannel="0"> + <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -249,32 +249,32 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCcMmYK" text="Six Color Raw" InkID="Extended"> <Channels> <channel name="photo_black" index="0"> - <subchannel color="0" subchannel="0"> + <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="standard_cyan" index="1"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="extended_cyan" index="2"> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="3"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="extended_magenta" index="4"> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="photo_yellow" index="5"> - <subchannel color="4" subchannel="0"> + <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> diff --git a/src/xml/escp2/inks/pro_ultrachrome.xml b/src/xml/escp2/inks/pro_ultrachrome.xml index 9ef31f3..675aa57 100644 --- a/src/xml/escp2/inks/pro_ultrachrome.xml +++ b/src/xml/escp2/inks/pro_ultrachrome.xml @@ -35,11 +35,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhotoCMYK7" text="Seven Color Photo" InkID="CcMmYKk"> <Channels> <channel name="photo2_black" index="0"> - <subchannel color="0" subchannel="0"> + <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> <SubchannelTransitionParam name="GrayTrans"/> </subchannel> - <subchannel color="0" subchannel="1"> + <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> <SubchannelTransitionParam name="GrayTrans"/> <SubchannelValueParam name="GrayValue"/> @@ -48,11 +48,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="photo_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2" subchannel="0"> + <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> </subchannel> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> <SubchannelValueParam name="LightCyanValue"/> @@ -61,11 +61,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="photo_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1" subchannel="0"> + <subchannel color="1" subchannel="0" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> </subchannel> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> <SubchannelValueParam name="LightMagentaValue"/> @@ -74,7 +74,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="photo_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4" subchannel="0"> + <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -84,17 +84,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK"> <Channels> <channel name="photo_black" index="0"> - <subchannel color="0" subchannel="0"> + <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="photo_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2" subchannel="0"> + <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> </subchannel> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> <SubchannelValueParam name="LightCyanValue"/> @@ -103,11 +103,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="photo_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1" subchannel="0"> + <subchannel color="1" subchannel="0" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> </subchannel> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> <SubchannelValueParam name="LightMagentaValue"/> @@ -116,7 +116,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="photo_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4" subchannel="0"> + <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -127,11 +127,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <Channels> <channel name="photo_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2" subchannel="0"> + <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> </subchannel> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> <SubchannelValueParam name="LightCyanValue"/> @@ -140,11 +140,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="photo_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1" subchannel="0"> + <subchannel color="1" subchannel="0" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> </subchannel> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> <SubchannelValueParam name="LightMagentaValue"/> @@ -153,7 +153,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="photo_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4" subchannel="0"> + <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -163,25 +163,25 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="standard_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -192,19 +192,19 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <Channels> <channel name="standard_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -214,11 +214,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="Gray2" text="Two Level Grayscale" InkID="CcMmYKk"> <Channels> <channel name="photo2_black" index="0"> - <subchannel color="0" subchannel="0"> + <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> <SubchannelTransitionParam name="GrayTrans"/> </subchannel> - <subchannel color="0" subchannel="1"> + <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> <SubchannelTransitionParam name="GrayTrans"/> <SubchannelValueParam name="GrayValue"/> @@ -231,7 +231,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> @@ -241,12 +241,12 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalBlack2" text="Two Color Raw" InkID="Extended"> <Channels> <channel name="photo_black" index="0"> - <subchannel color="0" subchannel="0"> + <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="extended_black" index="1"> - <subchannel color="0" subchannel="1"> + <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> @@ -256,17 +256,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended"> <Channels> <channel name="standard_cyan" index="0"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="1"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="2"> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -276,22 +276,22 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="standard_cyan" index="1"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="3"> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -301,27 +301,27 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCcMmY" text="Five Color Raw" InkID="Extended"> <Channels> <channel name="standard_cyan" index="0"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="extended_cyan" index="1"> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="extended_magenta" index="3"> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="photo_yellow" index="4"> - <subchannel color="4" subchannel="0"> + <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -331,32 +331,32 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCcMmYK" text="Six Color Raw" InkID="Extended"> <Channels> <channel name="photo_black" index="0"> - <subchannel color="0" subchannel="0"> + <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="standard_cyan" index="1"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="extended_cyan" index="2"> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="3"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="extended_magenta" index="4"> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="photo_yellow" index="5"> - <subchannel color="4" subchannel="0"> + <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -366,37 +366,37 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCcMmYKk" text="Seven Color Raw" InkID="Extended"> <Channels> <channel name="photo_black" index="0"> - <subchannel color="0" subchannel="0"> + <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="extended_black" index="1"> - <subchannel color="0" subchannel="1"> + <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="standard_cyan" index="2"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="extended_cyan" index="3"> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="4"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="extended_magenta" index="5"> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="photo_yellow" index="6"> - <subchannel color="4" subchannel="0"> + <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -418,11 +418,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhotoCMYK7" text="Seven Color Photo" InkID="CcMmYKk"> <Channels> <channel name="photo2_black" index="0"> - <subchannel color="0" subchannel="0"> + <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> <SubchannelTransitionParam name="GrayTrans"/> </subchannel> - <subchannel color="0" subchannel="1"> + <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> <SubchannelTransitionParam name="GrayTrans"/> <SubchannelValueParam name="GrayValue"/> @@ -430,11 +430,12 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </subchannel> </channel> <channel name="photo_cyan" index="1"> - <subchannel color="2" subchannel="0"> + <HueCurveParam name="CyanHueCurve"/> + <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> </subchannel> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> <SubchannelValueParam name="LightCyanValue"/> @@ -442,11 +443,12 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </subchannel> </channel> <channel name="photo_magenta" index="2"> - <subchannel color="1" subchannel="0"> + <HueCurveParam name="MagentaHueCurve"/> + <subchannel color="1" subchannel="0" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> </subchannel> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> <SubchannelValueParam name="LightMagentaValue"/> @@ -454,7 +456,8 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </subchannel> </channel> <channel name="photo_yellow" index="3"> - <subchannel color="4" subchannel="0"> + <HueCurveParam name="YellowHueCurve"/> + <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -464,16 +467,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK"> <Channels> <channel name="photo_black" index="0"> - <subchannel color="0" subchannel="0"> + <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="photo_cyan" index="1"> - <subchannel color="2" subchannel="0"> + <HueCurveParam name="CyanHueCurve"/> + <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> </subchannel> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> <SubchannelValueParam name="LightCyanValue"/> @@ -481,11 +485,12 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </subchannel> </channel> <channel name="photo_magenta" index="2"> - <subchannel color="1" subchannel="0"> + <HueCurveParam name="MagentaHueCurve"/> + <subchannel color="1" subchannel="0" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> </subchannel> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> <SubchannelValueParam name="LightMagentaValue"/> @@ -493,7 +498,8 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </subchannel> </channel> <channel name="photo_yellow" index="3"> - <subchannel color="4" subchannel="0"> + <HueCurveParam name="YellowHueCurve"/> + <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -503,11 +509,12 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhotoCMY" text="Five Color Photo Composite" InkID="CcMmYK"> <Channels> <channel name="photo_cyan" index="1"> - <subchannel color="2" subchannel="0"> + <HueCurveParam name="CyanHueCurve"/> + <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> </subchannel> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> <SubchannelValueParam name="LightCyanValue"/> @@ -515,11 +522,12 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </subchannel> </channel> <channel name="photo_magenta" index="2"> - <subchannel color="1" subchannel="0"> + <HueCurveParam name="MagentaHueCurve"/> + <subchannel color="1" subchannel="0" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> </subchannel> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> <SubchannelValueParam name="LightMagentaValue"/> @@ -527,7 +535,8 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </subchannel> </channel> <channel name="photo_yellow" index="3"> - <subchannel color="4" subchannel="0"> + <HueCurveParam name="YellowHueCurve"/> + <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -537,22 +546,25 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="standard_cyan" index="1"> - <subchannel color="2"> + <HueCurveParam name="CyanHueCurve"/> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> - <subchannel color="1"> + <HueCurveParam name="MagentaHueCurve"/> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="3"> - <subchannel color="4"> + <HueCurveParam name="YellowHueCurve"/> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -562,17 +574,20 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="RGB" text="Three Color Composite" InkID="CMYK"> <Channels> <channel name="standard_cyan" index="1"> - <subchannel color="2"> + <HueCurveParam name="CyanHueCurve"/> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> - <subchannel color="1"> + <HueCurveParam name="MagentaHueCurve"/> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="3"> - <subchannel color="4"> + <HueCurveParam name="YellowHueCurve"/> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -582,11 +597,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="Gray2" text="Two Level Grayscale" InkID="CcMmYKk"> <Channels> <channel name="photo2_black" index="0"> - <subchannel color="0" subchannel="0"> + <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> <SubchannelTransitionParam name="GrayTrans"/> </subchannel> - <subchannel color="0" subchannel="1"> + <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> <SubchannelTransitionParam name="GrayTrans"/> <SubchannelValueParam name="GrayValue"/> @@ -599,7 +614,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> @@ -609,12 +624,12 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalBlack2" text="Two Color Raw" InkID="Extended"> <Channels> <channel name="photo_black" index="0"> - <subchannel color="0" subchannel="0"> + <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="extended_black" index="1"> - <subchannel color="0" subchannel="1"> + <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> @@ -624,17 +639,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended"> <Channels> <channel name="standard_cyan" index="0"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="1"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="2"> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -644,22 +659,22 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="standard_cyan" index="1"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="3"> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -669,27 +684,27 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCcMmY" text="Five Color Raw" InkID="Extended"> <Channels> <channel name="standard_cyan" index="0"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="extended_cyan" index="1"> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="extended_magenta" index="3"> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="photo_yellow" index="4"> - <subchannel color="4" subchannel="0"> + <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -699,32 +714,32 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCcMmYK" text="Six Color Raw" InkID="Extended"> <Channels> <channel name="photo_black" index="0"> - <subchannel color="0" subchannel="0"> + <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="standard_cyan" index="1"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="extended_cyan" index="2"> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="3"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="extended_magenta" index="4"> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="photo_yellow" index="5"> - <subchannel color="4" subchannel="0"> + <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -734,37 +749,37 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCcMmYKk" text="Seven Color Raw" InkID="Extended"> <Channels> <channel name="photo_black" index="0"> - <subchannel color="0" subchannel="0"> + <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="extended_black" index="1"> - <subchannel color="0" subchannel="1"> + <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="standard_cyan" index="2"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="extended_cyan" index="3"> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="4"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="extended_magenta" index="5"> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="photo_yellow" index="6"> - <subchannel color="4" subchannel="0"> + <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> diff --git a/src/xml/escp2/inks/pro_ultrachrome_k3.xml b/src/xml/escp2/inks/pro_ultrachrome_k3.xml index 8038997..2e41ed2 100644 --- a/src/xml/escp2/inks/pro_ultrachrome_k3.xml +++ b/src/xml/escp2/inks/pro_ultrachrome_k3.xml @@ -36,17 +36,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhotoCMYK8" text="Eight Color Photo" InkID="CcMmYKk"> <Channels> <channel name="photo3_black" index="0"> - <subchannel color="0" subchannel="0"> + <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> <SubchannelTransitionParam name="DarkGrayTrans"/> </subchannel> - <subchannel color="0" subchannel="1"> + <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> <SubchannelTransitionParam name="DarkGrayTrans"/> <SubchannelValueParam name="DarkGrayValue"/> <SubchannelScaleParam name="DarkGrayScale"/> </subchannel> - <subchannel color="0" subchannel="2"> + <subchannel color="0" subchannel="2" name="LightLightBlack" text="Light Light Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> <SubchannelTransitionParam name="LightGrayTrans"/> <SubchannelValueParam name="LightGrayValue"/> @@ -55,11 +55,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="f360x_photo_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2" subchannel="0"> + <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> </subchannel> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> <SubchannelValueParam name="LightCyanValue"/> @@ -68,11 +68,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="photo_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1" subchannel="0"> + <subchannel color="1" subchannel="0" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> </subchannel> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> <SubchannelValueParam name="LightMagentaValue"/> @@ -81,7 +81,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="standard_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -91,11 +91,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhotoCMYK7" text="Seven Color Photo" InkID="CcMmYKk"> <Channels> <channel name="photo2_black" index="0"> - <subchannel color="0" subchannel="0"> + <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> <SubchannelTransitionParam name="GrayTrans"/> </subchannel> - <subchannel color="0" subchannel="1"> + <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> <SubchannelTransitionParam name="GrayTrans"/> <SubchannelValueParam name="GrayValue"/> @@ -104,11 +104,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="f360x_photo_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2" subchannel="0"> + <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> </subchannel> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> <SubchannelValueParam name="LightCyanValue"/> @@ -117,11 +117,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="photo_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1" subchannel="0"> + <subchannel color="1" subchannel="0" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> </subchannel> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> <SubchannelValueParam name="LightMagentaValue"/> @@ -130,7 +130,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="standard_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -140,17 +140,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK"> <Channels> <channel name="black" index="0"> - <subchannel color="0" subchannel="0"> + <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="f360x_photo_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2" subchannel="0"> + <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> </subchannel> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> <SubchannelValueParam name="LightCyanValue"/> @@ -159,11 +159,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="photo_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1" subchannel="0"> + <subchannel color="1" subchannel="0" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> </subchannel> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> <SubchannelValueParam name="LightMagentaValue"/> @@ -172,7 +172,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="standard_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -183,11 +183,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <Channels> <channel name="f360x_photo_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2" subchannel="0"> + <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> </subchannel> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> <SubchannelValueParam name="LightCyanValue"/> @@ -196,11 +196,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="photo_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1" subchannel="0"> + <subchannel color="1" subchannel="0" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> </subchannel> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> <SubchannelValueParam name="LightMagentaValue"/> @@ -209,7 +209,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="standard_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -219,25 +219,25 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK"> <Channels> <channel name="black" index="0"> - <subchannel color="0" subchannel="0"> + <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="standard_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -248,19 +248,19 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <Channels> <channel name="standard_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -270,42 +270,42 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMYKkk" text="Eight Color Raw" InkID="Extended"> <Channels> <channel name="black" index="0"> - <subchannel color="0" subchannel="0"> + <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="extended_black" index="1"> - <subchannel color="0" subchannel="1"> + <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="extended_photo3_black" index="2"> - <subchannel color="0" subchannel="3"> + <subchannel color="0" subchannel="3" name="LightLightBlack" text="Light Light Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="standard_cyan" index="3"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="extended_cyan" index="4"> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="5"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="extended_magenta" index="6"> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="7"> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -328,17 +328,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhotoCMYK8" text="Eight Color Photo" InkID="CcMmYKk"> <Channels> <channel name="photo3_black" index="0"> - <subchannel color="0" subchannel="0"> + <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> <SubchannelTransitionParam name="DarkGrayTrans"/> </subchannel> - <subchannel color="0" subchannel="1"> + <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> <SubchannelTransitionParam name="DarkGrayTrans"/> <SubchannelValueParam name="DarkGrayValue"/> <SubchannelScaleParam name="DarkGrayScale"/> </subchannel> - <subchannel color="0" subchannel="3"> + <subchannel color="0" subchannel="3" name="LightLightBlack" text="Light Light Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> <SubchannelTransitionParam name="LightGrayTrans"/> <SubchannelValueParam name="LightGrayValue"/> @@ -346,11 +346,12 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </subchannel> </channel> <channel name="f360x_photo_cyan" index="1"> - <subchannel color="2" subchannel="0"> + <HueCurveParam name="CyanHueCurve"/> + <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> </subchannel> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> <SubchannelValueParam name="LightCyanValue"/> @@ -358,11 +359,12 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </subchannel> </channel> <channel name="photo_magenta" index="2"> - <subchannel color="1" subchannel="0"> + <HueCurveParam name="MagentaHueCurve"/> + <subchannel color="1" subchannel="0" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> </subchannel> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> <SubchannelValueParam name="LightMagentaValue"/> @@ -370,7 +372,8 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </subchannel> </channel> <channel name="standard_yellow" index="3"> - <subchannel color="4"> + <HueCurveParam name="YellowHueCurve"/> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -380,11 +383,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhotoCMYK7" text="Seven Color Photo" InkID="CcMmYKk"> <Channels> <channel name="photo2_black" index="0"> - <subchannel color="0" subchannel="0"> + <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> <SubchannelTransitionParam name="GrayTrans"/> </subchannel> - <subchannel color="0" subchannel="1"> + <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> <SubchannelTransitionParam name="GrayTrans"/> <SubchannelValueParam name="GrayValue"/> @@ -392,11 +395,12 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </subchannel> </channel> <channel name="f360x_photo_cyan" index="1"> - <subchannel color="2" subchannel="0"> + <HueCurveParam name="CyanHueCurve"/> + <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> </subchannel> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> <SubchannelValueParam name="LightCyanValue"/> @@ -404,11 +408,12 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </subchannel> </channel> <channel name="photo_magenta" index="2"> - <subchannel color="1" subchannel="0"> + <HueCurveParam name="MagentaHueCurve"/> + <subchannel color="1" subchannel="0" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> </subchannel> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> <SubchannelValueParam name="LightMagentaValue"/> @@ -416,7 +421,8 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </subchannel> </channel> <channel name="standard_yellow" index="3"> - <subchannel color="4"> + <HueCurveParam name="YellowHueCurve"/> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -426,16 +432,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK"> <Channels> <channel name="black" index="0"> - <subchannel color="0" subchannel="0"> + <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="f360x_photo_cyan" index="1"> - <subchannel color="2" subchannel="0"> + <HueCurveParam name="CyanHueCurve"/> + <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> </subchannel> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> <SubchannelValueParam name="LightCyanValue"/> @@ -443,11 +450,12 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </subchannel> </channel> <channel name="photo_magenta" index="2"> - <subchannel color="1" subchannel="0"> + <HueCurveParam name="MagentaHueCurve"/> + <subchannel color="1" subchannel="0" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> </subchannel> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> <SubchannelValueParam name="LightMagentaValue"/> @@ -455,7 +463,8 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </subchannel> </channel> <channel name="standard_yellow" index="3"> - <subchannel color="4"> + <HueCurveParam name="YellowHueCurve"/> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -465,11 +474,12 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhotoCMY" text="Five Color Photo Composite" InkID="CcMmYK"> <Channels> <channel name="f360x_photo_cyan" index="1"> - <subchannel color="2" subchannel="0"> + <HueCurveParam name="CyanHueCurve"/> + <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> </subchannel> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> <SubchannelValueParam name="LightCyanValue"/> @@ -477,11 +487,12 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </subchannel> </channel> <channel name="photo_magenta" index="2"> - <subchannel color="1" subchannel="0"> + <HueCurveParam name="MagentaHueCurve"/> + <subchannel color="1" subchannel="0" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> </subchannel> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> <SubchannelValueParam name="LightMagentaValue"/> @@ -489,7 +500,8 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </subchannel> </channel> <channel name="standard_yellow" index="3"> - <subchannel color="4"> + <HueCurveParam name="YellowHueCurve"/> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -499,22 +511,25 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK"> <Channels> <channel name="black" index="0"> - <subchannel color="0" subchannel="0"> + <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="standard_cyan" index="1"> - <subchannel color="2"> + <HueCurveParam name="CyanHueCurve"/> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> - <subchannel color="1"> + <HueCurveParam name="MagentaHueCurve"/> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="3"> - <subchannel color="4"> + <HueCurveParam name="YellowHueCurve"/> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -524,17 +539,20 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="CMY" text="Three Color Composite" InkID="CMYK"> <Channels> <channel name="standard_cyan" index="1"> - <subchannel color="2"> + <HueCurveParam name="CyanHueCurve"/> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> - <subchannel color="1"> + <HueCurveParam name="MagentaHueCurve"/> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="3"> - <subchannel color="4"> + <HueCurveParam name="YellowHueCurve"/> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -544,42 +562,42 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMYKkk" text="Eight Color Raw" InkID="Extended"> <Channels> <channel name="black" index="0"> - <subchannel color="0" subchannel="0"> + <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="extended_black" index="1"> - <subchannel color="0" subchannel="1"> + <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="extended_photo3_black" index="2"> - <subchannel color="0" subchannel="3"> + <subchannel color="0" subchannel="3" name="LightLightBlack" text="Light Light Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="standard_cyan" index="3"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="extended_cyan" index="4"> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="5"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="extended_magenta" index="6"> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="7"> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> diff --git a/src/xml/escp2/inks/standard.xml b/src/xml/escp2/inks/standard.xml index afd21c4..6c811e5 100644 --- a/src/xml/escp2/inks/standard.xml +++ b/src/xml/escp2/inks/standard.xml @@ -32,25 +32,25 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="standard_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -61,19 +61,19 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <Channels> <channel name="standard_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -83,7 +83,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> @@ -93,17 +93,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended"> <Channels> <channel name="standard_cyan" index="0"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="1"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="2"> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -113,22 +113,22 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="standard_cyan" index="1"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="3"> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -144,25 +144,60 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="Quadtone" text="Quadtone" InkID="Quadtone"> <Channels> <channel name="quadtone" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> - <SubchannelTransitionParam name="GrayTrans"/> + <SubchannelTransitionParam name="Gray3Trans"/> </subchannel> - <subchannel color="2"> + <subchannel color="2" name="Gray3" text="Gray 3" translate="text"> <ChannelDensityParam name="BlackDensity"/> - <SubchannelTransitionParam name="GrayTrans"/> + <SubchannelTransitionParam name="Gray3Trans"/> <SubchannelValueParam name="Gray3Value"/> <SubchannelScaleParam name="Gray3Scale"/> </subchannel> - <subchannel color="1"> + <subchannel color="1" name="Gray2" text="Gray 2" translate="text"> <ChannelDensityParam name="BlackDensity"/> - <SubchannelTransitionParam name="GrayTrans"/> + <SubchannelTransitionParam name="Gray2Trans"/> <SubchannelValueParam name="Gray2Value"/> <SubchannelScaleParam name="Gray2Scale"/> </subchannel> - <subchannel color="4"> + <subchannel color="4" name="Gray1" text="Gray 1" translate="text"> <ChannelDensityParam name="BlackDensity"/> - <SubchannelTransitionParam name="GrayTrans"/> + <SubchannelTransitionParam name="Gray1Trans"/> + <SubchannelValueParam name="Gray1Value"/> + <SubchannelScaleParam name="Gray1Scale"/> + </subchannel> + </channel> + </Channels> + </InkName> +</InkList> + +<InkList translate="text" name="MISQuadtone" text="MIS Quadtone"> + <Shades> + <shade count="4">1.000000 0.750000 0.500000 0.250000</shade> + </Shades> + + <InkName translate="text" name="Quadtone" text="Quadtone" InkID="Quadtone"> + <Channels> + <channel name="quadtone" index="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="Gray3Trans"/> + </subchannel> + <subchannel color="1" name="Gray3" text="Gray 3" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="Gray3Trans"/> + <SubchannelValueParam name="Gray3Value"/> + <SubchannelScaleParam name="Gray3Scale"/> + </subchannel> + <subchannel color="4" name="Gray2" text="Gray 2" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="Gray2Trans"/> + <SubchannelValueParam name="Gray2Value"/> + <SubchannelScaleParam name="Gray2Scale"/> + </subchannel> + <subchannel color="2" name="Gray1" text="Gray 1" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="Gray1Trans"/> <SubchannelValueParam name="Gray1Value"/> <SubchannelScaleParam name="Gray1Scale"/> </subchannel> diff --git a/src/xml/escp2/inks/standard_gen0.xml b/src/xml/escp2/inks/standard_gen0.xml index 7c04253..32f36c0 100644 --- a/src/xml/escp2/inks/standard_gen0.xml +++ b/src/xml/escp2/inks/standard_gen0.xml @@ -32,25 +32,25 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="standard_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -61,19 +61,19 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <Channels> <channel name="standard_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -83,7 +83,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> @@ -93,17 +93,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended"> <Channels> <channel name="standard_cyan" index="0"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="1"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="2"> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -113,22 +113,22 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="standard_cyan" index="1"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="3"> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -144,25 +144,60 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="Quadtone" text="Quadtone" InkID="Quadtone"> <Channels> <channel name="quadtone" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> - <SubchannelTransitionParam name="GrayTrans"/> + <SubchannelTransitionParam name="Gray3Trans"/> </subchannel> - <subchannel color="2"> + <subchannel color="2" name="Gray3" text="Gray 3" translate="text"> <ChannelDensityParam name="BlackDensity"/> - <SubchannelTransitionParam name="GrayTrans"/> + <SubchannelTransitionParam name="Gray3Trans"/> <SubchannelValueParam name="Gray3Value"/> <SubchannelScaleParam name="Gray3Scale"/> </subchannel> - <subchannel color="1"> + <subchannel color="1" name="Gray2" text="Gray 2" translate="text"> <ChannelDensityParam name="BlackDensity"/> - <SubchannelTransitionParam name="GrayTrans"/> + <SubchannelTransitionParam name="Gray2Trans"/> <SubchannelValueParam name="Gray2Value"/> <SubchannelScaleParam name="Gray2Scale"/> </subchannel> - <subchannel color="4"> + <subchannel color="4" name="Gray1" text="Gray 1" translate="text"> <ChannelDensityParam name="BlackDensity"/> - <SubchannelTransitionParam name="GrayTrans"/> + <SubchannelTransitionParam name="Gray1Trans"/> + <SubchannelValueParam name="Gray1Value"/> + <SubchannelScaleParam name="Gray1Scale"/> + </subchannel> + </channel> + </Channels> + </InkName> +</InkList> + +<InkList translate="text" name="MISQuadtone" text="MIS Quadtone"> + <Shades> + <shade count="4">1.000000 0.750000 0.500000 0.250000</shade> + </Shades> + + <InkName translate="text" name="Quadtone" text="Quadtone" InkID="Quadtone"> + <Channels> + <channel name="quadtone" index="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="Gray3Trans"/> + </subchannel> + <subchannel color="1" name="Gray3" text="Gray 3" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="Gray3Trans"/> + <SubchannelValueParam name="Gray3Value"/> + <SubchannelScaleParam name="Gray3Scale"/> + </subchannel> + <subchannel color="4" name="Gray2" text="Gray 2" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="Gray2Trans"/> + <SubchannelValueParam name="Gray2Value"/> + <SubchannelScaleParam name="Gray2Scale"/> + </subchannel> + <subchannel color="2" name="Gray1" text="Gray 1" translate="text"> + <ChannelDensityParam name="BlackDensity"/> + <SubchannelTransitionParam name="Gray1Trans"/> <SubchannelValueParam name="Gray1Value"/> <SubchannelScaleParam name="Gray1Scale"/> </subchannel> diff --git a/src/xml/escp2/inks/ultrachrome.xml b/src/xml/escp2/inks/ultrachrome.xml index 2a3b442..e82a5e1 100644 --- a/src/xml/escp2/inks/ultrachrome.xml +++ b/src/xml/escp2/inks/ultrachrome.xml @@ -35,11 +35,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhotoCMYK7" text="Seven Color Photo" InkID="CcMmYKk"> <Channels> <channel name="photo2_black" index="0"> - <subchannel color="0" subchannel="0"> + <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> <SubchannelTransitionParam name="GrayTrans"/> </subchannel> - <subchannel color="0" subchannel="1"> + <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> <SubchannelTransitionParam name="GrayTrans"/> <SubchannelValueParam name="GrayValue"/> @@ -48,11 +48,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="photo_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2" subchannel="0"> + <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> </subchannel> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> <SubchannelValueParam name="LightCyanValue"/> @@ -61,11 +61,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="photo_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1" subchannel="0"> + <subchannel color="1" subchannel="0" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> </subchannel> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> <SubchannelValueParam name="LightMagentaValue"/> @@ -74,7 +74,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="photo_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4" subchannel="0"> + <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -84,17 +84,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK"> <Channels> <channel name="photo_black" index="0"> - <subchannel color="0" subchannel="0"> + <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="photo_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2" subchannel="0"> + <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> </subchannel> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> <SubchannelValueParam name="LightCyanValue"/> @@ -103,11 +103,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="photo_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1" subchannel="0"> + <subchannel color="1" subchannel="0" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> </subchannel> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> <SubchannelValueParam name="LightMagentaValue"/> @@ -116,7 +116,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="photo_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4" subchannel="0"> + <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -127,11 +127,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <Channels> <channel name="photo_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2" subchannel="0"> + <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> </subchannel> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> <SubchannelValueParam name="LightCyanValue"/> @@ -140,11 +140,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="photo_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1" subchannel="0"> + <subchannel color="1" subchannel="0" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> </subchannel> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> <SubchannelValueParam name="LightMagentaValue"/> @@ -153,7 +153,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </channel> <channel name="photo_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4" subchannel="0"> + <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -163,25 +163,25 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="standard_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -192,19 +192,19 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <Channels> <channel name="standard_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -214,11 +214,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="Gray2" text="Two Level Grayscale" InkID="CcMmYKk"> <Channels> <channel name="photo2_black" index="0"> - <subchannel color="0" subchannel="0"> + <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> <SubchannelTransitionParam name="GrayTrans"/> </subchannel> - <subchannel color="0" subchannel="1"> + <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> <SubchannelTransitionParam name="GrayTrans"/> <SubchannelValueParam name="GrayValue"/> @@ -231,7 +231,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> @@ -241,12 +241,12 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalBlack2" text="Two Color Raw" InkID="Extended"> <Channels> <channel name="photo_black" index="0"> - <subchannel color="0" subchannel="0"> + <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="extended_black" index="1"> - <subchannel color="0" subchannel="1"> + <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> @@ -256,17 +256,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended"> <Channels> <channel name="standard_cyan" index="0"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="1"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="2"> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -276,22 +276,22 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="standard_cyan" index="1"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="3"> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -301,27 +301,27 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCcMmY" text="Five Color Raw" InkID="Extended"> <Channels> <channel name="standard_cyan" index="0"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="extended_cyan" index="1"> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="extended_magenta" index="3"> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="photo_yellow" index="4"> - <subchannel color="4" subchannel="0"> + <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -331,32 +331,32 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCcMmYK" text="Six Color Raw" InkID="Extended"> <Channels> <channel name="photo_black" index="0"> - <subchannel color="0" subchannel="0"> + <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="standard_cyan" index="1"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="extended_cyan" index="2"> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="3"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="extended_magenta" index="4"> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="photo_yellow" index="5"> - <subchannel color="4" subchannel="0"> + <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -366,37 +366,37 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCcMmYKk" text="Seven Color Raw" InkID="Extended"> <Channels> <channel name="photo_black" index="0"> - <subchannel color="0" subchannel="0"> + <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="extended_black" index="1"> - <subchannel color="0" subchannel="1"> + <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="standard_cyan" index="2"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="extended_cyan" index="3"> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="4"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="extended_magenta" index="5"> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="photo_yellow" index="6"> - <subchannel color="4" subchannel="0"> + <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -418,11 +418,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhotoCMYK7" text="Seven Color Photo" InkID="CcMmYKk"> <Channels> <channel name="photo2_black" index="0"> - <subchannel color="0" subchannel="0"> + <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> <SubchannelTransitionParam name="GrayTrans"/> </subchannel> - <subchannel color="0" subchannel="1"> + <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> <SubchannelTransitionParam name="GrayTrans"/> <SubchannelValueParam name="GrayValue"/> @@ -430,11 +430,12 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </subchannel> </channel> <channel name="photo_cyan" index="1"> - <subchannel color="2" subchannel="0"> + <HueCurveParam name="CyanHueCurve"/> + <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> </subchannel> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> <SubchannelValueParam name="LightCyanValue"/> @@ -442,11 +443,12 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </subchannel> </channel> <channel name="photo_magenta" index="2"> - <subchannel color="1" subchannel="0"> + <HueCurveParam name="MagentaHueCurve"/> + <subchannel color="1" subchannel="0" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> </subchannel> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> <SubchannelValueParam name="LightMagentaValue"/> @@ -454,7 +456,8 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </subchannel> </channel> <channel name="photo_yellow" index="3"> - <subchannel color="4" subchannel="0"> + <HueCurveParam name="YellowHueCurve"/> + <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -464,16 +467,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK"> <Channels> <channel name="photo_black" index="0"> - <subchannel color="0" subchannel="0"> + <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="photo_cyan" index="1"> - <subchannel color="2" subchannel="0"> + <HueCurveParam name="CyanHueCurve"/> + <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> </subchannel> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> <SubchannelValueParam name="LightCyanValue"/> @@ -481,11 +485,12 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </subchannel> </channel> <channel name="photo_magenta" index="2"> - <subchannel color="1" subchannel="0"> + <HueCurveParam name="MagentaHueCurve"/> + <subchannel color="1" subchannel="0" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> </subchannel> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> <SubchannelValueParam name="LightMagentaValue"/> @@ -493,7 +498,8 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </subchannel> </channel> <channel name="photo_yellow" index="3"> - <subchannel color="4" subchannel="0"> + <HueCurveParam name="YellowHueCurve"/> + <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -503,11 +509,12 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhotoCMY" text="Five Color Photo Composite" InkID="CcMmYK"> <Channels> <channel name="photo_cyan" index="1"> - <subchannel color="2" subchannel="0"> + <HueCurveParam name="CyanHueCurve"/> + <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> </subchannel> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> <SubchannelTransitionParam name="LightCyanTrans"/> <SubchannelValueParam name="LightCyanValue"/> @@ -515,11 +522,12 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </subchannel> </channel> <channel name="photo_magenta" index="2"> - <subchannel color="1" subchannel="0"> + <HueCurveParam name="MagentaHueCurve"/> + <subchannel color="1" subchannel="0" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> </subchannel> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> <SubchannelTransitionParam name="LightMagentaTrans"/> <SubchannelValueParam name="LightMagentaValue"/> @@ -527,7 +535,8 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </subchannel> </channel> <channel name="photo_yellow" index="3"> - <subchannel color="4" subchannel="0"> + <HueCurveParam name="YellowHueCurve"/> + <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -537,22 +546,25 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="standard_cyan" index="1"> - <subchannel color="2"> + <HueCurveParam name="CyanHueCurve"/> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> - <subchannel color="1"> + <HueCurveParam name="MagentaHueCurve"/> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="3"> - <subchannel color="4"> + <HueCurveParam name="YellowHueCurve"/> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -562,17 +574,20 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="RGB" text="Three Color Composite" InkID="CMYK"> <Channels> <channel name="standard_cyan" index="1"> - <subchannel color="2"> + <HueCurveParam name="CyanHueCurve"/> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> - <subchannel color="1"> + <HueCurveParam name="MagentaHueCurve"/> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="3"> - <subchannel color="4"> + <HueCurveParam name="YellowHueCurve"/> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -582,11 +597,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="Gray2" text="Two Level Grayscale" InkID="CcMmYKk"> <Channels> <channel name="photo2_black" index="0"> - <subchannel color="0" subchannel="0"> + <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> <SubchannelTransitionParam name="GrayTrans"/> </subchannel> - <subchannel color="0" subchannel="1"> + <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> <SubchannelTransitionParam name="GrayTrans"/> <SubchannelValueParam name="GrayValue"/> @@ -599,7 +614,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> @@ -609,12 +624,12 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalBlack2" text="Two Color Raw" InkID="Extended"> <Channels> <channel name="photo_black" index="0"> - <subchannel color="0" subchannel="0"> + <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="extended_black" index="1"> - <subchannel color="0" subchannel="1"> + <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> @@ -624,17 +639,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended"> <Channels> <channel name="standard_cyan" index="0"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="1"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="2"> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -644,22 +659,22 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="standard_cyan" index="1"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="3"> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -669,27 +684,27 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCcMmY" text="Five Color Raw" InkID="Extended"> <Channels> <channel name="standard_cyan" index="0"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="extended_cyan" index="1"> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="2"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="extended_magenta" index="3"> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="photo_yellow" index="4"> - <subchannel color="4" subchannel="0"> + <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -699,32 +714,32 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCcMmYK" text="Six Color Raw" InkID="Extended"> <Channels> <channel name="photo_black" index="0"> - <subchannel color="0" subchannel="0"> + <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="standard_cyan" index="1"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="extended_cyan" index="2"> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="3"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="extended_magenta" index="4"> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="photo_yellow" index="5"> - <subchannel color="4" subchannel="0"> + <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -734,37 +749,37 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCcMmYKk" text="Seven Color Raw" InkID="Extended"> <Channels> <channel name="photo_black" index="0"> - <subchannel color="0" subchannel="0"> + <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="extended_black" index="1"> - <subchannel color="0" subchannel="1"> + <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="standard_cyan" index="2"> - <subchannel color="2"> + <subchannel color="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="extended_cyan" index="3"> - <subchannel color="2" subchannel="1"> + <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="standard_magenta" index="4"> - <subchannel color="1"> + <subchannel color="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="extended_magenta" index="5"> - <subchannel color="1" subchannel="1"> + <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="photo_yellow" index="6"> - <subchannel color="4" subchannel="0"> + <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> diff --git a/src/xml/escp2/inks/wf40.xml b/src/xml/escp2/inks/wf40.xml index 6bf5a9a..72c5a26 100644 --- a/src/xml/escp2/inks/wf40.xml +++ b/src/xml/escp2/inks/wf40.xml @@ -32,26 +32,26 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK"> <Channels> <channel name="wf40_black" index="0"> - <subchannel color="0" subchannel="6"> + <subchannel color="0" subchannel="6" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> <SplitChannels count="3">0 64 96</SplitChannels> </subchannel> </channel> <channel name="wf40_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2" headOffset="2"> + <subchannel color="2" headOffset="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="wf40_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1" headOffset="1"> + <subchannel color="1" headOffset="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="wf40_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -62,19 +62,19 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <Channels> <channel name="wf40_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2" headOffset="2"> + <subchannel color="2" headOffset="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="wf40_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1" headOffset="1"> + <subchannel color="1" headOffset="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="wf40_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -84,7 +84,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended"> <Channels> <channel name="wf40_black" index="0"> - <subchannel color="0" subchannel="6"> + <subchannel color="0" subchannel="6" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> <SplitChannels count="3">0 64 96</SplitChannels> </subchannel> @@ -95,17 +95,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended"> <Channels> <channel name="wf40_cyan" index="0"> - <subchannel color="2" headOffset="2"> + <subchannel color="2" headOffset="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="wf40_magenta" index="1"> - <subchannel color="1" headOffset="1"> + <subchannel color="1" headOffset="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="wf40_yellow" index="2"> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -115,23 +115,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended"> <Channels> <channel name="wf40_black" index="0"> - <subchannel color="0" subchannel="6"> + <subchannel color="0" subchannel="6" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> <SplitChannels count="3">0 64 96</SplitChannels> </subchannel> </channel> <channel name="wf40_cyan" index="1"> - <subchannel color="2" headOffset="2"> + <subchannel color="2" headOffset="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="wf40_magenta" index="2"> - <subchannel color="1" headOffset="1"> + <subchannel color="1" headOffset="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="wf40_yellow" index="3"> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> diff --git a/src/xml/escp2/inks/wf500.xml b/src/xml/escp2/inks/wf500.xml index 5fc2282..30685b1 100644 --- a/src/xml/escp2/inks/wf500.xml +++ b/src/xml/escp2/inks/wf500.xml @@ -32,25 +32,25 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="cx3650_standard_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2" headOffset="2"> + <subchannel color="2" headOffset="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="f360_standard_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1" headOffset="1"> + <subchannel color="1" headOffset="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -61,19 +61,19 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <Channels> <channel name="cx3650_standard_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2" headOffset="2"> + <subchannel color="2" headOffset="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="f360_standard_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1" headOffset="1"> + <subchannel color="1" headOffset="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -83,7 +83,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> @@ -93,17 +93,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended"> <Channels> <channel name="cx3650_standard_cyan" index="0"> - <subchannel color="2" headOffset="2"> + <subchannel color="2" headOffset="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="f360_standard_magenta" index="1"> - <subchannel color="1" headOffset="1"> + <subchannel color="1" headOffset="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="2"> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -113,22 +113,22 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="cx3650_standard_cyan" index="1"> - <subchannel color="2" headOffset="2"> + <subchannel color="2" headOffset="2" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="f360_standard_magenta" index="2"> - <subchannel color="1" headOffset="1"> + <subchannel color="1" headOffset="1" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="standard_yellow" index="3"> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> diff --git a/src/xml/escp2/inks/x80.xml b/src/xml/escp2/inks/x80.xml index 6c24d24..5aa670d 100644 --- a/src/xml/escp2/inks/x80.xml +++ b/src/xml/escp2/inks/x80.xml @@ -32,25 +32,25 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK"> <Channels> <channel name="x80_black" index="0"> - <subchannel color="0" headOffset="48"> + <subchannel color="0" headOffset="48" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="x80_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2" headOffset="96"> + <subchannel color="2" headOffset="96" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="x80_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1" headOffset="48"> + <subchannel color="1" headOffset="48" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="x80_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -61,19 +61,19 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <Channels> <channel name="x80_cyan" index="1"> <HueCurveParam name="CyanHueCurve"/> - <subchannel color="2" headOffset="96"> + <subchannel color="2" headOffset="96" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="x80_magenta" index="2"> <HueCurveParam name="MagentaHueCurve"/> - <subchannel color="1" headOffset="48"> + <subchannel color="1" headOffset="48" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="x80_yellow" index="3"> <HueCurveParam name="YellowHueCurve"/> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -83,7 +83,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended"> <Channels> <channel name="standard_black" index="0"> - <subchannel color="0"> + <subchannel color="0" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> @@ -93,17 +93,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended"> <Channels> <channel name="x80_cyan" index="0"> - <subchannel color="2" headOffset="96"> + <subchannel color="2" headOffset="96" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="x80_magenta" index="1"> - <subchannel color="1" headOffset="48"> + <subchannel color="1" headOffset="48" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="x80_yellow" index="2"> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> @@ -113,22 +113,22 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended"> <Channels> <channel name="x80_black" index="0"> - <subchannel color="0" headOffset="48"> + <subchannel color="0" headOffset="48" name="Black" text="Black" translate="text"> <ChannelDensityParam name="BlackDensity"/> </subchannel> </channel> <channel name="x80_cyan" index="1"> - <subchannel color="2" headOffset="96"> + <subchannel color="2" headOffset="96" name="Cyan" text="Cyan" translate="text"> <ChannelDensityParam name="CyanDensity"/> </subchannel> </channel> <channel name="x80_magenta" index="2"> - <subchannel color="1" headOffset="48"> + <subchannel color="1" headOffset="48" name="Magenta" text="Magenta" translate="text"> <ChannelDensityParam name="MagentaDensity"/> </subchannel> </channel> <channel name="x80_yellow" index="3"> - <subchannel color="4"> + <subchannel color="4" name="Yellow" text="Yellow" translate="text"> <ChannelDensityParam name="YellowDensity"/> </subchannel> </channel> diff --git a/src/xml/escp2/inputslots/Makefile.am b/src/xml/escp2/inputslots/Makefile.am index 68b80b6..65fa848 100644 --- a/src/xml/escp2/inputslots/Makefile.am +++ b/src/xml/escp2/inputslots/Makefile.am @@ -1,4 +1,4 @@ -## $Id: Makefile.am,v 1.5 2008/12/10 00:44:12 rlk Exp $ +## $Id: Makefile.am,v 1.7 2009/05/30 14:10:32 rlk Exp $ ## Copyright (C) 2008 Robert Krawitz ## ## This program is free software; you can redistribute it and/or modify @@ -35,6 +35,7 @@ pkgxmldata_DATA = \ pro_roll_feed.xml \ r1800.xml \ r2400.xml \ + r2880.xml \ rx680.xml \ rx700.xml \ spro5000.xml \ @@ -48,6 +49,7 @@ xml-stamp: $(pkgxmldata_DATA) Makefile.am all-local: xml-stamp +dist-hook: xml-stamp CLEANFILES = xmli18n-tmp.h xml-stamp xml-stamp.tmp EXTRA_DIST = $(pkgxmldata_DATA) diff --git a/src/xml/escp2/inputslots/Makefile.in b/src/xml/escp2/inputslots/Makefile.in index 4d7e430..1917798 100644 --- a/src/xml/escp2/inputslots/Makefile.in +++ b/src/xml/escp2/inputslots/Makefile.in @@ -44,11 +44,14 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \ - $(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \ - $(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/stp.m4 \ + $(top_srcdir)/m4/stp_cups.m4 $(top_srcdir)/m4/stp_gimp.m4 \ + $(top_srcdir)/m4/stp_option.m4 $(top_srcdir)/m4/stp_release.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs @@ -85,10 +88,6 @@ CUPS_CFLAGS = @CUPS_CFLAGS@ CUPS_CONFIG = @CUPS_CONFIG@ CUPS_LIBS = @CUPS_LIBS@ CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DB2HTML = @DB2HTML@ DB2PDF = @DB2PDF@ @@ -98,16 +97,15 @@ DEPDIR = @DEPDIR@ DIALOG = @DIALOG@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ DVIPDF = @DVIPDF@ DVIPS = @DVIPS@ -ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ FIND = @FIND@ FOOMATIC_CONFIGURE = @FOOMATIC_CONFIGURE@ FOOMATIC_KITLOAD = @FOOMATIC_KITLOAD@ @@ -152,6 +150,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTLLIBS = @INTLLIBS@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -163,6 +162,7 @@ LIBREADLINE_DEPS = @LIBREADLINE_DEPS@ LIBS = $(INTLLIBS) @LIBS@ LIBTOOL = @LIBTOOL@ LIBTOOL_DEPS = @LIBTOOL_DEPS@ +LIPO = @LIPO@ LN_S = @LN_S@ LTALLOCA = @LTALLOCA@ LTLIBICONV = @LTLIBICONV@ @@ -175,8 +175,12 @@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ +NM = @NM@ NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -210,8 +214,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -256,6 +259,7 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -268,6 +272,7 @@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS) @@ -283,6 +288,7 @@ pkgxmldata_DATA = \ pro_roll_feed.xml \ r1800.xml \ r2400.xml \ + r2880.xml \ rx680.xml \ rx700.xml \ spro5000.xml \ @@ -378,6 +384,9 @@ distdir: $(DISTFILES) || exit 1; \ fi; \ done + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$(top_distdir)" distdir="$(distdir)" \ + dist-hook check-am: all-am check: check-am all-am: Makefile $(DATA) all-local @@ -467,9 +476,9 @@ uninstall-am: uninstall-pkgxmldataDATA .MAKE: install-am install-strip .PHONY: all all-am all-local check check-am clean clean-generic \ - clean-libtool distclean distclean-generic distclean-libtool \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-dvi \ + clean-libtool dist-hook distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am install-man \ install-pdf install-pdf-am install-pkgxmldataDATA install-ps \ @@ -502,6 +511,8 @@ xml-stamp: $(pkgxmldata_DATA) Makefile.am mv $@.tmp $@ all-local: xml-stamp + +dist-hook: xml-stamp # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/src/xml/escp2/inputslots/artisan.xml b/src/xml/escp2/inputslots/artisan.xml index cefc25f..96a2418 100644 --- a/src/xml/escp2/inputslots/artisan.xml +++ b/src/xml/escp2/inputslots/artisan.xml @@ -22,12 +22,12 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. </copyright> <escp2:InputSlots name="artisan"> - <slot translate="text" name="LowerFront" text="Lower Front Tray"> + <slot translate="text" name="LowerFront" text="Main Tray"> <Duplex><Tumble/></Duplex> <InitSequence>PP\003\000\000\001\001</InitSequence> </slot> - <slot translate="text" name="UpperFront" text="Upper Front Tray"> + <slot translate="text" name="UpperFront" text="Photo Tray"> <Duplex><Tumble/></Duplex> <InitSequence>PP\003\000\000\001\002</InitSequence> </slot> diff --git a/src/xml/escp2/inputslots/r2400.xml b/src/xml/escp2/inputslots/r2400.xml index 4d94dcf..82a2a50 100644 --- a/src/xml/escp2/inputslots/r2400.xml +++ b/src/xml/escp2/inputslots/r2400.xml @@ -30,6 +30,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <slot translate="text" name="Velvet" text="Manual Sheet Guide"> <InitSequence>IR\002\000\000\001EX\006\000\000\000\000\000\005\000PP\003\000\000\003\000</InitSequence> <DeinitSequence>IR\002\000\000\000</DeinitSequence> + <ExtraHeight>360</ExtraHeight> </slot> <slot translate="text" name="Matte" text="Manual Feed (Front)"> diff --git a/src/xml/escp2/inputslots/r2880.xml b/src/xml/escp2/inputslots/r2880.xml new file mode 100644 index 0000000..17f709a --- /dev/null +++ b/src/xml/escp2/inputslots/r2880.xml @@ -0,0 +1,52 @@ +<?xml version="1.0"?> + +<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0" +xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" +xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd"> +<copyright> + * Copyright 2008 Robert Krawitz (rlk@alum.mit.edu) + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the Free + * Software Foundation; either version 2 of the License, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +</copyright> +<escp2:InputSlots name="r2400"> + + <slot translate="text" name="Standard" text="Standard"> + <InitSequence>IR\002\000\000\001EX\006\000\000\000\000\000\005\000PP\003\000\000\001\377</InitSequence> + <DeinitSequence>IR\002\000\000\000</DeinitSequence> + </slot> + + <slot translate="text" name="Velvet" text="Manual Sheet Guide"> + <InitSequence>IR\002\000\000\001EX\006\000\000\000\000\000\005\000PP\003\000\000\003\000</InitSequence> + <DeinitSequence>IR\002\000\000\000</DeinitSequence> + </slot> + + <slot translate="text" name="Matte" text="Manual Feed (Front)"> + <InitSequence>IR\002\000\000\001EX\006\000\000\000\000\000\005\000PP\003\000\000\002\000</InitSequence> + <DeinitSequence>IR\002\000\000\000</DeinitSequence> + </slot> + + <slot translate="text" name="CD" text="Print to CD"> + <CD/> + <InitSequence>IR\002\000\000\001EX\006\000\000\000\000\000\005\000PP\003\000\000\002\001</InitSequence> + <DeinitSequence>IR\002\000\000\000</DeinitSequence> + </slot> + + <slot translate="text" name="Roll" text="Roll Feed"> + <RollFeed><DontEject/></RollFeed> + <InitSequence>IR\002\000\000\001EX\006\000\000\000\000\000\005\001PP\003\000\000\003\001</InitSequence> + <DeinitSequence>IR\002\000\000\002</DeinitSequence> + </slot> +</escp2:InputSlots> +</gutenprint> diff --git a/src/xml/escp2/media/Makefile.am b/src/xml/escp2/media/Makefile.am index 731a904..781b64a 100644 --- a/src/xml/escp2/media/Makefile.am +++ b/src/xml/escp2/media/Makefile.am @@ -1,4 +1,4 @@ -## $Id: Makefile.am,v 1.10 2008/12/20 02:51:54 rlk Exp $ +## $Id: Makefile.am,v 1.13 2009/05/30 14:10:32 rlk Exp $ ## Copyright (C) 2008 Robert Krawitz ## ## This program is free software; you can redistribute it and/or modify @@ -26,6 +26,7 @@ include $(top_srcdir)/scripts/global.mk pkgxmldatadir = $(pkgdatadir)/@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@/xml/escp2/media pkgxmldata_DATA = \ + artisan.xml \ b500.xml \ c120.xml \ c64.xml \ @@ -42,6 +43,7 @@ pkgxmldata_DATA = \ f360_photo7_japan.xml \ f360_ultrachrome.xml \ f360_ultrachrome_k3.xml \ + f360_ultrachrome_k3v.xml \ nx100.xml \ photo_gen0.xml \ photo_gen1.xml \ @@ -72,6 +74,7 @@ xml-stamp: $(pkgxmldata_DATA) Makefile.am all-local: xml-stamp +dist-hook: xml-stamp CLEANFILES = xmli18n-tmp.h xml-stamp xml-stamp.tmp EXTRA_DIST = $(pkgxmldata_DATA) diff --git a/src/xml/escp2/media/Makefile.in b/src/xml/escp2/media/Makefile.in index f955a7d..bc407ad 100644 --- a/src/xml/escp2/media/Makefile.in +++ b/src/xml/escp2/media/Makefile.in @@ -44,11 +44,14 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \ - $(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \ - $(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/stp.m4 \ + $(top_srcdir)/m4/stp_cups.m4 $(top_srcdir)/m4/stp_gimp.m4 \ + $(top_srcdir)/m4/stp_option.m4 $(top_srcdir)/m4/stp_release.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs @@ -85,10 +88,6 @@ CUPS_CFLAGS = @CUPS_CFLAGS@ CUPS_CONFIG = @CUPS_CONFIG@ CUPS_LIBS = @CUPS_LIBS@ CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DB2HTML = @DB2HTML@ DB2PDF = @DB2PDF@ @@ -98,16 +97,15 @@ DEPDIR = @DEPDIR@ DIALOG = @DIALOG@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ DVIPDF = @DVIPDF@ DVIPS = @DVIPS@ -ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ FIND = @FIND@ FOOMATIC_CONFIGURE = @FOOMATIC_CONFIGURE@ FOOMATIC_KITLOAD = @FOOMATIC_KITLOAD@ @@ -152,6 +150,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTLLIBS = @INTLLIBS@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -163,6 +162,7 @@ LIBREADLINE_DEPS = @LIBREADLINE_DEPS@ LIBS = $(INTLLIBS) @LIBS@ LIBTOOL = @LIBTOOL@ LIBTOOL_DEPS = @LIBTOOL_DEPS@ +LIPO = @LIPO@ LN_S = @LN_S@ LTALLOCA = @LTALLOCA@ LTLIBICONV = @LTLIBICONV@ @@ -175,8 +175,12 @@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ +NM = @NM@ NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -210,8 +214,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -256,6 +259,7 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -268,12 +272,14 @@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS) GUTENPRINTUI_LIBS = $(top_builddir)/src/gutenprintui/libgutenprintui.la pkgxmldatadir = $(pkgdatadir)/@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@/xml/escp2/media pkgxmldata_DATA = \ + artisan.xml \ b500.xml \ c120.xml \ c64.xml \ @@ -290,6 +296,7 @@ pkgxmldata_DATA = \ f360_photo7_japan.xml \ f360_ultrachrome.xml \ f360_ultrachrome_k3.xml \ + f360_ultrachrome_k3v.xml \ nx100.xml \ photo_gen0.xml \ photo_gen1.xml \ @@ -402,6 +409,9 @@ distdir: $(DISTFILES) || exit 1; \ fi; \ done + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$(top_distdir)" distdir="$(distdir)" \ + dist-hook check-am: all-am check: check-am all-am: Makefile $(DATA) all-local @@ -491,9 +501,9 @@ uninstall-am: uninstall-pkgxmldataDATA .MAKE: install-am install-strip .PHONY: all all-am all-local check check-am clean clean-generic \ - clean-libtool distclean distclean-generic distclean-libtool \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-dvi \ + clean-libtool dist-hook distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am install-man \ install-pdf install-pdf-am install-pkgxmldataDATA install-ps \ @@ -526,6 +536,8 @@ xml-stamp: $(pkgxmldata_DATA) Makefile.am mv $@.tmp $@ all-local: xml-stamp + +dist-hook: xml-stamp # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/src/xml/escp2/media/artisan.xml b/src/xml/escp2/media/artisan.xml new file mode 100644 index 0000000..576f7cb --- /dev/null +++ b/src/xml/escp2/media/artisan.xml @@ -0,0 +1,1317 @@ +<?xml version="1.0"?> + +<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0" +xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" +xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd"> +<copyright> + * Copyright 2008 Robert Krawitz (rlk@alum.mit.edu) + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the Free + * Software Foundation; either version 2 of the License, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +</copyright> +<escp2:papers name="claria"> +<feature name="PlatenGap"/> +<feature name="PaperMedia"/> +<feature name="PrintMethod"/> +<Curves> + <namedParam name="hue_map"> + <curve wrap="wrap" type="linear" gamma="0" piecewise="false"> + <sequence count="48" lower-bound="-6" upper-bound="6"> + 0 -0.01 -0.03 -0.06 -0.1 -0.15 -0.2 -0.25 + -0.3 -0.35 -0.38 -0.4 -0.42 -0.46 -0.49 -0.52 + -0.55 -0.57 -0.57 -0.55 -0.52 -0.48 -0.4 -0.3 + -0.12 -0.07 -0.04 -0.02 0 0 0 0 + 0 0 0 0 -0.02 -0.04 -0.08 -0.13 + -0.18 -0.18 -0.19 -0.16 -0.13 -0.1 -0.07 -0.03 + </sequence> + </curve> + </namedParam> + <namedParam name="lum_map"> + <curve wrap="wrap" type="linear" gamma="0" piecewise="false"> + <sequence count="48" lower-bound="0" upper-bound="4"> + 0.66 0.67 0.69 0.73 0.77 0.83 0.87 0.89 + 0.91 0.88 0.84 0.78 0.78 0.8 0.82 0.85 + 0.87 0.9 0.94 0.97 1 1 1 1 + 1 1 1 1 1 1 1 1 + 1 1 0.99 0.98 0.96 0.94 0.92 0.88 + 0.84 0.72 0.69 0.67 0.66 0.66 0.66 0.66 + </sequence> + </curve> + </namedParam> + <namedParam name="sat_map"> + <curve wrap="wrap" type="linear" gamma="0" piecewise="false"> + <sequence count="48" lower-bound="0" upper-bound="4"> + 1 1.05 1.15 1.25 1.35 1.45 1.5 1.5 + 1.5 1.5 1.5 1.5 1.5 1.5 1.5 1.5 + 1.5 1.4 1.3 1.2 1.1 1 1 1 + 1 1 1 1 1 1 1 1 + 1 1.1 1.3 1.55 1.8 1.95 2 2 + 2 2 2 1.95 1.8 1.55 1.3 1.1 + </sequence> + </curve> + </namedParam> +</Curves> +<paper translate="text" name="Plain" text="Plain Paper" class="plain"> + <parameter type="integer" name="PaperMedia">0</parameter> + <parameter type="integer" name="PrintMethod">0x11</parameter> + + <resolution name="360x90sw"> + <parameter type="integer" name="PrintMethod">0x10</parameter> + </resolution> + <resolution name="360x180sw"> + <parameter type="integer" name="PrintMethod">0x10</parameter> + </resolution> + <resolution name="360sw"> + <parameter type="integer" name="PrintMethod">0x21</parameter> + </resolution> + <resolution name="720x360sw"> + <parameter type="integer" name="PrintMethod">0x21</parameter> + </resolution> + <resolution name="720sw"> + <parameter type="integer" name="PrintMethod">0x51</parameter> + </resolution> + <resolution name="1440x720sw"> + <parameter type="integer" name="PrintMethod">0x51</parameter> + </resolution> + <resolution name="1440x1440ov"> + <parameter type="integer" name="PrintMethod">0x51</parameter> + </resolution> + <resolution name="2880x1440sw"> + <parameter type="integer" name="PrintMethod">0x51</parameter> + </resolution> + <resolution name="5760x1440sw"> + <parameter type="integer" name="PrintMethod">0x51</parameter> + </resolution> + <resolution name="2880x2880sw"> + <parameter type="integer" name="PrintMethod">0x51</parameter> + </resolution> + <resolution name="5760x2880sw"> + <parameter type="integer" name="PrintMethod">0x51</parameter> + </resolution> + + <ink translate="text" name="None" text="EPSON Standard Inks"> + <parameter type="float" name="Density">0.540000</parameter> + <parameter type="float" name="SubchannelCutoff">0.250000</parameter> + <parameter type="float" name="BlackTrans">0.750000</parameter> + <parameter type="float" name="GCRLower">0.100000</parameter> + <parameter type="float" name="GCRUpper">0.500000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">0.700000</parameter> + <parameter type="float" name="YellowBalance">0.700000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> +</paper> + +<paper translate="text" name="BrightWhite" text="Bright White Paper" class="plain"> + <parameter type="integer" name="PaperMedia">0</parameter> + <parameter type="integer" name="PrintMethod">0x21</parameter> + + <resolution name="360x90sw"> + <parameter type="integer" name="PrintMethod">0x10</parameter> + </resolution> + <resolution name="360x180sw"> + <parameter type="integer" name="PrintMethod">0x10</parameter> + </resolution> + <resolution name="360sw"> + <parameter type="integer" name="PrintMethod">0x21</parameter> + </resolution> + <resolution name="720x360sw"> + <parameter type="integer" name="PrintMethod">0x21</parameter> + </resolution> + <resolution name="720sw"> + <parameter type="integer" name="PrintMethod">0x51</parameter> + </resolution> + <resolution name="1440x720sw"> + <parameter type="integer" name="PrintMethod">0x51</parameter> + </resolution> + <resolution name="1440x1440ov"> + <parameter type="integer" name="PrintMethod">0x51</parameter> + </resolution> + <resolution name="2880x1440sw"> + <parameter type="integer" name="PrintMethod">0x51</parameter> + </resolution> + <resolution name="5760x1440sw"> + <parameter type="integer" name="PrintMethod">0x51</parameter> + </resolution> + <resolution name="2880x2880sw"> + <parameter type="integer" name="PrintMethod">0x51</parameter> + </resolution> + <resolution name="5760x2880sw"> + <parameter type="integer" name="PrintMethod">0x51</parameter> + </resolution> + + <ink translate="text" name="None" text="EPSON Standard Inks"> + <parameter type="float" name="Density">0.540000</parameter> + <parameter type="float" name="SubchannelCutoff">0.250000</parameter> + <parameter type="float" name="BlackTrans">0.750000</parameter> + <parameter type="float" name="GCRLower">0.100000</parameter> + <parameter type="float" name="GCRUpper">0.500000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">0.700000</parameter> + <parameter type="float" name="YellowBalance">0.700000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> +</paper> + +<paper translate="text" name="Postcard" text="Postcard" class="plain"> + <parameter type="integer" name="PaperMedia">5</parameter> + <parameter type="integer" name="PrintMethod">0x21</parameter> + + <resolution name="360x90sw"> + <parameter type="integer" name="PrintMethod">0x10</parameter> + </resolution> + <resolution name="360x180sw"> + <parameter type="integer" name="PrintMethod">0x10</parameter> + </resolution> + <resolution name="360sw"> + <parameter type="integer" name="PrintMethod">0x21</parameter> + </resolution> + <resolution name="720x360sw"> + <parameter type="integer" name="PrintMethod">0x21</parameter> + </resolution> + <resolution name="720sw"> + <parameter type="integer" name="PrintMethod">0x51</parameter> + </resolution> + <resolution name="1440x720sw"> + <parameter type="integer" name="PrintMethod">0x51</parameter> + </resolution> + <resolution name="1440x1440ov"> + <parameter type="integer" name="PrintMethod">0x51</parameter> + </resolution> + <resolution name="2880x1440sw"> + <parameter type="integer" name="PrintMethod">0x51</parameter> + </resolution> + <resolution name="5760x1440sw"> + <parameter type="integer" name="PrintMethod">0x51</parameter> + </resolution> + <resolution name="2880x2880sw"> + <parameter type="integer" name="PrintMethod">0x51</parameter> + </resolution> + <resolution name="5760x2880sw"> + <parameter type="integer" name="PrintMethod">0x51</parameter> + </resolution> + + <ink translate="text" name="None" text="EPSON Standard Inks"> + <parameter type="float" name="Density">0.692000</parameter> + <parameter type="float" name="SubchannelCutoff">0.250000</parameter> + <parameter type="float" name="BlackTrans">0.500000</parameter> + <parameter type="float" name="GCRLower">0.100000</parameter> + <parameter type="float" name="GCRUpper">0.500000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">0.700000</parameter> + <parameter type="float" name="YellowBalance">0.700000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> +</paper> + +<paper translate="text" name="GlossyFilm" text="Glossy Film" class="photo"> + <parameter type="integer" name="PaperMedia">7</parameter> + <parameter type="integer" name="PrintMethod">0x41</parameter> + + <resolution name="360x90sw"> + <parameter type="integer" name="PrintMethod">0x41</parameter> + </resolution> + <resolution name="360x180sw"> + <parameter type="integer" name="PrintMethod">0x41</parameter> + </resolution> + <resolution name="360sw"> + <parameter type="integer" name="PrintMethod">0x41</parameter> + </resolution> + <resolution name="720x360sw"> + <parameter type="integer" name="PrintMethod">0x41</parameter> + </resolution> + <resolution name="720sw"> + <parameter type="integer" name="PrintMethod">0x52</parameter> + </resolution> + <resolution name="1440x720sw"> + <parameter type="integer" name="PrintMethod">0x52</parameter> + </resolution> + <resolution name="1440x1440ov"> + <parameter type="integer" name="PrintMethod">0x55</parameter> + </resolution> + <resolution name="2880x1440sw"> + <parameter type="integer" name="PrintMethod">0x55</parameter> + </resolution> + <resolution name="5760x1440sw"> + <parameter type="integer" name="PrintMethod">0xb2</parameter> + </resolution> + <resolution name="2880x2880sw"> + <parameter type="integer" name="PrintMethod">0xb2</parameter> + </resolution> + <resolution name="5760x2880sw"> + <parameter type="integer" name="PrintMethod">0xb2</parameter> + </resolution> + + <ink translate="text" name="None" text="EPSON Standard Inks"> + <parameter type="float" name="Density">0.833000</parameter> + <parameter type="float" name="SubchannelCutoff">0.250000</parameter> + <parameter type="float" name="BlackTrans">0.750000</parameter> + <parameter type="float" name="GCRLower">0.200000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">0.700000</parameter> + <parameter type="float" name="YellowBalance">0.700000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> +</paper> + +<paper translate="text" name="Transparency" text="Transparencies" class="transparency"> + <parameter type="integer" name="PaperMedia">9</parameter> + <parameter type="integer" name="PrintMethod">0x41</parameter> + + <resolution name="360x90sw"> + <parameter type="integer" name="PrintMethod">0x41</parameter> + </resolution> + <resolution name="360x180sw"> + <parameter type="integer" name="PrintMethod">0x41</parameter> + </resolution> + <resolution name="360sw"> + <parameter type="integer" name="PrintMethod">0x41</parameter> + </resolution> + <resolution name="720x360sw"> + <parameter type="integer" name="PrintMethod">0x41</parameter> + </resolution> + <resolution name="720sw"> + <parameter type="integer" name="PrintMethod">0x52</parameter> + </resolution> + <resolution name="1440x720sw"> + <parameter type="integer" name="PrintMethod">0x52</parameter> + </resolution> + <resolution name="1440x1440ov"> + <parameter type="integer" name="PrintMethod">0x55</parameter> + </resolution> + <resolution name="2880x1440sw"> + <parameter type="integer" name="PrintMethod">0x55</parameter> + </resolution> + <resolution name="5760x1440sw"> + <parameter type="integer" name="PrintMethod">0xb2</parameter> + </resolution> + <resolution name="2880x2880sw"> + <parameter type="integer" name="PrintMethod">0xb2</parameter> + </resolution> + <resolution name="5760x2880sw"> + <parameter type="integer" name="PrintMethod">0xb2</parameter> + </resolution> + + <ink translate="text" name="None" text="EPSON Standard Inks"> + <parameter type="float" name="Density">0.833000</parameter> + <parameter type="float" name="SubchannelCutoff">0.250000</parameter> + <parameter type="float" name="BlackTrans">0.750000</parameter> + <parameter type="float" name="GCRLower">0.200000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">0.700000</parameter> + <parameter type="float" name="YellowBalance">0.700000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> +</paper> + +<paper translate="text" name="Envelope" text="Envelopes" class="plain"> + <parameter type="integer" name="PaperMedia">9</parameter> + <parameter type="integer" name="PrintMethod">0x20</parameter> + + <resolution name="360x90sw"> + <parameter type="integer" name="PrintMethod">0x20</parameter> + </resolution> + <resolution name="360x180sw"> + <parameter type="integer" name="PrintMethod">0x20</parameter> + </resolution> + <resolution name="360sw"> + <parameter type="integer" name="PrintMethod">0x20</parameter> + </resolution> + <resolution name="720x360sw"> + <parameter type="integer" name="PrintMethod">0x40</parameter> + </resolution> + <resolution name="720sw"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + <resolution name="1440x720sw"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + <resolution name="1440x1440ov"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + <resolution name="2880x1440sw"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + <resolution name="5760x1440sw"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + <resolution name="2880x2880sw"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + <resolution name="5760x2880sw"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + + <ink translate="text" name="None" text="EPSON Standard Inks"> + <parameter type="float" name="Density">0.540000</parameter> + <parameter type="float" name="SubchannelCutoff">0.250000</parameter> + <parameter type="float" name="BlackTrans">0.750000</parameter> + <parameter type="float" name="GCRLower">0.100000</parameter> + <parameter type="float" name="GCRUpper">0.500000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">0.700000</parameter> + <parameter type="float" name="YellowBalance">0.700000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> +</paper> + +<paper translate="text" name="BackFilm" text="Back Light Film" class="transparency"> + <parameter type="integer" name="PaperMedia">10</parameter> + <parameter type="integer" name="PrintMethod">0x41</parameter> + + <resolution name="360x90sw"> + <parameter type="integer" name="PrintMethod">0x41</parameter> + </resolution> + <resolution name="360x180sw"> + <parameter type="integer" name="PrintMethod">0x41</parameter> + </resolution> + <resolution name="360sw"> + <parameter type="integer" name="PrintMethod">0x41</parameter> + </resolution> + <resolution name="720x360sw"> + <parameter type="integer" name="PrintMethod">0x41</parameter> + </resolution> + <resolution name="720sw"> + <parameter type="integer" name="PrintMethod">0x52</parameter> + </resolution> + <resolution name="1440x720sw"> + <parameter type="integer" name="PrintMethod">0x52</parameter> + </resolution> + <resolution name="1440x1440ov"> + <parameter type="integer" name="PrintMethod">0x55</parameter> + </resolution> + <resolution name="2880x1440sw"> + <parameter type="integer" name="PrintMethod">0x55</parameter> + </resolution> + <resolution name="5760x1440sw"> + <parameter type="integer" name="PrintMethod">0xb2</parameter> + </resolution> + <resolution name="2880x2880sw"> + <parameter type="integer" name="PrintMethod">0xb2</parameter> + </resolution> + <resolution name="5760x2880sw"> + <parameter type="integer" name="PrintMethod">0xb2</parameter> + </resolution> + + <ink translate="text" name="None" text="EPSON Standard Inks"> + <parameter type="float" name="Density">0.833000</parameter> + <parameter type="float" name="SubchannelCutoff">0.250000</parameter> + <parameter type="float" name="BlackTrans">0.750000</parameter> + <parameter type="float" name="GCRLower">0.200000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">0.700000</parameter> + <parameter type="float" name="YellowBalance">0.700000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> +</paper> + +<paper translate="text" name="Matte" text="Matte Paper" class="good"> + <parameter type="integer" name="PaperMedia">5</parameter> + <parameter type="integer" name="PrintMethod">0x55</parameter> + + <resolution name="360x90sw"> + <parameter type="integer" name="PrintMethod">0x55</parameter> + </resolution> + <resolution name="360x180sw"> + <parameter type="integer" name="PrintMethod">0x55</parameter> + </resolution> + <resolution name="360sw"> + <parameter type="integer" name="PrintMethod">0x55</parameter> + </resolution> + <resolution name="720x360sw"> + <parameter type="integer" name="PrintMethod">0x55</parameter> + </resolution> + <resolution name="720sw"> + <parameter type="integer" name="PrintMethod">0x55</parameter> + </resolution> + <resolution name="1440x720sw"> + <parameter type="integer" name="PrintMethod">0x55</parameter> + </resolution> + <resolution name="1440x1440ov"> + <parameter type="integer" name="PrintMethod">0x55</parameter> + </resolution> + <resolution name="2880x1440sw"> + <parameter type="integer" name="PrintMethod">0x55</parameter> + </resolution> + <resolution name="5760x1440sw"> + <parameter type="integer" name="PrintMethod">0x55</parameter> + </resolution> + <resolution name="2880x2880sw"> + <parameter type="integer" name="PrintMethod">0x55</parameter> + </resolution> + <resolution name="5760x2880sw"> + <parameter type="integer" name="PrintMethod">0x55</parameter> + </resolution> + + <ink translate="text" name="None" text="EPSON Standard Inks"> + <parameter type="float" name="Density">0.833000</parameter> + <parameter type="float" name="SubchannelCutoff">0.250000</parameter> + <parameter type="float" name="BlackTrans">0.600000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">0.700000</parameter> + <parameter type="float" name="YellowBalance">0.700000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> +</paper> + +<paper translate="text" name="MatteHeavy" text="Matte Paper Heavyweight" class="good"> + <parameter type="integer" name="PaperMedia">5</parameter> + <parameter type="integer" name="PrintMethod">0x55</parameter> + + <resolution name="360x90sw"> + <parameter type="integer" name="PrintMethod">0x55</parameter> + </resolution> + <resolution name="360x180sw"> + <parameter type="integer" name="PrintMethod">0x55</parameter> + </resolution> + <resolution name="360sw"> + <parameter type="integer" name="PrintMethod">0x55</parameter> + </resolution> + <resolution name="720x360sw"> + <parameter type="integer" name="PrintMethod">0x55</parameter> + </resolution> + <resolution name="720sw"> + <parameter type="integer" name="PrintMethod">0x55</parameter> + </resolution> + <resolution name="1440x720sw"> + <parameter type="integer" name="PrintMethod">0x55</parameter> + </resolution> + <resolution name="1440x1440ov"> + <parameter type="integer" name="PrintMethod">0x55</parameter> + </resolution> + <resolution name="2880x1440sw"> + <parameter type="integer" name="PrintMethod">0x55</parameter> + </resolution> + <resolution name="5760x1440sw"> + <parameter type="integer" name="PrintMethod">0xb2</parameter> + </resolution> + <resolution name="2880x2880sw"> + <parameter type="integer" name="PrintMethod">0xb2</parameter> + </resolution> + <resolution name="5760x2880sw"> + <parameter type="integer" name="PrintMethod">0xb2</parameter> + </resolution> + + <ink translate="text" name="None" text="EPSON Standard Inks"> + <parameter type="float" name="Density">0.833000</parameter> + <parameter type="float" name="SubchannelCutoff">0.250000</parameter> + <parameter type="float" name="BlackTrans">0.500000</parameter> + <parameter type="float" name="GCRLower">0.250000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">0.700000</parameter> + <parameter type="float" name="YellowBalance">0.700000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> +</paper> + +<paper translate="text" name="PresentationMatte" text="Premium Presentation Paper Matte" class="good"> + <parameter type="integer" name="PaperMedia">3</parameter> + <parameter type="integer" name="PrintMethod">0x55</parameter> + + <resolution name="360x90sw"> + <parameter type="integer" name="PrintMethod">0x55</parameter> + </resolution> + <resolution name="360x180sw"> + <parameter type="integer" name="PrintMethod">0x55</parameter> + </resolution> + <resolution name="360sw"> + <parameter type="integer" name="PrintMethod">0x55</parameter> + </resolution> + <resolution name="720x360sw"> + <parameter type="integer" name="PrintMethod">0x55</parameter> + </resolution> + <resolution name="720sw"> + <parameter type="integer" name="PrintMethod">0x55</parameter> + </resolution> + <resolution name="1440x720sw"> + <parameter type="integer" name="PrintMethod">0x55</parameter> + </resolution> + <resolution name="1440x1440ov"> + <parameter type="integer" name="PrintMethod">0x55</parameter> + </resolution> + <resolution name="2880x1440sw"> + <parameter type="integer" name="PrintMethod">0x55</parameter> + </resolution> + <resolution name="5760x1440sw"> + <parameter type="integer" name="PrintMethod">0xb2</parameter> + </resolution> + <resolution name="2880x2880sw"> + <parameter type="integer" name="PrintMethod">0xb2</parameter> + </resolution> + <resolution name="5760x2880sw"> + <parameter type="integer" name="PrintMethod">0xb2</parameter> + </resolution> + + <ink translate="text" name="None" text="EPSON Standard Inks"> + <parameter type="float" name="Density">0.833000</parameter> + <parameter type="float" name="SubchannelCutoff">0.250000</parameter> + <parameter type="float" name="BlackTrans">0.500000</parameter> + <parameter type="float" name="GCRLower">0.250000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">0.700000</parameter> + <parameter type="float" name="YellowBalance">0.700000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> +</paper> + +<paper translate="text" name="Inkjet" text="Inkjet Paper" class="good"> + <parameter type="integer" name="PaperMedia">1</parameter> + <parameter type="integer" name="PrintMethod">0x11</parameter> + + <resolution name="360x90sw"> + <parameter type="integer" name="PrintMethod">0x10</parameter> + </resolution> + <resolution name="360x180sw"> + <parameter type="integer" name="PrintMethod">0x10</parameter> + </resolution> + <resolution name="360sw"> + <parameter type="integer" name="PrintMethod">0x21</parameter> + </resolution> + <resolution name="720x360sw"> + <parameter type="integer" name="PrintMethod">0x21</parameter> + </resolution> + <resolution name="720sw"> + <parameter type="integer" name="PrintMethod">0x51</parameter> + </resolution> + <resolution name="1440x720sw"> + <parameter type="integer" name="PrintMethod">0x51</parameter> + </resolution> + <resolution name="1440x1440ov"> + <parameter type="integer" name="PrintMethod">0x51</parameter> + </resolution> + <resolution name="2880x1440sw"> + <parameter type="integer" name="PrintMethod">0x51</parameter> + </resolution> + <resolution name="5760x1440sw"> + <parameter type="integer" name="PrintMethod">0x51</parameter> + </resolution> + <resolution name="2880x2880sw"> + <parameter type="integer" name="PrintMethod">0x51</parameter> + </resolution> + <resolution name="5760x2880sw"> + <parameter type="integer" name="PrintMethod">0x51</parameter> + </resolution> + + <ink translate="text" name="None" text="EPSON Standard Inks"> + <parameter type="float" name="Density">0.709000</parameter> + <parameter type="float" name="SubchannelCutoff">0.250000</parameter> + <parameter type="float" name="BlackTrans">0.750000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.750000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">0.700000</parameter> + <parameter type="float" name="YellowBalance">0.700000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> +</paper> + +<paper translate="text" name="Coated" text="Photo Quality Inkjet Paper" class="good"> + <parameter type="integer" name="PaperMedia">3</parameter> + <parameter type="integer" name="PrintMethod">0x55</parameter> + + <resolution name="360x90sw"> + <parameter type="integer" name="PrintMethod">0x55</parameter> + </resolution> + <resolution name="360x180sw"> + <parameter type="integer" name="PrintMethod">0x55</parameter> + </resolution> + <resolution name="360sw"> + <parameter type="integer" name="PrintMethod">0x55</parameter> + </resolution> + <resolution name="720x360sw"> + <parameter type="integer" name="PrintMethod">0x55</parameter> + </resolution> + <resolution name="720sw"> + <parameter type="integer" name="PrintMethod">0x55</parameter> + </resolution> + <resolution name="1440x720sw"> + <parameter type="integer" name="PrintMethod">0x55</parameter> + </resolution> + <resolution name="1440x1440ov"> + <parameter type="integer" name="PrintMethod">0x55</parameter> + </resolution> + <resolution name="2880x1440sw"> + <parameter type="integer" name="PrintMethod">0x55</parameter> + </resolution> + <resolution name="5760x1440sw"> + <parameter type="integer" name="PrintMethod">0x55</parameter> + </resolution> + <resolution name="2880x2880sw"> + <parameter type="integer" name="PrintMethod">0x55</parameter> + </resolution> + <resolution name="5760x2880sw"> + <parameter type="integer" name="PrintMethod">0x55</parameter> + </resolution> + + <ink translate="text" name="None" text="EPSON Standard Inks"> + <parameter type="float" name="Density">0.833000</parameter> + <parameter type="float" name="SubchannelCutoff">0.250000</parameter> + <parameter type="float" name="BlackTrans">0.500000</parameter> + <parameter type="float" name="GCRLower">0.250000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">0.700000</parameter> + <parameter type="float" name="YellowBalance">0.700000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> +</paper> + +<paper translate="text" name="Photo" text="Photo Paper" class="photo"> + <parameter type="integer" name="PaperMedia">6</parameter> + <parameter type="integer" name="PrintMethod">0x41</parameter> + + <resolution name="360x90sw"> + <parameter type="integer" name="PrintMethod">0x41</parameter> + </resolution> + <resolution name="360x180sw"> + <parameter type="integer" name="PrintMethod">0x41</parameter> + </resolution> + <resolution name="360sw"> + <parameter type="integer" name="PrintMethod">0x41</parameter> + </resolution> + <resolution name="720x360sw"> + <parameter type="integer" name="PrintMethod">0x41</parameter> + </resolution> + <resolution name="720sw"> + <parameter type="integer" name="PrintMethod">0x52</parameter> + </resolution> + <resolution name="1440x720sw"> + <parameter type="integer" name="PrintMethod">0x52</parameter> + </resolution> + <resolution name="1440x1440ov"> + <parameter type="integer" name="PrintMethod">0x55</parameter> + </resolution> + <resolution name="2880x1440sw"> + <parameter type="integer" name="PrintMethod">0x55</parameter> + </resolution> + <resolution name="5760x1440sw"> + <parameter type="integer" name="PrintMethod">0xb2</parameter> + </resolution> + <resolution name="2880x2880sw"> + <parameter type="integer" name="PrintMethod">0xb2</parameter> + </resolution> + <resolution name="5760x2880sw"> + <parameter type="integer" name="PrintMethod">0xb2</parameter> + </resolution> + + <ink translate="text" name="None" text="EPSON Standard Inks"> + <parameter type="float" name="Density">0.833000</parameter> + <parameter type="float" name="SubchannelCutoff">0.250000</parameter> + <parameter type="float" name="BlackTrans">0.500000</parameter> + <parameter type="float" name="GCRLower">0.250000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">0.700000</parameter> + <parameter type="float" name="YellowBalance">0.700000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> +</paper> + +<paper translate="text" name="GlossyPhoto" text="Premium Glossy Photo Paper" class="premium"> + <parameter type="integer" name="PaperMedia">11</parameter> + <parameter type="integer" name="PrintMethod">0x41</parameter> + + <resolution name="360x90sw"> + <parameter type="integer" name="PrintMethod">0x41</parameter> + </resolution> + <resolution name="360x180sw"> + <parameter type="integer" name="PrintMethod">0x41</parameter> + </resolution> + <resolution name="360sw"> + <parameter type="integer" name="PrintMethod">0x41</parameter> + </resolution> + <resolution name="720x360sw"> + <parameter type="integer" name="PrintMethod">0x41</parameter> + </resolution> + <resolution name="720sw"> + <parameter type="integer" name="PrintMethod">0x52</parameter> + </resolution> + <resolution name="1440x720sw"> + <parameter type="integer" name="PrintMethod">0x52</parameter> + </resolution> + <resolution name="1440x1440ov"> + <parameter type="integer" name="PrintMethod">0x55</parameter> + </resolution> + <resolution name="2880x1440sw"> + <parameter type="integer" name="PrintMethod">0x55</parameter> + </resolution> + <resolution name="5760x1440sw"> + <parameter type="integer" name="PrintMethod">0xb2</parameter> + </resolution> + <resolution name="2880x2880sw"> + <parameter type="integer" name="PrintMethod">0xb2</parameter> + </resolution> + <resolution name="5760x2880sw"> + <parameter type="integer" name="PrintMethod">0xb2</parameter> + </resolution> + + <ink translate="text" name="None" text="EPSON Standard Inks"> + <parameter type="float" name="Density">0.750000</parameter> + <parameter type="float" name="SubchannelCutoff">0.250000</parameter> + <parameter type="float" name="BlackTrans">0.300000</parameter> + <parameter type="float" name="GCRLower">0.250000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">0.700000</parameter> + <parameter type="float" name="YellowBalance">0.700000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">0.920000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> +</paper> + +<paper translate="text" name="UltraGlossyPhoto" text="Ultra Glossy Photo Paper" class="premium"> + <parameter type="integer" name="PaperMedia">38</parameter> + <parameter type="integer" name="PrintMethod">0x41</parameter> + + <resolution name="360x90sw"> + <parameter type="integer" name="PrintMethod">0x41</parameter> + </resolution> + <resolution name="360x180sw"> + <parameter type="integer" name="PrintMethod">0x41</parameter> + </resolution> + <resolution name="360sw"> + <parameter type="integer" name="PrintMethod">0x41</parameter> + </resolution> + <resolution name="720x360sw"> + <parameter type="integer" name="PrintMethod">0x41</parameter> + </resolution> + <resolution name="720sw"> + <parameter type="integer" name="PrintMethod">0x52</parameter> + </resolution> + <resolution name="1440x720sw"> + <parameter type="integer" name="PrintMethod">0x52</parameter> + </resolution> + <resolution name="1440x1440ov"> + <parameter type="integer" name="PrintMethod">0x55</parameter> + </resolution> + <resolution name="2880x1440sw"> + <parameter type="integer" name="PrintMethod">0x55</parameter> + </resolution> + <resolution name="5760x1440sw"> + <parameter type="integer" name="PrintMethod">0xb2</parameter> + </resolution> + <resolution name="2880x2880sw"> + <parameter type="integer" name="PrintMethod">0xb2</parameter> + </resolution> + <resolution name="5760x2880sw"> + <parameter type="integer" name="PrintMethod">0xb2</parameter> + </resolution> + + <ink translate="text" name="None" text="EPSON Standard Inks"> + <parameter type="float" name="Density">0.750000</parameter> + <parameter type="float" name="SubchannelCutoff">0.250000</parameter> + <parameter type="float" name="BlackTrans">0.300000</parameter> + <parameter type="float" name="GCRLower">0.250000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">0.700000</parameter> + <parameter type="float" name="YellowBalance">0.700000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">0.920000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> +</paper> + +<paper translate="text" name="Semigloss" text="Premium Semigloss Photo Paper" class="premium"> + <parameter type="integer" name="PaperMedia">12</parameter> + <parameter type="integer" name="PrintMethod">0x41</parameter> + + <resolution name="360x90sw"> + <parameter type="integer" name="PrintMethod">0x41</parameter> + </resolution> + <resolution name="360x180sw"> + <parameter type="integer" name="PrintMethod">0x41</parameter> + </resolution> + <resolution name="360sw"> + <parameter type="integer" name="PrintMethod">0x41</parameter> + </resolution> + <resolution name="720x360sw"> + <parameter type="integer" name="PrintMethod">0x41</parameter> + </resolution> + <resolution name="720sw"> + <parameter type="integer" name="PrintMethod">0x52</parameter> + </resolution> + <resolution name="1440x720sw"> + <parameter type="integer" name="PrintMethod">0x52</parameter> + </resolution> + <resolution name="1440x1440ov"> + <parameter type="integer" name="PrintMethod">0x55</parameter> + </resolution> + <resolution name="2880x1440sw"> + <parameter type="integer" name="PrintMethod">0x55</parameter> + </resolution> + <resolution name="5760x1440sw"> + <parameter type="integer" name="PrintMethod">0xb2</parameter> + </resolution> + <resolution name="2880x2880sw"> + <parameter type="integer" name="PrintMethod">0xb2</parameter> + </resolution> + <resolution name="5760x2880sw"> + <parameter type="integer" name="PrintMethod">0xb2</parameter> + </resolution> + + <ink translate="text" name="None" text="EPSON Standard Inks"> + <parameter type="float" name="Density">0.750000</parameter> + <parameter type="float" name="SubchannelCutoff">0.250000</parameter> + <parameter type="float" name="BlackTrans">0.300000</parameter> + <parameter type="float" name="GCRLower">0.250000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">0.700000</parameter> + <parameter type="float" name="YellowBalance">0.700000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">0.920000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> +</paper> + +<paper translate="text" name="Luster" text="Premium Luster Photo Paper" class="premium"> + <parameter type="integer" name="PaperMedia">13</parameter> + <parameter type="integer" name="PrintMethod">0x41</parameter> + + <resolution name="360x90sw"> + <parameter type="integer" name="PrintMethod">0x41</parameter> + </resolution> + <resolution name="360x180sw"> + <parameter type="integer" name="PrintMethod">0x41</parameter> + </resolution> + <resolution name="360sw"> + <parameter type="integer" name="PrintMethod">0x41</parameter> + </resolution> + <resolution name="720x360sw"> + <parameter type="integer" name="PrintMethod">0x41</parameter> + </resolution> + <resolution name="720sw"> + <parameter type="integer" name="PrintMethod">0x52</parameter> + </resolution> + <resolution name="1440x720sw"> + <parameter type="integer" name="PrintMethod">0x52</parameter> + </resolution> + <resolution name="1440x1440ov"> + <parameter type="integer" name="PrintMethod">0x55</parameter> + </resolution> + <resolution name="2880x1440sw"> + <parameter type="integer" name="PrintMethod">0x55</parameter> + </resolution> + <resolution name="5760x1440sw"> + <parameter type="integer" name="PrintMethod">0xb2</parameter> + </resolution> + <resolution name="2880x2880sw"> + <parameter type="integer" name="PrintMethod">0xb2</parameter> + </resolution> + <resolution name="5760x2880sw"> + <parameter type="integer" name="PrintMethod">0xb2</parameter> + </resolution> + + <ink translate="text" name="None" text="EPSON Standard Inks"> + <parameter type="float" name="Density">0.750000</parameter> + <parameter type="float" name="SubchannelCutoff">0.250000</parameter> + <parameter type="float" name="BlackTrans">0.300000</parameter> + <parameter type="float" name="GCRLower">0.250000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">0.700000</parameter> + <parameter type="float" name="YellowBalance">0.700000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">0.920000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> +</paper> + +<paper translate="text" name="UltraLuster" text="Ultra Premium Photo Paper Luster" class="premium"> + <parameter type="integer" name="PaperMedia">38</parameter> + <parameter type="integer" name="PrintMethod">0x41</parameter> + + <resolution name="360x90sw"> + <parameter type="integer" name="PrintMethod">0x41</parameter> + </resolution> + <resolution name="360x180sw"> + <parameter type="integer" name="PrintMethod">0x41</parameter> + </resolution> + <resolution name="360sw"> + <parameter type="integer" name="PrintMethod">0x41</parameter> + </resolution> + <resolution name="720x360sw"> + <parameter type="integer" name="PrintMethod">0x41</parameter> + </resolution> + <resolution name="720sw"> + <parameter type="integer" name="PrintMethod">0x52</parameter> + </resolution> + <resolution name="1440x720sw"> + <parameter type="integer" name="PrintMethod">0x52</parameter> + </resolution> + <resolution name="1440x1440ov"> + <parameter type="integer" name="PrintMethod">0x55</parameter> + </resolution> + <resolution name="2880x1440sw"> + <parameter type="integer" name="PrintMethod">0x55</parameter> + </resolution> + <resolution name="5760x1440sw"> + <parameter type="integer" name="PrintMethod">0xb2</parameter> + </resolution> + <resolution name="2880x2880sw"> + <parameter type="integer" name="PrintMethod">0xb2</parameter> + </resolution> + <resolution name="5760x2880sw"> + <parameter type="integer" name="PrintMethod">0xb2</parameter> + </resolution> + + <ink translate="text" name="None" text="EPSON Standard Inks"> + <parameter type="float" name="Density">0.750000</parameter> + <parameter type="float" name="SubchannelCutoff">0.250000</parameter> + <parameter type="float" name="BlackTrans">0.300000</parameter> + <parameter type="float" name="GCRLower">0.250000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">0.700000</parameter> + <parameter type="float" name="YellowBalance">0.700000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">0.920000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> +</paper> + +<paper translate="text" name="CD" text="CD or DVD" class="premium"> + <parameter type="integer" name="PaperMedia">91</parameter> + <parameter type="integer" name="PrintMethod">0xb1</parameter> + + <resolution name="360x90sw"> + <parameter type="integer" name="PrintMethod">0xb1</parameter> + </resolution> + <resolution name="360x180sw"> + <parameter type="integer" name="PrintMethod">0xb1</parameter> + </resolution> + <resolution name="360sw"> + <parameter type="integer" name="PrintMethod">0xb1</parameter> + </resolution> + <resolution name="720x360sw"> + <parameter type="integer" name="PrintMethod">0xb1</parameter> + </resolution> + <resolution name="720sw"> + <parameter type="integer" name="PrintMethod">0xb1</parameter> + </resolution> + <resolution name="1440x720sw"> + <parameter type="integer" name="PrintMethod">0xb1</parameter> + </resolution> + <resolution name="1440x1440ov"> + <parameter type="integer" name="PrintMethod">0xb1</parameter> + </resolution> + <resolution name="2880x1440sw"> + <parameter type="integer" name="PrintMethod">0xb1</parameter> + </resolution> + <resolution name="5760x1440sw"> + <parameter type="integer" name="PrintMethod">0xb1</parameter> + </resolution> + <resolution name="2880x2880sw"> + <parameter type="integer" name="PrintMethod">0xb1</parameter> + </resolution> + <resolution name="5760x2880sw"> + <parameter type="integer" name="PrintMethod">0xb1</parameter> + </resolution> + + <ink translate="text" name="None" text="EPSON Standard Inks"> + <parameter type="float" name="Density">0.750000</parameter> + <parameter type="float" name="SubchannelCutoff">0.250000</parameter> + <parameter type="float" name="BlackTrans">0.300000</parameter> + <parameter type="float" name="GCRLower">0.250000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">0.700000</parameter> + <parameter type="float" name="YellowBalance">0.700000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">0.920000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> +</paper> + +<paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper"class="premium"> + <parameter type="integer" name="PaperMedia">19</parameter> + <parameter type="integer" name="PrintMethod">0x41</parameter> + + <resolution name="360x90sw"> + <parameter type="integer" name="PrintMethod">0x41</parameter> + </resolution> + <resolution name="360x180sw"> + <parameter type="integer" name="PrintMethod">0x41</parameter> + </resolution> + <resolution name="360sw"> + <parameter type="integer" name="PrintMethod">0x41</parameter> + </resolution> + <resolution name="720x360sw"> + <parameter type="integer" name="PrintMethod">0x41</parameter> + </resolution> + <resolution name="720sw"> + <parameter type="integer" name="PrintMethod">0x52</parameter> + </resolution> + <resolution name="1440x720sw"> + <parameter type="integer" name="PrintMethod">0x52</parameter> + </resolution> + <resolution name="1440x1440ov"> + <parameter type="integer" name="PrintMethod">0x55</parameter> + </resolution> + <resolution name="2880x1440sw"> + <parameter type="integer" name="PrintMethod">0x55</parameter> + </resolution> + <resolution name="5760x1440sw"> + <parameter type="integer" name="PrintMethod">0xb2</parameter> + </resolution> + <resolution name="2880x2880sw"> + <parameter type="integer" name="PrintMethod">0xb2</parameter> + </resolution> + <resolution name="5760x2880sw"> + <parameter type="integer" name="PrintMethod">0xb2</parameter> + </resolution> + + <ink translate="text" name="None" text="EPSON Standard Inks"> + <parameter type="float" name="Density">0.833000</parameter> + <parameter type="float" name="SubchannelCutoff">0.250000</parameter> + <parameter type="float" name="BlackTrans">0.750000</parameter> + <parameter type="float" name="GCRLower">0.200000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">0.700000</parameter> + <parameter type="float" name="YellowBalance">0.700000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> +</paper> + +<paper translate="text" name="Ilford" text="Ilford Heavy Paper" class="premium"> + <parameter type="integer" name="PaperMedia">5</parameter> + <parameter type="integer" name="PrintMethod">0x41</parameter> + + <resolution name="360x90sw"> + <parameter type="integer" name="PrintMethod">0x41</parameter> + </resolution> + <resolution name="360x180sw"> + <parameter type="integer" name="PrintMethod">0x41</parameter> + </resolution> + <resolution name="360sw"> + <parameter type="integer" name="PrintMethod">0x41</parameter> + </resolution> + <resolution name="720x360sw"> + <parameter type="integer" name="PrintMethod">0x41</parameter> + </resolution> + <resolution name="720sw"> + <parameter type="integer" name="PrintMethod">0x52</parameter> + </resolution> + <resolution name="1440x720sw"> + <parameter type="integer" name="PrintMethod">0x52</parameter> + </resolution> + <resolution name="1440x1440ov"> + <parameter type="integer" name="PrintMethod">0x55</parameter> + </resolution> + <resolution name="2880x1440sw"> + <parameter type="integer" name="PrintMethod">0x55</parameter> + </resolution> + <resolution name="5760x1440sw"> + <parameter type="integer" name="PrintMethod">0xb2</parameter> + </resolution> + <resolution name="2880x2880sw"> + <parameter type="integer" name="PrintMethod">0xb2</parameter> + </resolution> + <resolution name="5760x2880sw"> + <parameter type="integer" name="PrintMethod">0xb2</parameter> + </resolution> + + <ink translate="text" name="None" text="EPSON Standard Inks"> + <parameter type="float" name="Density">0.833000</parameter> + <parameter type="float" name="SubchannelCutoff">0.250000</parameter> + <parameter type="float" name="BlackTrans">0.750000</parameter> + <parameter type="float" name="GCRLower">0.200000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">0.700000</parameter> + <parameter type="float" name="YellowBalance">0.700000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> +</paper> + +<paper translate="text" name="ColorLife" text="ColorLife Paper" class="premium"> + <parameter type="integer" name="PaperMedia">23</parameter> + <parameter type="integer" name="PrintMethod">0x41</parameter> + + <resolution name="360x90sw"> + <parameter type="integer" name="PrintMethod">0x41</parameter> + </resolution> + <resolution name="360x180sw"> + <parameter type="integer" name="PrintMethod">0x41</parameter> + </resolution> + <resolution name="360sw"> + <parameter type="integer" name="PrintMethod">0x41</parameter> + </resolution> + <resolution name="720x360sw"> + <parameter type="integer" name="PrintMethod">0x41</parameter> + </resolution> + <resolution name="720sw"> + <parameter type="integer" name="PrintMethod">0x52</parameter> + </resolution> + <resolution name="1440x720sw"> + <parameter type="integer" name="PrintMethod">0x52</parameter> + </resolution> + <resolution name="1440x1440ov"> + <parameter type="integer" name="PrintMethod">0x55</parameter> + </resolution> + <resolution name="2880x1440sw"> + <parameter type="integer" name="PrintMethod">0x55</parameter> + </resolution> + <resolution name="5760x1440sw"> + <parameter type="integer" name="PrintMethod">0xb2</parameter> + </resolution> + <resolution name="2880x2880sw"> + <parameter type="integer" name="PrintMethod">0xb2</parameter> + </resolution> + <resolution name="5760x2880sw"> + <parameter type="integer" name="PrintMethod">0xb2</parameter> + </resolution> + + <ink translate="text" name="None" text="EPSON Standard Inks"> + <parameter type="float" name="Density">0.833000</parameter> + <parameter type="float" name="SubchannelCutoff">0.250000</parameter> + <parameter type="float" name="BlackTrans">0.750000</parameter> + <parameter type="float" name="GCRLower">0.200000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">0.700000</parameter> + <parameter type="float" name="YellowBalance">0.700000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> +</paper> + +<paper translate="text" name="Other" text="Other" class="plain"> + + <ink translate="text" name="None" text="EPSON Standard Inks"> + <parameter type="float" name="Density">0.540000</parameter> + <parameter type="float" name="SubchannelCutoff">0.250000</parameter> + <parameter type="float" name="BlackTrans">0.500000</parameter> + <parameter type="float" name="GCRLower">0.100000</parameter> + <parameter type="float" name="GCRUpper">0.500000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">0.700000</parameter> + <parameter type="float" name="YellowBalance">0.700000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> +</paper> +</escp2:papers> +</gutenprint> diff --git a/src/xml/escp2/media/c64.xml b/src/xml/escp2/media/c64.xml index 86698bb..47ec5e7 100644 --- a/src/xml/escp2/media/c64.xml +++ b/src/xml/escp2/media/c64.xml @@ -96,6 +96,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="PlainFast" text="Plain Paper Fast Load" class="plain"> @@ -134,6 +151,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Postcard" text="Postcard" class="plain"> @@ -172,6 +206,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.830000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="GlossyFilm" text="Glossy Film" class="photo"> @@ -210,6 +261,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Transparency" text="Transparencies" class="transparency"> @@ -248,6 +316,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">0.750000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Envelope" text="Envelopes" class="plain"> @@ -286,6 +371,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="BackFilm" text="Back Light Film" class="transparency"> @@ -324,6 +426,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">0.750000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Matte" text="Matte Paper" class="good"> @@ -362,6 +481,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.850000</parameter> + <parameter type="float" name="SubchannelCutoff">0.800000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="MatteHeavy" text="Matte Paper Heavyweight" class="good"> @@ -400,6 +536,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Inkjet" text="Inkjet Paper" class="good"> @@ -438,6 +591,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.850000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.100000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Coated" text="Photo Quality Inkjet Paper" class="good"> @@ -476,6 +646,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.100000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Photo" text="Photo Paper" class="photo"> @@ -514,6 +701,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="GlossyPhoto" text="Premium Glossy Photo Paper" @@ -553,6 +757,23 @@ class="premium"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.100000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Semigloss" text="Premium Semigloss Photo Paper" @@ -592,6 +813,23 @@ class="premium"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Luster" text="Premium Luster Photo Paper" class="premium"> @@ -630,6 +868,23 @@ class="premium"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper" @@ -669,6 +924,23 @@ class="photo"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Ilford" text="Ilford Heavy Paper" class="premium"> @@ -707,6 +979,23 @@ class="photo"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">1.350000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="ColorLife" text="ColorLife Paper" class="premium"> @@ -745,6 +1034,23 @@ class="photo"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Other" text="Other" class="plain"> @@ -783,6 +1089,23 @@ class="photo"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> </escp2:papers> </gutenprint> diff --git a/src/xml/escp2/media/c80.xml b/src/xml/escp2/media/c80.xml index 5a3bbc8..b9b37d9 100644 --- a/src/xml/escp2/media/c80.xml +++ b/src/xml/escp2/media/c80.xml @@ -96,6 +96,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="PlainFast" text="Plain Paper Fast Load" class="plain"> @@ -134,6 +151,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Postcard" text="Postcard" class="plain"> @@ -172,6 +206,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.830000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="GlossyFilm" text="Glossy Film" class="photo"> @@ -210,6 +261,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Transparency" text="Transparencies" class="transparency"> @@ -248,6 +316,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">0.750000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Envelope" text="Envelopes" class="plain"> @@ -286,6 +371,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="BackFilm" text="Back Light Film" class="transparency"> @@ -324,6 +426,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">0.750000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Matte" text="Matte Paper" class="good"> @@ -362,6 +481,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.850000</parameter> + <parameter type="float" name="SubchannelCutoff">0.800000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="MatteHeavy" text="Matte Paper Heavyweight" class="good"> @@ -400,6 +536,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Inkjet" text="Inkjet Paper" class="good"> @@ -438,6 +591,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.850000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.100000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Coated" text="Photo Quality Inkjet Paper" class="good"> @@ -476,6 +646,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.100000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Photo" text="Photo Paper" class="photo" @@ -515,6 +702,23 @@ PreferredInktype="RGB"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="GlossyPhoto" text="Premium Glossy Photo Paper" @@ -554,6 +758,23 @@ class="premium" PreferredInktype="RGB"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.100000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Semigloss" text="Premium Semigloss Photo Paper" @@ -593,6 +814,23 @@ class="premium" PreferredInktype="RGB"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Luster" text="Premium Luster Photo Paper" class="premium" @@ -632,6 +870,23 @@ PreferredInktype="RGB"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper" @@ -671,6 +926,23 @@ class="photo" PreferredInktype="RGB"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Ilford" text="Ilford Heavy Paper" class="premium"> @@ -709,6 +981,23 @@ class="photo" PreferredInktype="RGB"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">1.350000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="ColorLife" text="ColorLife Paper" class="premium"> @@ -747,6 +1036,23 @@ class="photo" PreferredInktype="RGB"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Other" text="Other" class="plain"> @@ -785,6 +1091,23 @@ class="photo" PreferredInktype="RGB"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> </escp2:papers> </gutenprint> diff --git a/src/xml/escp2/media/c82.xml b/src/xml/escp2/media/c82.xml index 0e084c7..1f2b76a 100644 --- a/src/xml/escp2/media/c82.xml +++ b/src/xml/escp2/media/c82.xml @@ -96,6 +96,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="PlainFast" text="Plain Paper Fast Load" class="plain"> @@ -134,6 +151,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Postcard" text="Postcard" class="plain"> @@ -172,6 +206,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.830000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="GlossyFilm" text="Glossy Film" class="photo"> @@ -210,6 +261,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Transparency" text="Transparencies" class="transparency"> @@ -248,6 +316,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">0.750000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Envelope" text="Envelopes" class="plain"> @@ -286,6 +371,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="BackFilm" text="Back Light Film" class="transparency"> @@ -324,6 +426,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">0.750000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Matte" text="Matte Paper" class="good"> @@ -362,6 +481,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.850000</parameter> + <parameter type="float" name="SubchannelCutoff">0.800000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="MatteHeavy" text="Matte Paper Heavyweight" class="good"> @@ -400,6 +536,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Inkjet" text="Inkjet Paper" class="good"> @@ -438,6 +591,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.850000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.100000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Coated" text="Photo Quality Inkjet Paper" class="good"> @@ -476,6 +646,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.100000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Photo" text="Photo Paper" class="photo"> @@ -514,6 +701,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="GlossyPhoto" text="Premium Glossy Photo Paper" @@ -553,6 +757,23 @@ class="premium"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.100000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Semigloss" text="Premium Semigloss Photo Paper" @@ -592,6 +813,23 @@ class="premium"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Luster" text="Premium Luster Photo Paper" class="premium"> @@ -630,6 +868,23 @@ class="premium"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper" @@ -669,6 +924,23 @@ class="photo"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Ilford" text="Ilford Heavy Paper" class="premium"> @@ -707,6 +979,23 @@ class="photo"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">1.350000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="ColorLife" text="ColorLife Paper" class="premium"> @@ -745,6 +1034,23 @@ class="photo"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Other" text="Other" class="plain"> @@ -783,6 +1089,23 @@ class="photo"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> </escp2:papers> </gutenprint> diff --git a/src/xml/escp2/media/cx3650.xml b/src/xml/escp2/media/cx3650.xml index 07d5ea0..f1638c1 100644 --- a/src/xml/escp2/media/cx3650.xml +++ b/src/xml/escp2/media/cx3650.xml @@ -96,6 +96,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="PlainFast" text="Plain Paper Fast Load" class="plain"> @@ -134,6 +151,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Postcard" text="Postcard" class="plain"> @@ -172,6 +206,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.830000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="GlossyFilm" text="Glossy Film" class="photo"> @@ -210,6 +261,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Transparency" text="Transparencies" class="transparency"> @@ -248,6 +316,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">0.750000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Envelope" text="Envelopes" class="plain"> @@ -286,6 +371,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="BackFilm" text="Back Light Film" class="transparency"> @@ -324,6 +426,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">0.750000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Matte" text="Matte Paper" class="good"> @@ -362,6 +481,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.850000</parameter> + <parameter type="float" name="SubchannelCutoff">0.800000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="MatteHeavy" text="Matte Paper Heavyweight" class="good"> @@ -400,6 +536,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Inkjet" text="Inkjet Paper" class="good"> @@ -438,6 +591,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.850000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.100000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Coated" text="Photo Quality Inkjet Paper" class="good"> @@ -476,6 +646,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.100000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Photo" text="Photo Paper" class="photo"> @@ -514,6 +701,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="GlossyPhoto" text="Premium Glossy Photo Paper" @@ -553,6 +757,23 @@ class="premium"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.100000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Semigloss" text="Premium Semigloss Photo Paper" @@ -592,6 +813,23 @@ class="premium"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Luster" text="Premium Luster Photo Paper" class="premium"> @@ -630,6 +868,23 @@ class="premium"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper" @@ -669,6 +924,23 @@ class="photo"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Ilford" text="Ilford Heavy Paper" class="premium"> @@ -707,6 +979,23 @@ class="photo"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">1.350000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="ColorLife" text="ColorLife Paper" class="premium"> @@ -745,6 +1034,23 @@ class="photo"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Other" text="Other" class="plain"> @@ -783,6 +1089,23 @@ class="photo"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> </escp2:papers> </gutenprint> diff --git a/src/xml/escp2/media/f360.xml b/src/xml/escp2/media/f360.xml index 574d0fb..d9762a1 100644 --- a/src/xml/escp2/media/f360.xml +++ b/src/xml/escp2/media/f360.xml @@ -96,6 +96,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="PlainFast" text="Plain Paper Fast Load" class="plain"> @@ -134,6 +151,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Postcard" text="Postcard" class="plain"> @@ -172,6 +206,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.830000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="GlossyFilm" text="Glossy Film" class="photo"> @@ -210,6 +261,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Transparency" text="Transparencies" class="transparency"> @@ -248,6 +316,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">0.750000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Envelope" text="Envelopes" class="plain"> @@ -286,6 +371,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="BackFilm" text="Back Light Film" class="transparency"> @@ -324,6 +426,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">0.750000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Matte" text="Matte Paper" class="good"> @@ -362,6 +481,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.850000</parameter> + <parameter type="float" name="SubchannelCutoff">0.800000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="MatteHeavy" text="Matte Paper Heavyweight" class="good"> @@ -400,6 +536,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Inkjet" text="Inkjet Paper" class="good"> @@ -438,6 +591,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.850000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.100000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Coated" text="Photo Quality Inkjet Paper" class="good"> @@ -476,6 +646,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.100000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Photo" text="Photo Paper" class="photo"> @@ -514,6 +701,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="GlossyPhoto" text="Premium Glossy Photo Paper" @@ -553,6 +757,23 @@ class="premium"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.100000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Semigloss" text="Premium Semigloss Photo Paper" @@ -592,6 +813,23 @@ class="premium"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Luster" text="Premium Luster Photo Paper" class="premium"> @@ -630,6 +868,23 @@ class="premium"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper" @@ -669,6 +924,23 @@ class="photo"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Ilford" text="Ilford Heavy Paper" class="premium"> @@ -707,6 +979,23 @@ class="photo"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">1.350000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="ColorLife" text="ColorLife Paper" class="premium"> @@ -745,6 +1034,23 @@ class="photo"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Other" text="Other" class="plain"> @@ -783,6 +1089,23 @@ class="photo"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> </escp2:papers> </gutenprint> diff --git a/src/xml/escp2/media/f360_ultrachrome_k3v.xml b/src/xml/escp2/media/f360_ultrachrome_k3v.xml new file mode 100644 index 0000000..5fb8a99 --- /dev/null +++ b/src/xml/escp2/media/f360_ultrachrome_k3v.xml @@ -0,0 +1,1468 @@ +<?xml version="1.0"?> + +<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0" +xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" +xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd"> +<copyright> + * Copyright 2008 Robert Krawitz (rlk@alum.mit.edu) + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the Free + * Software Foundation; either version 2 of the License, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +</copyright> +<escp2:papers name="f360_ultrachrome_k3"> +<feature name="PlatenGap"/> +<feature name="PaperMedia"/> +<feature name="PrintMethod"/> +<feature name="FeedSequence"/> +<Curves> + <namedParam name="hue_map"> + <curve wrap="wrap" type="linear" gamma="0" piecewise="false"> + <sequence count="48" lower-bound="-6" upper-bound="6"> + 0 0.06 0.1 0.1 0.06 0 -0.06 -0.12 + -0.18 -0.21 -0.22 -0.22 -0.22 -0.22 -0.22 -0.22 + -0.22 -0.28 -0.34 -0.4 -0.5 -0.4 -0.3 -0.2 + -0.12 -0.07 -0.04 -0.02 0 0 0 0 + 0 0 -0.03 -0.07 -0.11 -0.15 -0.17 -0.18 + -0.19 -0.2 -0.19 -0.18 -0.16 -0.12 -0.08 -0.04 + </sequence> + </curve> + </namedParam> + <namedParam name="lum_map"> + <curve wrap="wrap" type="linear" gamma="0" piecewise="false"> + <sequence count="48" lower-bound="0" upper-bound="4"> + 0.55 0.57 0.61 0.64 0.67 0.69 0.72 0.75 + 0.83 0.8 0.76 0.76 0.78 0.79 0.83 0.86 + 0.93 0.95 0.97 0.97 0.97 0.97 0.96 0.96 + 0.96 0.97 0.97 0.98 0.99 1 1 1 + 1 0.98 0.97 0.95 0.93 0.91 0.88 0.83 + 0.83 0.71 0.65 0.61 0.58 0.56 0.55 0.55 + </sequence> + </curve> + </namedParam> + <namedParam name="sat_map"> + <curve wrap="wrap" type="linear" gamma="0" piecewise="false"> + <sequence count="48" lower-bound="0" upper-bound="4"> + 1 1 1 1.05 1.1 1.15 1.15 1.15 + 1.15 1.15 1.15 1.1 1.1 1.05 1.05 1 + 1 1 1 1 1 1 1 1 + 1 1 1 1 1 1 1 1 + 1 1.05 1.15 1.25 1.35 1.45 1.5 1.5 + 1.5 1.5 1.5 1.45 1.35 1.25 1.15 1.05 + </sequence> + </curve> + </namedParam> + <namedParam name="premium_hue_map"> + <curve wrap="wrap" type="linear" gamma="0" piecewise="false"> + <sequence count="48" lower-bound="-6" upper-bound="6"> + 0 0.06 0.1 0.1 0.06 0 -0.06 -0.12 + -0.18 -0.21 -0.22 -0.22 -0.22 -0.22 -0.22 -0.22 + -0.22 -0.28 -0.34 -0.4 -0.5 -0.4 -0.3 -0.2 + -0.12 -0.07 -0.04 -0.02 0 0 0 0 + 0 0 -0.03 -0.07 -0.11 -0.15 -0.19 -0.22 + -0.25 -0.22 -0.19 -0.15 -0.12 -0.1 -0.06 -0.03 + </sequence> + </curve> + </namedParam> + <namedParam name="premium_lum_map"> + <curve wrap="wrap" type="linear" gamma="0" piecewise="false"> + <sequence count="48" lower-bound="0" upper-bound="4"> + 0.55 0.57 0.61 0.64 0.67 0.69 0.72 0.75 + 0.75 0.71 0.7 0.7 0.72 0.76 0.81 0.87 + 0.93 0.95 0.97 0.98 0.98 0.97 0.96 0.96 + 0.96 0.97 0.98 0.98 0.99 1 1 1 + 1 0.98 0.97 0.96 0.95 0.93 0.9 0.87 + 0.83 0.71 0.65 0.61 0.58 0.56 0.55 0.55 + </sequence> + </curve> + </namedParam> + <namedParam name="premium_sat_map"> + <curve wrap="wrap" type="linear" gamma="0" piecewise="false"> + <sequence count="48" lower-bound="0" upper-bound="4"> + 1 1 1 1.05 1.1 1.15 1.15 1.15 + 1.15 1.15 1.15 1.1 1.1 1.05 1.05 1 + 1 1 1 1 1 1 1 1 + 1 1 1 1 1 1 1 1 + 1 1.05 1.15 1.25 1.35 1.45 1.5 1.5 + 1.5 1.5 1.5 1.45 1.35 1.25 1.15 1.05 + </sequence> + </curve> + </namedParam> +</Curves> +<paper translate="text" name="Plain" text="Plain Paper" class="plain" PreferredInkset="UltraMatte"> + <parameter type="integer" name="PaperMedia">0</parameter> + <parameter type="integer" name="PrintMethod">0x21</parameter> + + <resolution name="360x180sw"> + <parameter type="integer" name="PrintMethod">0x21</parameter> + </resolution> + <resolution name="360sw"> + <parameter type="integer" name="PrintMethod">0x21</parameter> + </resolution> + <resolution name="720x360sw"> + <parameter type="integer" name="PrintMethod">0x21</parameter> + </resolution> + <resolution name="720sw"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + <resolution name="1440x720sw"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + <resolution name="1440x1440ov"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + <resolution name="2880x1440sw"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + <resolution name="5760x1440sw"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + <resolution name="2880x2880sw"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + <resolution name="5760x2880sw"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + + <ink translate="text" name="ultra3photo" text="Photo Black"> + <parameter type="float" name="Density">0.720000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.000000</parameter> + <parameter type="float" name="GCRUpper">0.000000</parameter> + <parameter type="float" name="CyanBalance">0.900000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="ultra3matte" text="Matte Black"> + <parameter type="float" name="Density">0.720000</parameter> + <parameter type="float" name="SubchannelCutoff">0.100000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.000000</parameter> + <parameter type="float" name="GCRUpper">0.000000</parameter> + <parameter type="float" name="CyanBalance">0.900000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> +</paper> + +<paper translate="text" name="Postcard" text="Postcard" class="plain" PreferredInkset="UltraMatte"> + <parameter type="integer" name="PaperMedia">1</parameter> + <parameter type="integer" name="PrintMethod">0x21</parameter> + + <resolution name="360x180sw"> + <parameter type="integer" name="PrintMethod">0x21</parameter> + </resolution> + <resolution name="360sw"> + <parameter type="integer" name="PrintMethod">0x21</parameter> + </resolution> + <resolution name="720x360sw"> + <parameter type="integer" name="PrintMethod">0x21</parameter> + </resolution> + <resolution name="720sw"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + <resolution name="1440x720sw"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + <resolution name="1440x1440ov"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + <resolution name="2880x1440sw"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + <resolution name="5760x1440sw"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + <resolution name="2880x2880sw"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + <resolution name="5760x2880sw"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + + <ink translate="text" name="ultra3photo" text="Photo Black"> + <parameter type="float" name="Density">0.720000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.000000</parameter> + <parameter type="float" name="GCRUpper">0.000000</parameter> + <parameter type="float" name="CyanBalance">0.900000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="ultra3matte" text="Matte Black"> + <parameter type="float" name="Density">0.720000</parameter> + <parameter type="float" name="SubchannelCutoff">0.100000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.000000</parameter> + <parameter type="float" name="GCRUpper">0.000000</parameter> + <parameter type="float" name="CyanBalance">0.900000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> +</paper> + +<paper translate="text" name="GlossyFilm" text="Glossy Film" class="photo" PreferredInkset="UltraPhoto"> + <parameter type="integer" name="PaperMedia">7</parameter> + <parameter type="integer" name="PrintMethod">0x21</parameter> + + <resolution name="360x180sw"> + <parameter type="integer" name="PrintMethod">0x21</parameter> + </resolution> + <resolution name="360sw"> + <parameter type="integer" name="PrintMethod">0x21</parameter> + </resolution> + <resolution name="720x360sw"> + <parameter type="integer" name="PrintMethod">0x21</parameter> + </resolution> + <resolution name="720sw"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + <resolution name="1440x720sw"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + <resolution name="1440x1440ov"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + <resolution name="2880x1440sw"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + <resolution name="5760x1440sw"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + <resolution name="2880x2880sw"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + <resolution name="5760x2880sw"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + + <ink translate="text" name="ultra3photo" text="Photo Black"> + <parameter type="float" name="Density">0.830000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.000000</parameter> + <parameter type="float" name="GCRUpper">0.000000</parameter> + <parameter type="float" name="CyanBalance">0.900000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="ultra3matte" text="Matte Black"> + <parameter type="float" name="Density">0.830000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.000000</parameter> + <parameter type="float" name="GCRUpper">0.000000</parameter> + <parameter type="float" name="CyanBalance">0.900000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> +</paper> + +<paper translate="text" name="Transparency" text="Transparencies" class="transparency" PreferredInkset="UltraPhoto"> + <parameter type="integer" name="PaperMedia">9</parameter> + <parameter type="integer" name="PrintMethod">0x50</parameter> + + <resolution name="360x180sw"> + <parameter type="integer" name="PrintMethod">0x20</parameter> + </resolution> + <resolution name="360sw"> + <parameter type="integer" name="PrintMethod">0x20</parameter> + </resolution> + <resolution name="720x360sw"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + <resolution name="720sw"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + <resolution name="1440x720sw"> + <parameter type="integer" name="PrintMethod">0x71</parameter> + </resolution> + <resolution name="1440x1440ov"> + <parameter type="integer" name="PrintMethod">0x71</parameter> + </resolution> + <resolution name="2880x1440sw"> + <parameter type="integer" name="PrintMethod">0x71</parameter> + </resolution> + <resolution name="5760x1440sw"> + <parameter type="integer" name="PrintMethod">0x71</parameter> + </resolution> + <resolution name="2880x2880sw"> + <parameter type="integer" name="PrintMethod">0x71</parameter> + </resolution> + <resolution name="5760x2880sw"> + <parameter type="integer" name="PrintMethod">0x71</parameter> + </resolution> + + <ink translate="text" name="ultra3photo" text="Photo Black"> + <parameter type="float" name="Density">0.830000</parameter> + <parameter type="float" name="SubchannelCutoff">0.750000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.000000</parameter> + <parameter type="float" name="GCRUpper">0.000000</parameter> + <parameter type="float" name="CyanBalance">0.900000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="ultra3matte" text="Matte Black"> + <parameter type="float" name="Density">0.830000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.000000</parameter> + <parameter type="float" name="GCRUpper">0.000000</parameter> + <parameter type="float" name="CyanBalance">0.900000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> +</paper> + +<paper translate="text" name="Envelope" text="Envelopes" class="plain" PreferredInkset="UltraMatte"> + <parameter type="integer" name="PaperMedia">1</parameter> + <parameter type="integer" name="PrintMethod">0x21</parameter> + + <resolution name="360x180sw"> + <parameter type="integer" name="PrintMethod">0x21</parameter> + </resolution> + <resolution name="360sw"> + <parameter type="integer" name="PrintMethod">0x21</parameter> + </resolution> + <resolution name="720x360sw"> + <parameter type="integer" name="PrintMethod">0x21</parameter> + </resolution> + <resolution name="720sw"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + <resolution name="1440x720sw"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + <resolution name="1440x1440ov"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + <resolution name="2880x1440sw"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + <resolution name="5760x1440sw"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + <resolution name="2880x2880sw"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + <resolution name="5760x2880sw"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + + <ink translate="text" name="ultra3photo" text="Photo Black"> + <parameter type="float" name="Density">0.720000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.000000</parameter> + <parameter type="float" name="GCRUpper">0.000000</parameter> + <parameter type="float" name="CyanBalance">0.900000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="ultra3matte" text="Matte Black"> + <parameter type="float" name="Density">0.720000</parameter> + <parameter type="float" name="SubchannelCutoff">0.100000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.000000</parameter> + <parameter type="float" name="GCRUpper">0.000000</parameter> + <parameter type="float" name="CyanBalance">0.900000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> +</paper> + +<paper translate="text" name="BackFilm" text="Back Light Film" class="transparency" PreferredInkset="UltraPhoto"> + <parameter type="integer" name="PaperMedia">10</parameter> + <parameter type="integer" name="PrintMethod">0x50</parameter> + + <resolution name="360x180sw"> + <parameter type="integer" name="PrintMethod">0x20</parameter> + </resolution> + <resolution name="360sw"> + <parameter type="integer" name="PrintMethod">0x20</parameter> + </resolution> + <resolution name="720x360sw"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + <resolution name="720sw"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + <resolution name="1440x720sw"> + <parameter type="integer" name="PrintMethod">0x71</parameter> + </resolution> + <resolution name="1440x1440ov"> + <parameter type="integer" name="PrintMethod">0x71</parameter> + </resolution> + <resolution name="2880x1440sw"> + <parameter type="integer" name="PrintMethod">0x71</parameter> + </resolution> + <resolution name="5760x1440sw"> + <parameter type="integer" name="PrintMethod">0x71</parameter> + </resolution> + <resolution name="2880x2880sw"> + <parameter type="integer" name="PrintMethod">0x71</parameter> + </resolution> + <resolution name="5760x2880sw"> + <parameter type="integer" name="PrintMethod">0x71</parameter> + </resolution> + + <ink translate="text" name="ultra3photo" text="Photo Black"> + <parameter type="float" name="Density">0.830000</parameter> + <parameter type="float" name="SubchannelCutoff">0.750000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.000000</parameter> + <parameter type="float" name="GCRUpper">0.000000</parameter> + <parameter type="float" name="CyanBalance">0.900000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="ultra3matte" text="Matte Black"> + <parameter type="float" name="Density">0.830000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.000000</parameter> + <parameter type="float" name="GCRUpper">0.000000</parameter> + <parameter type="float" name="CyanBalance">0.900000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> +</paper> + +<paper translate="text" name="Matte" text="Matte Paper" class="good" PreferredInkset="UltraMatte"> + <parameter type="integer" name="PaperMedia">3</parameter> + <parameter type="integer" name="PrintMethod">0x73</parameter> + + <resolution name="360x180sw"> + <parameter type="integer" name="PrintMethod">0x73</parameter> + </resolution> + <resolution name="360sw"> + <parameter type="integer" name="PrintMethod">0x73</parameter> + </resolution> + <resolution name="720x360sw"> + <parameter type="integer" name="PrintMethod">0x73</parameter> + </resolution> + <resolution name="720sw"> + <parameter type="integer" name="PrintMethod">0x73</parameter> + </resolution> + <resolution name="1440x720sw"> + <parameter type="integer" name="PrintMethod">0x73</parameter> + </resolution> + <resolution name="1440x1440ov"> + <parameter type="integer" name="PrintMethod">0x73</parameter> + </resolution> + <resolution name="2880x1440sw"> + <parameter type="integer" name="PrintMethod">0x73</parameter> + </resolution> + <resolution name="5760x1440sw"> + <parameter type="integer" name="PrintMethod">0x73</parameter> + </resolution> + <resolution name="2880x2880sw"> + <parameter type="integer" name="PrintMethod">0x73</parameter> + </resolution> + <resolution name="5760x2880sw"> + <parameter type="integer" name="PrintMethod">0x73</parameter> + </resolution> + + <ink translate="text" name="ultra3photo" text="Photo Black"> + <parameter type="float" name="Density">0.920000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.000000</parameter> + <parameter type="float" name="GCRUpper">0.000000</parameter> + <parameter type="float" name="CyanBalance">0.900000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="ultra3matte" text="Matte Black"> + <parameter type="float" name="Density">0.920000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.000000</parameter> + <parameter type="float" name="GCRUpper">0.000000</parameter> + <parameter type="float" name="CyanBalance">0.900000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> +</paper> + +<paper translate="text" name="MatteHeavy" text="Matte Paper Heavyweight" class="good" PreferredInkset="UltraMatte"> + <parameter type="integer" name="PaperMedia">5</parameter> + <parameter type="integer" name="PrintMethod">0x50</parameter> + + <resolution name="360x180sw"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + <resolution name="360sw"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + <resolution name="720x360sw"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + <resolution name="720sw"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + <resolution name="1440x720sw"> + <parameter type="integer" name="PrintMethod">0x75</parameter> + </resolution> + <resolution name="1440x1440ov"> + <parameter type="integer" name="PrintMethod">0x80</parameter> + </resolution> + <resolution name="2880x1440sw"> + <parameter type="integer" name="PrintMethod">0xa0</parameter> + </resolution> + <resolution name="5760x1440sw"> + <parameter type="integer" name="PrintMethod">0xa0</parameter> + </resolution> + <resolution name="2880x2880sw"> + <parameter type="integer" name="PrintMethod">0xa0</parameter> + </resolution> + <resolution name="5760x2880sw"> + <parameter type="integer" name="PrintMethod">0xa0</parameter> + </resolution> + + <ink translate="text" name="ultra3photo" text="Photo Black"> + <parameter type="float" name="Density">0.920000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.000000</parameter> + <parameter type="float" name="GCRUpper">0.000000</parameter> + <parameter type="float" name="CyanBalance">0.900000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="ultra3matte" text="Matte Black"> + <parameter type="float" name="Density">0.920000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.000000</parameter> + <parameter type="float" name="GCRUpper">0.000000</parameter> + <parameter type="float" name="CyanBalance">0.900000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> +</paper> + +<paper translate="text" name="Inkjet" text="Inkjet Paper" class="good" PreferredInkset="UltraMatte"> + <parameter type="integer" name="PaperMedia">1</parameter> + <parameter type="integer" name="PrintMethod">0x21</parameter> + + <resolution name="360x180sw"> + <parameter type="integer" name="PrintMethod">0x21</parameter> + </resolution> + <resolution name="360sw"> + <parameter type="integer" name="PrintMethod">0x21</parameter> + </resolution> + <resolution name="720x360sw"> + <parameter type="integer" name="PrintMethod">0x21</parameter> + </resolution> + <resolution name="720sw"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + <resolution name="1440x720sw"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + <resolution name="1440x1440ov"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + <resolution name="2880x1440sw"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + <resolution name="5760x1440sw"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + <resolution name="2880x2880sw"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + <resolution name="5760x2880sw"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + + <ink translate="text" name="ultra3photo" text="Photo Black"> + <parameter type="float" name="Density">0.720000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.000000</parameter> + <parameter type="float" name="GCRUpper">0.000000</parameter> + <parameter type="float" name="CyanBalance">0.900000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="ultra3matte" text="Matte Black"> + <parameter type="float" name="Density">0.720000</parameter> + <parameter type="float" name="SubchannelCutoff">0.300000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.000000</parameter> + <parameter type="float" name="GCRUpper">0.000000</parameter> + <parameter type="float" name="CyanBalance">0.900000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> +</paper> + +<paper translate="text" name="Coated" text="Photo Quality Inkjet Paper" class="good" PreferredInkset="UltraPhoto"> + <parameter type="integer" name="PaperMedia">3</parameter> + <parameter type="integer" name="PrintMethod">0x21</parameter> + + <resolution name="360x180sw"> + <parameter type="integer" name="PrintMethod">0x21</parameter> + </resolution> + <resolution name="360sw"> + <parameter type="integer" name="PrintMethod">0x21</parameter> + </resolution> + <resolution name="720x360sw"> + <parameter type="integer" name="PrintMethod">0x21</parameter> + </resolution> + <resolution name="720sw"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + <resolution name="1440x720sw"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + <resolution name="1440x1440ov"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + <resolution name="2880x1440sw"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + <resolution name="5760x1440sw"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + <resolution name="2880x2880sw"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + <resolution name="5760x2880sw"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + + <ink translate="text" name="ultra3photo" text="Photo Black"> + <parameter type="float" name="Density">0.830000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.000000</parameter> + <parameter type="float" name="GCRUpper">0.000000</parameter> + <parameter type="float" name="CyanBalance">0.900000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="ultra3matte" text="Matte Black"> + <parameter type="float" name="Density">0.830000</parameter> + <parameter type="float" name="SubchannelCutoff">0.400000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.000000</parameter> + <parameter type="float" name="GCRUpper">0.000000</parameter> + <parameter type="float" name="CyanBalance">0.900000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> +</paper> + +<paper translate="text" name="Photo" text="Photo Paper" class="photo" PreferredInkset="UltraPhoto"> + <parameter type="integer" name="PaperMedia">6</parameter> + <parameter type="integer" name="PrintMethod">0x50</parameter> + + <resolution name="360x180sw"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + <resolution name="360sw"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + <resolution name="720x360sw"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + <resolution name="720sw"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + <resolution name="1440x720sw"> + <parameter type="integer" name="PrintMethod">0x75</parameter> + </resolution> + <resolution name="1440x1440ov"> + <parameter type="integer" name="PrintMethod">0x80</parameter> + </resolution> + <resolution name="2880x1440sw"> + <parameter type="integer" name="PrintMethod">0xa0</parameter> + </resolution> + <resolution name="5760x1440sw"> + <parameter type="integer" name="PrintMethod">0xa0</parameter> + </resolution> + <resolution name="2880x2880sw"> + <parameter type="integer" name="PrintMethod">0xa0</parameter> + </resolution> + <resolution name="5760x2880sw"> + <parameter type="integer" name="PrintMethod">0xa0</parameter> + </resolution> + + <ink translate="text" name="ultra3photo" text="Photo Black"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.000000</parameter> + <parameter type="float" name="GCRUpper">0.000000</parameter> + <parameter type="float" name="CyanBalance">0.900000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="ultra3matte" text="Matte Black"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.000000</parameter> + <parameter type="float" name="GCRUpper">0.000000</parameter> + <parameter type="float" name="CyanBalance">0.900000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> +</paper> + +<paper translate="text" name="GlossyPhoto" text="Premium Glossy Photo Paper" class="premium" PreferredInkset="UltraPhoto"> + <parameter type="integer" name="PaperMedia">11</parameter> + <parameter type="integer" name="PrintMethod">0x50</parameter> + + <resolution name="360x180sw"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + <resolution name="360sw"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + <resolution name="720x360sw"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + <resolution name="720sw"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + <resolution name="1440x720sw"> + <parameter type="integer" name="PrintMethod">0x75</parameter> + </resolution> + <resolution name="1440x1440ov"> + <parameter type="integer" name="PrintMethod">0x80</parameter> + </resolution> + <resolution name="2880x1440sw"> + <parameter type="integer" name="PrintMethod">0xa0</parameter> + </resolution> + <resolution name="5760x1440sw"> + <parameter type="integer" name="PrintMethod">0xa0</parameter> + </resolution> + <resolution name="2880x2880sw"> + <parameter type="integer" name="PrintMethod">0xa0</parameter> + </resolution> + <resolution name="5760x2880sw"> + <parameter type="integer" name="PrintMethod">0xa0</parameter> + </resolution> + + <ink translate="text" name="ultra3photo" text="Photo Black"> + <parameter type="float" name="Density">0.720000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.000000</parameter> + <parameter type="float" name="GCRUpper">0.000000</parameter> + <parameter type="float" name="CyanBalance">0.900000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">0.920000</parameter> + <parameter type="curve" name="HueMap" ref="premium_hue_map"/> + <parameter type="curve" name="LumMap" ref="premium_lum_map"/> + <parameter type="curve" name="SatMap" ref="premium_sat_map"/> + </ink> + + <ink translate="text" name="ultra3matte" text="Matte Black"> + <parameter type="float" name="Density">0.720000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.000000</parameter> + <parameter type="float" name="GCRUpper">0.000000</parameter> + <parameter type="float" name="CyanBalance">0.900000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">0.920000</parameter> + <parameter type="curve" name="HueMap" ref="premium_hue_map"/> + <parameter type="curve" name="LumMap" ref="premium_lum_map"/> + <parameter type="curve" name="SatMap" ref="premium_sat_map"/> + </ink> +</paper> + +<paper translate="text" name="Semigloss" text="Premium Semigloss Photo Paper" class="premium" PreferredInkset="UltraPhoto"> + <parameter type="integer" name="PaperMedia">12</parameter> + <parameter type="integer" name="PrintMethod">0x50</parameter> + + <resolution name="360x180sw"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + <resolution name="360sw"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + <resolution name="720x360sw"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + <resolution name="720sw"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + <resolution name="1440x720sw"> + <parameter type="integer" name="PrintMethod">0x75</parameter> + </resolution> + <resolution name="1440x1440ov"> + <parameter type="integer" name="PrintMethod">0x80</parameter> + </resolution> + <resolution name="2880x1440sw"> + <parameter type="integer" name="PrintMethod">0xa0</parameter> + </resolution> + <resolution name="5760x1440sw"> + <parameter type="integer" name="PrintMethod">0xa0</parameter> + </resolution> + <resolution name="2880x2880sw"> + <parameter type="integer" name="PrintMethod">0xa0</parameter> + </resolution> + <resolution name="5760x2880sw"> + <parameter type="integer" name="PrintMethod">0xa0</parameter> + </resolution> + + <ink translate="text" name="ultra3photo" text="Photo Black"> + <parameter type="float" name="Density">0.720000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.000000</parameter> + <parameter type="float" name="GCRUpper">0.000000</parameter> + <parameter type="float" name="CyanBalance">0.900000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">0.920000</parameter> + <parameter type="curve" name="HueMap" ref="premium_hue_map"/> + <parameter type="curve" name="LumMap" ref="premium_lum_map"/> + <parameter type="curve" name="SatMap" ref="premium_sat_map"/> + </ink> + + <ink translate="text" name="ultra3matte" text="Matte Black"> + <parameter type="float" name="Density">0.720000</parameter> + <parameter type="float" name="SubchannelCutoff">0.800000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.000000</parameter> + <parameter type="float" name="GCRUpper">0.000000</parameter> + <parameter type="float" name="CyanBalance">0.900000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">0.920000</parameter> + <parameter type="curve" name="HueMap" ref="premium_hue_map"/> + <parameter type="curve" name="LumMap" ref="premium_lum_map"/> + <parameter type="curve" name="SatMap" ref="premium_sat_map"/> + </ink> +</paper> + +<paper translate="text" name="Luster" text="Premium Luster Photo Paper" class="premium" PreferredInkset="UltraPhoto"> + <parameter type="integer" name="PaperMedia">13</parameter> + <parameter type="integer" name="PrintMethod">0x50</parameter> + + <resolution name="360x180sw"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + <resolution name="360sw"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + <resolution name="720x360sw"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + <resolution name="720sw"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + <resolution name="1440x720sw"> + <parameter type="integer" name="PrintMethod">0x75</parameter> + </resolution> + <resolution name="1440x1440ov"> + <parameter type="integer" name="PrintMethod">0x80</parameter> + </resolution> + <resolution name="2880x1440sw"> + <parameter type="integer" name="PrintMethod">0xa0</parameter> + </resolution> + <resolution name="5760x1440sw"> + <parameter type="integer" name="PrintMethod">0xa0</parameter> + </resolution> + <resolution name="2880x2880sw"> + <parameter type="integer" name="PrintMethod">0xa0</parameter> + </resolution> + <resolution name="5760x2880sw"> + <parameter type="integer" name="PrintMethod">0xa0</parameter> + </resolution> + + <ink translate="text" name="ultra3photo" text="Photo Black"> + <parameter type="float" name="Density">0.720000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.000000</parameter> + <parameter type="float" name="GCRUpper">0.000000</parameter> + <parameter type="float" name="CyanBalance">0.900000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">0.920000</parameter> + <parameter type="curve" name="HueMap" ref="premium_hue_map"/> + <parameter type="curve" name="LumMap" ref="premium_lum_map"/> + <parameter type="curve" name="SatMap" ref="premium_sat_map"/> + </ink> + + <ink translate="text" name="ultra3matte" text="Matte Black"> + <parameter type="float" name="Density">0.720000</parameter> + <parameter type="float" name="SubchannelCutoff">0.800000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.000000</parameter> + <parameter type="float" name="GCRUpper">0.000000</parameter> + <parameter type="float" name="CyanBalance">0.900000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">0.920000</parameter> + <parameter type="curve" name="HueMap" ref="premium_hue_map"/> + <parameter type="curve" name="LumMap" ref="premium_lum_map"/> + <parameter type="curve" name="SatMap" ref="premium_sat_map"/> + </ink> +</paper> + +<paper translate="text" name="ArchivalMatte" text="Archival Matte Paper" class="premium" PreferredInkset="UltraMatte"> + <parameter type="integer" name="PaperMedia">15</parameter> + <parameter type="integer" name="PrintMethod">0x73</parameter> + + <resolution name="360x180sw"> + <parameter type="integer" name="PrintMethod">0x73</parameter> + </resolution> + <resolution name="360sw"> + <parameter type="integer" name="PrintMethod">0x73</parameter> + </resolution> + <resolution name="720x360sw"> + <parameter type="integer" name="PrintMethod">0x73</parameter> + </resolution> + <resolution name="720sw"> + <parameter type="integer" name="PrintMethod">0x73</parameter> + </resolution> + <resolution name="1440x720sw"> + <parameter type="integer" name="PrintMethod">0x73</parameter> + </resolution> + <resolution name="1440x1440ov"> + <parameter type="integer" name="PrintMethod">0x73</parameter> + </resolution> + <resolution name="2880x1440sw"> + <parameter type="integer" name="PrintMethod">0x73</parameter> + </resolution> + <resolution name="5760x1440sw"> + <parameter type="integer" name="PrintMethod">0x73</parameter> + </resolution> + <resolution name="2880x2880sw"> + <parameter type="integer" name="PrintMethod">0x73</parameter> + </resolution> + <resolution name="5760x2880sw"> + <parameter type="integer" name="PrintMethod">0x73</parameter> + </resolution> + + <ink translate="text" name="ultra3photo" text="Photo Black"> + <parameter type="float" name="Density">0.920000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.000000</parameter> + <parameter type="float" name="GCRUpper">0.000000</parameter> + <parameter type="float" name="CyanBalance">0.900000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="ultra3matte" text="Matte Black"> + <parameter type="float" name="Density">0.920000</parameter> + <parameter type="float" name="SubchannelCutoff">0.400000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.000000</parameter> + <parameter type="float" name="GCRUpper">0.000000</parameter> + <parameter type="float" name="CyanBalance">0.900000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">0.600000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + </paper> + +<paper translate="text" name="WaterColorRadiant" text="Watercolor Paper - Radiant White" class="premium" PreferredInkset="UltraMatte"> + <parameter type="integer" name="PaperMedia">15</parameter> + <parameter type="integer" name="PrintMethod">0x50</parameter> + + <resolution name="360x180sw"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + <resolution name="360sw"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + <resolution name="720x360sw"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + <resolution name="720sw"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + <resolution name="1440x720sw"> + <parameter type="integer" name="PrintMethod">0x75</parameter> + </resolution> + <resolution name="1440x1440ov"> + <parameter type="integer" name="PrintMethod">0x80</parameter> + </resolution> + <resolution name="2880x1440sw"> + <parameter type="integer" name="PrintMethod">0xa0</parameter> + </resolution> + <resolution name="5760x1440sw"> + <parameter type="integer" name="PrintMethod">0xa0</parameter> + </resolution> + <resolution name="2880x2880sw"> + <parameter type="integer" name="PrintMethod">0xa0</parameter> + </resolution> + <resolution name="5760x2880sw"> + <parameter type="integer" name="PrintMethod">0xa0</parameter> + </resolution> + + <ink translate="text" name="ultra3photo" text="Photo Black"> + <parameter type="float" name="Density">0.920000</parameter> + <parameter type="float" name="SubchannelCutoff">0.800000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.000000</parameter> + <parameter type="float" name="GCRUpper">0.000000</parameter> + <parameter type="float" name="CyanBalance">0.900000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="ultra3matte" text="Matte Black"> + <parameter type="float" name="Density">0.920000</parameter> + <parameter type="float" name="SubchannelCutoff">0.400000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.000000</parameter> + <parameter type="float" name="GCRUpper">0.000000</parameter> + <parameter type="float" name="CyanBalance">0.900000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> +</paper> + +<paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper" class="photo" PreferredInkset="UltraPhoto"> + <parameter type="integer" name="PaperMedia">19</parameter> + <parameter type="integer" name="PrintMethod">0x50</parameter> + + <resolution name="360x180sw"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + <resolution name="360sw"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + <resolution name="720x360sw"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + <resolution name="720sw"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + <resolution name="1440x720sw"> + <parameter type="integer" name="PrintMethod">0x75</parameter> + </resolution> + <resolution name="1440x1440ov"> + <parameter type="integer" name="PrintMethod">0x80</parameter> + </resolution> + <resolution name="2880x1440sw"> + <parameter type="integer" name="PrintMethod">0xa0</parameter> + </resolution> + <resolution name="5760x1440sw"> + <parameter type="integer" name="PrintMethod">0xa0</parameter> + </resolution> + <resolution name="2880x2880sw"> + <parameter type="integer" name="PrintMethod">0xa0</parameter> + </resolution> + <resolution name="5760x2880sw"> + <parameter type="integer" name="PrintMethod">0xa0</parameter> + </resolution> + + <ink translate="text" name="ultra3photo" text="Photo Black"> + <parameter type="float" name="Density">0.830000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.000000</parameter> + <parameter type="float" name="GCRUpper">0.000000</parameter> + <parameter type="float" name="CyanBalance">0.900000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="ultra3matte" text="Matte Black"> + <parameter type="float" name="Density">0.830000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.000000</parameter> + <parameter type="float" name="GCRUpper">0.000000</parameter> + <parameter type="float" name="CyanBalance">0.900000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> +</paper> + +<paper translate="text" name="Ilford" text="Ilford Heavy Paper" class="premium" PreferredInkset="UltraMatte"> + <parameter type="integer" name="PaperMedia">15</parameter> + <parameter type="integer" name="PrintMethod">0x50</parameter> + + <resolution name="360x180sw"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + <resolution name="360sw"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + <resolution name="720x360sw"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + <resolution name="720sw"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + <resolution name="1440x720sw"> + <parameter type="integer" name="PrintMethod">0x75</parameter> + </resolution> + <resolution name="1440x1440ov"> + <parameter type="integer" name="PrintMethod">0x80</parameter> + </resolution> + <resolution name="2880x1440sw"> + <parameter type="integer" name="PrintMethod">0xa0</parameter> + </resolution> + <resolution name="5760x1440sw"> + <parameter type="integer" name="PrintMethod">0xa0</parameter> + </resolution> + <resolution name="2880x2880sw"> + <parameter type="integer" name="PrintMethod">0xa0</parameter> + </resolution> + <resolution name="5760x2880sw"> + <parameter type="integer" name="PrintMethod">0xa0</parameter> + </resolution> + + <ink translate="text" name="ultra3photo" text="Photo Black"> + <parameter type="float" name="Density">0.830000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.000000</parameter> + <parameter type="float" name="GCRUpper">0.000000</parameter> + <parameter type="float" name="CyanBalance">0.900000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="ultra3matte" text="Matte Black"> + <parameter type="float" name="Density">0.830000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.000000</parameter> + <parameter type="float" name="GCRUpper">0.000000</parameter> + <parameter type="float" name="CyanBalance">0.900000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> +</paper> + +<paper translate="text" name="ColorLife" text="ColorLife Paper" class="premium" PreferredInkset="UltraPhoto"> + <parameter type="integer" name="PaperMedia">23</parameter> + <parameter type="integer" name="PrintMethod">0x50</parameter> + + <resolution name="360x180sw"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + <resolution name="360sw"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + <resolution name="720x360sw"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + <resolution name="720sw"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + <resolution name="1440x720sw"> + <parameter type="integer" name="PrintMethod">0x50</parameter> + </resolution> + <resolution name="1440x1440ov"> + <parameter type="integer" name="PrintMethod">0x80</parameter> + </resolution> + <resolution name="2880x1440sw"> + <parameter type="integer" name="PrintMethod">0xa0</parameter> + </resolution> + <resolution name="5760x1440sw"> + <parameter type="integer" name="PrintMethod">0xa0</parameter> + </resolution> + <resolution name="2880x2880sw"> + <parameter type="integer" name="PrintMethod">0xa0</parameter> + </resolution> + <resolution name="5760x2880sw"> + <parameter type="integer" name="PrintMethod">0xa0</parameter> + </resolution> + + <ink translate="text" name="ultra3photo" text="Photo Black"> + <parameter type="float" name="Density">0.830000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.000000</parameter> + <parameter type="float" name="GCRUpper">0.000000</parameter> + <parameter type="float" name="CyanBalance">0.900000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="ultra3matte" text="Matte Black"> + <parameter type="float" name="Density">0.830000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.000000</parameter> + <parameter type="float" name="GCRUpper">0.000000</parameter> + <parameter type="float" name="CyanBalance">0.900000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> +</paper> + +<paper translate="text" name="Other" text="Other" class="plain" PreferredInkset="UltraMatte"> + <ink translate="text" name="ultra3photo" text="Photo Black"> + <parameter type="float" name="Density">0.720000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.000000</parameter> + <parameter type="float" name="GCRUpper">0.000000</parameter> + <parameter type="float" name="CyanBalance">0.900000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="ultra3matte" text="Matte Black"> + <parameter type="float" name="Density">0.720000</parameter> + <parameter type="float" name="SubchannelCutoff">0.100000</parameter> + <parameter type="float" name="BlackTrans">0.400000</parameter> + <parameter type="float" name="GCRLower">0.000000</parameter> + <parameter type="float" name="GCRUpper">0.000000</parameter> + <parameter type="float" name="CyanBalance">0.900000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> +</paper> +</escp2:papers> +</gutenprint> diff --git a/src/xml/escp2/media/photo_gen0.xml b/src/xml/escp2/media/photo_gen0.xml index 71c858f..9db93ed 100644 --- a/src/xml/escp2/media/photo_gen0.xml +++ b/src/xml/escp2/media/photo_gen0.xml @@ -95,6 +95,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="PlainFast" text="Plain Paper Fast Load" class="plain"> @@ -132,6 +166,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Postcard" text="Postcard" class="plain"> @@ -169,6 +237,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.830000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">0.830000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="GlossyFilm" text="Glossy Film" class="photo"> @@ -206,6 +308,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Transparency" text="Transparencies" class="transparency"> @@ -243,6 +379,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">0.750000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">0.750000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Envelope" text="Envelopes" class="plain"> @@ -280,6 +450,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="BackFilm" text="Back Light Film" class="transparency"> @@ -317,6 +521,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">0.750000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">0.750000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Matte" text="Matte Paper" class="good"> @@ -354,6 +592,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.850000</parameter> + <parameter type="float" name="SubchannelCutoff">0.800000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">0.850000</parameter> + <parameter type="float" name="SubchannelCutoff">0.800000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="MatteHeavy" text="Matte Paper Heavyweight" class="good"> @@ -391,6 +663,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Inkjet" text="Inkjet Paper" class="good"> @@ -428,6 +734,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.850000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.100000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">0.850000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.100000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Coated" text="Photo Quality Inkjet Paper" class="good"> @@ -465,6 +805,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.100000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">1.100000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Photo" text="Photo Paper" class="photo"> @@ -502,6 +876,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="GlossyPhoto" text="Premium Glossy Photo Paper" @@ -540,6 +948,40 @@ class="premium"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.100000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">1.100000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Semigloss" text="Premium Semigloss Photo Paper" @@ -578,6 +1020,40 @@ class="premium"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Luster" text="Premium Luster Photo Paper" class="premium"> @@ -615,6 +1091,40 @@ class="premium"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper" @@ -653,6 +1163,40 @@ class="premium"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Ilford" text="Ilford Heavy Paper" class="premium"> @@ -690,6 +1234,40 @@ class="premium"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">1.350000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">1.350000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="ColorLife" text="ColorLife Paper" class="premium"> @@ -727,6 +1305,40 @@ class="premium"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Other" text="Other" class="plain"> @@ -764,6 +1376,40 @@ class="premium"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> </escp2:papers> </gutenprint> diff --git a/src/xml/escp2/media/photo_gen1.xml b/src/xml/escp2/media/photo_gen1.xml index aa2c0fd..a2bf3c8 100644 --- a/src/xml/escp2/media/photo_gen1.xml +++ b/src/xml/escp2/media/photo_gen1.xml @@ -96,6 +96,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="PlainFast" text="Plain Paper Fast Load" class="plain"> @@ -134,6 +168,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Postcard" text="Postcard" class="plain"> @@ -172,6 +240,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.830000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">0.830000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="GlossyFilm" text="Glossy Film" class="photo"> @@ -210,6 +312,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Transparency" text="Transparencies" class="transparency"> @@ -248,6 +384,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">0.750000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">0.750000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Envelope" text="Envelopes" class="plain"> @@ -286,6 +456,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="BackFilm" text="Back Light Film" class="transparency"> @@ -324,6 +528,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">0.750000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">0.750000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Matte" text="Matte Paper" class="good"> @@ -362,6 +600,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.850000</parameter> + <parameter type="float" name="SubchannelCutoff">0.800000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">0.850000</parameter> + <parameter type="float" name="SubchannelCutoff">0.800000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="MatteHeavy" text="Matte Paper Heavyweight" class="good"> @@ -400,6 +672,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Inkjet" text="Inkjet Paper" class="good"> @@ -438,6 +744,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.850000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.100000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">0.850000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.100000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Coated" text="Photo Quality Inkjet Paper" class="good"> @@ -476,6 +816,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.100000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">1.100000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Photo" text="Photo Paper" class="photo"> @@ -514,6 +888,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="GlossyPhoto" text="Premium Glossy Photo Paper" @@ -553,6 +961,40 @@ class="premium"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.100000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">1.100000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Semigloss" text="Premium Semigloss Photo Paper" @@ -592,6 +1034,40 @@ class="premium"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Luster" text="Premium Luster Photo Paper" class="premium"> @@ -630,6 +1106,40 @@ class="premium"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper" @@ -669,6 +1179,40 @@ class="premium"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Ilford" text="Ilford Heavy Paper" class="premium"> @@ -707,6 +1251,40 @@ class="premium"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">1.350000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">1.350000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="ColorLife" text="ColorLife Paper" class="premium"> @@ -745,6 +1323,40 @@ class="premium"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Other" text="Other" class="plain"> @@ -783,6 +1395,40 @@ class="premium"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> </escp2:papers> </gutenprint> diff --git a/src/xml/escp2/media/photo_gen2.xml b/src/xml/escp2/media/photo_gen2.xml index 9f042cb..da3e7c7 100644 --- a/src/xml/escp2/media/photo_gen2.xml +++ b/src/xml/escp2/media/photo_gen2.xml @@ -96,6 +96,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="PlainFast" text="Plain Paper Fast Load" class="plain"> @@ -134,6 +168,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Postcard" text="Postcard" class="plain"> @@ -172,6 +240,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.830000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">0.830000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="GlossyFilm" text="Glossy Film" class="photo"> @@ -210,6 +312,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Transparency" text="Transparencies" class="transparency"> @@ -248,6 +384,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">0.750000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">0.750000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Envelope" text="Envelopes" class="plain"> @@ -286,6 +456,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="BackFilm" text="Back Light Film" class="transparency"> @@ -324,6 +528,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">0.750000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">0.750000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Matte" text="Matte Paper" class="good"> @@ -362,6 +600,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.850000</parameter> + <parameter type="float" name="SubchannelCutoff">0.800000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">0.850000</parameter> + <parameter type="float" name="SubchannelCutoff">0.800000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="MatteHeavy" text="Matte Paper Heavyweight" class="good"> @@ -400,6 +672,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Inkjet" text="Inkjet Paper" class="good"> @@ -438,6 +744,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.850000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.100000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">0.850000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.100000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Coated" text="Photo Quality Inkjet Paper" class="good"> @@ -476,6 +816,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.100000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">1.100000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Photo" text="Photo Paper" class="photo"> @@ -514,6 +888,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="GlossyPhoto" text="Premium Glossy Photo Paper" @@ -553,6 +961,40 @@ class="premium"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.100000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">1.100000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Semigloss" text="Premium Semigloss Photo Paper" @@ -592,6 +1034,40 @@ class="premium"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Luster" text="Premium Luster Photo Paper" class="premium"> @@ -630,6 +1106,40 @@ class="premium"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper" @@ -669,6 +1179,40 @@ class="premium"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Ilford" text="Ilford Heavy Paper" class="premium"> @@ -707,6 +1251,40 @@ class="premium"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">1.350000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">1.350000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="ColorLife" text="ColorLife Paper" class="premium"> @@ -745,6 +1323,40 @@ class="premium"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Other" text="Other" class="plain"> @@ -783,6 +1395,40 @@ class="premium"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> </escp2:papers> </gutenprint> diff --git a/src/xml/escp2/media/photo_gen3.xml b/src/xml/escp2/media/photo_gen3.xml index 1b5fbdc..5841d9c 100644 --- a/src/xml/escp2/media/photo_gen3.xml +++ b/src/xml/escp2/media/photo_gen3.xml @@ -96,6 +96,57 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="PlainFast" text="Plain Paper Fast Load" class="plain"> @@ -134,6 +185,57 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Postcard" text="Postcard" class="plain"> @@ -172,6 +274,57 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.830000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">0.830000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">0.830000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="GlossyFilm" text="Glossy Film" class="photo"> @@ -210,6 +363,57 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Transparency" text="Transparencies" class="transparency"> @@ -248,6 +452,57 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">0.750000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">0.750000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">0.750000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Envelope" text="Envelopes" class="plain"> @@ -286,6 +541,57 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="BackFilm" text="Back Light Film" class="transparency"> @@ -324,6 +630,57 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">0.750000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">0.750000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">0.750000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Matte" text="Matte Paper" class="good"> @@ -362,6 +719,57 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.850000</parameter> + <parameter type="float" name="SubchannelCutoff">0.800000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">0.850000</parameter> + <parameter type="float" name="SubchannelCutoff">0.800000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">0.850000</parameter> + <parameter type="float" name="SubchannelCutoff">0.800000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="MatteHeavy" text="Matte Paper Heavyweight" class="good"> @@ -400,6 +808,57 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Inkjet" text="Inkjet Paper" class="good"> @@ -438,6 +897,57 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.850000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.100000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">0.850000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.100000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">0.850000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.100000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Coated" text="Photo Quality Inkjet Paper" class="good"> @@ -476,6 +986,57 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.100000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">1.100000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">1.100000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Photo" text="Photo Paper" class="photo"> @@ -514,6 +1075,57 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="GlossyPhoto" text="Premium Glossy Photo Paper" @@ -553,6 +1165,57 @@ class="premium"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.100000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">1.100000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">1.100000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Semigloss" text="Premium Semigloss Photo Paper" @@ -592,6 +1255,57 @@ class="premium"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Luster" text="Premium Luster Photo Paper" class="premium"> @@ -630,6 +1344,57 @@ class="premium"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper" @@ -669,6 +1434,57 @@ class="premium"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Ilford" text="Ilford Heavy Paper" class="premium"> @@ -707,6 +1523,57 @@ class="premium"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">1.350000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">1.350000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">1.350000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="ColorLife" text="ColorLife Paper" class="premium"> @@ -745,6 +1612,57 @@ class="premium"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Other" text="Other" class="plain"> @@ -783,6 +1701,57 @@ class="premium"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> </escp2:papers> </gutenprint> diff --git a/src/xml/escp2/media/photo_gen3_4.xml b/src/xml/escp2/media/photo_gen3_4.xml index 3aee075..71b2c83 100644 --- a/src/xml/escp2/media/photo_gen3_4.xml +++ b/src/xml/escp2/media/photo_gen3_4.xml @@ -96,6 +96,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="Hextone" text="Hextone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="PlainFast" text="Plain Paper Fast Load" class="plain"> @@ -134,6 +168,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="Hextone" text="Hextone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Postcard" text="Postcard" class="plain"> @@ -172,6 +240,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.830000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="Hextone" text="Hextone"> + <parameter type="float" name="Density">0.830000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="GlossyFilm" text="Glossy Film" class="photo"> @@ -210,6 +312,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="Hextone" text="Hextone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Transparency" text="Transparencies" class="transparency"> @@ -248,6 +384,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">0.750000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="Hextone" text="Hextone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">0.750000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Envelope" text="Envelopes" class="plain"> @@ -286,6 +456,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="Hextone" text="Hextone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="BackFilm" text="Back Light Film" class="transparency"> @@ -324,6 +528,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">0.750000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="Hextone" text="Hextone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">0.750000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Matte" text="Matte Paper" class="good"> @@ -362,6 +600,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.850000</parameter> + <parameter type="float" name="SubchannelCutoff">0.800000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="Hextone" text="Hextone"> + <parameter type="float" name="Density">0.850000</parameter> + <parameter type="float" name="SubchannelCutoff">0.800000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="MatteHeavy" text="Matte Paper Heavyweight" class="good"> @@ -400,6 +672,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="Hextone" text="Hextone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Inkjet" text="Inkjet Paper" class="good"> @@ -438,6 +744,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.850000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.100000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="Hextone" text="Hextone"> + <parameter type="float" name="Density">0.850000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.100000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Coated" text="Photo Quality Inkjet Paper" class="good"> @@ -476,6 +816,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.100000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="Hextone" text="Hextone"> + <parameter type="float" name="Density">1.100000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Photo" text="Photo Paper" class="photo"> @@ -514,6 +888,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="Hextone" text="Hextone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="GlossyPhoto" text="Premium Glossy Photo Paper" @@ -553,6 +961,40 @@ class="premium"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.100000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="Hextone" text="Hextone"> + <parameter type="float" name="Density">1.100000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Semigloss" text="Premium Semigloss Photo Paper" @@ -592,6 +1034,40 @@ class="premium"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="Hextone" text="Hextone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Luster" text="Premium Luster Photo Paper" class="premium"> @@ -630,6 +1106,40 @@ class="premium"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="Hextone" text="Hextone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper" @@ -669,6 +1179,40 @@ class="premium"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="Hextone" text="Hextone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Ilford" text="Ilford Heavy Paper" class="premium"> @@ -707,6 +1251,40 @@ class="premium"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">1.350000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="Hextone" text="Hextone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">1.350000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="ColorLife" text="ColorLife Paper" class="premium"> @@ -745,6 +1323,40 @@ class="premium"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="Hextone" text="Hextone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Other" text="Other" class="plain"> @@ -783,6 +1395,40 @@ class="premium"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="Hextone" text="Hextone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> </escp2:papers> </gutenprint> diff --git a/src/xml/escp2/media/pro_gen1.xml b/src/xml/escp2/media/pro_gen1.xml index 852e535..85bff88 100644 --- a/src/xml/escp2/media/pro_gen1.xml +++ b/src/xml/escp2/media/pro_gen1.xml @@ -99,6 +99,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="PlainFast" text="Plain Paper Fast Load" class="plain"> @@ -138,6 +172,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Postcard" text="Postcard" class="plain"> @@ -177,6 +245,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.830000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">0.830000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="GlossyFilm" text="Glossy Film" class="photo"> @@ -216,6 +318,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Transparency" text="Transparencies" class="transparency"> @@ -255,6 +391,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">0.750000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">0.750000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Envelope" text="Envelopes" class="plain"> @@ -294,6 +464,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="BackFilm" text="Back Light Film" class="transparency"> @@ -333,6 +537,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">0.750000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">0.750000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Matte" text="Matte Paper" class="good"> @@ -372,6 +610,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.850000</parameter> + <parameter type="float" name="SubchannelCutoff">0.800000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">0.850000</parameter> + <parameter type="float" name="SubchannelCutoff">0.800000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="MatteHeavy" text="Matte Paper Heavyweight" class="good"> @@ -411,6 +683,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Inkjet" text="Inkjet Paper" class="good"> @@ -450,6 +756,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.850000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.100000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">0.850000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.100000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Coated" text="Photo Quality Inkjet Paper" class="good"> @@ -489,6 +829,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.100000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">1.100000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Photo" text="Photo Paper" class="photo"> @@ -528,6 +902,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="GlossyPhoto" text="Premium Glossy Photo Paper" @@ -568,6 +976,40 @@ class="premium"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.100000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">1.100000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Semigloss" text="Premium Semigloss Photo Paper" @@ -608,6 +1050,40 @@ class="premium"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Luster" text="Premium Luster Photo Paper" class="premium"> @@ -647,6 +1123,40 @@ class="premium"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper" @@ -687,6 +1197,40 @@ class="premium"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Ilford" text="Ilford Heavy Paper" class="premium"> @@ -726,6 +1270,40 @@ class="premium"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">1.350000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">1.350000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="ColorLife" text="ColorLife Paper" class="premium"> @@ -765,6 +1343,40 @@ class="premium"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Other" text="Other" class="plain"> @@ -804,6 +1416,40 @@ class="premium"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> </escp2:papers> </gutenprint> diff --git a/src/xml/escp2/media/pro_gen2.xml b/src/xml/escp2/media/pro_gen2.xml index 958e667..21424e7 100644 --- a/src/xml/escp2/media/pro_gen2.xml +++ b/src/xml/escp2/media/pro_gen2.xml @@ -100,6 +100,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="PlainFast" text="Plain Paper Fast Load" class="plain"> @@ -140,6 +174,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Postcard" text="Postcard" class="plain"> @@ -180,6 +248,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.830000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">0.830000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="GlossyFilm" text="Glossy Film" class="photo"> @@ -220,6 +322,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Transparency" text="Transparencies" class="transparency"> @@ -260,6 +396,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">0.750000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">0.750000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Envelope" text="Envelopes" class="plain"> @@ -300,6 +470,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="BackFilm" text="Back Light Film" class="transparency"> @@ -340,6 +544,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">0.750000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">0.750000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Matte" text="Matte Paper" class="good"> @@ -380,6 +618,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.850000</parameter> + <parameter type="float" name="SubchannelCutoff">0.800000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">0.850000</parameter> + <parameter type="float" name="SubchannelCutoff">0.800000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="MatteHeavy" text="Matte Paper Heavyweight" class="good"> @@ -420,6 +692,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Inkjet" text="Inkjet Paper" class="good"> @@ -460,6 +766,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.850000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.100000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">0.850000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.100000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Coated" text="Photo Quality Inkjet Paper" class="good"> @@ -500,6 +840,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.100000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">1.100000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Photo" text="Photo Paper" class="photo"> @@ -540,6 +914,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="GlossyPhoto" text="Premium Glossy Photo Paper" @@ -581,6 +989,40 @@ class="premium"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.100000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">1.100000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Semigloss" text="Premium Semigloss Photo Paper" @@ -622,6 +1064,40 @@ class="premium"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Luster" text="Premium Luster Photo Paper" class="premium"> @@ -662,6 +1138,40 @@ class="premium"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper" @@ -703,6 +1213,40 @@ class="premium"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Ilford" text="Ilford Heavy Paper" class="premium"> @@ -743,6 +1287,40 @@ class="premium"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">1.350000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">1.350000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="ColorLife" text="ColorLife Paper" class="premium"> @@ -783,6 +1361,40 @@ class="premium"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Other" text="Other" class="plain"> @@ -823,6 +1435,40 @@ class="premium"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> + + <ink translate="text" name="MISHextone" text="MIS Hextone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> </escp2:papers> </gutenprint> diff --git a/src/xml/escp2/media/standard.xml b/src/xml/escp2/media/standard.xml index c70d443..cdc0e88 100644 --- a/src/xml/escp2/media/standard.xml +++ b/src/xml/escp2/media/standard.xml @@ -96,6 +96,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="PlainFast" text="Plain Paper Fast Load" class="plain"> @@ -134,6 +151,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Postcard" text="Postcard" class="plain"> @@ -172,6 +206,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.830000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="GlossyFilm" text="Glossy Film" class="photo"> @@ -210,6 +261,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Transparency" text="Transparencies" class="transparency"> @@ -248,6 +316,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">0.750000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Envelope" text="Envelopes" class="plain"> @@ -286,6 +371,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="BackFilm" text="Back Light Film" class="transparency"> @@ -324,6 +426,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">0.750000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Matte" text="Matte Paper" class="good"> @@ -362,6 +481,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.850000</parameter> + <parameter type="float" name="SubchannelCutoff">0.800000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="MatteHeavy" text="Matte Paper Heavyweight" class="good"> @@ -400,6 +536,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Inkjet" text="Inkjet Paper" class="good"> @@ -438,6 +591,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.850000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.100000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Coated" text="Photo Quality Inkjet Paper" class="good"> @@ -476,6 +646,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.100000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Photo" text="Photo Paper" class="photo"> @@ -514,6 +701,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="GlossyPhoto" text="Premium Glossy Photo Paper" @@ -553,6 +757,23 @@ class="premium"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.100000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Semigloss" text="Premium Semigloss Photo Paper" @@ -592,6 +813,23 @@ class="premium"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Luster" text="Premium Luster Photo Paper" class="premium"> @@ -630,6 +868,23 @@ class="premium"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper" @@ -669,6 +924,23 @@ class="premium"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Ilford" text="Ilford Heavy Paper" class="premium"> @@ -707,6 +979,23 @@ class="premium"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">1.350000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="ColorLife" text="ColorLife Paper" class="premium"> @@ -745,6 +1034,23 @@ class="premium"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Other" text="Other" class="plain"> @@ -783,6 +1089,23 @@ class="premium"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> </escp2:papers> </gutenprint> diff --git a/src/xml/escp2/media/standard_gen0.xml b/src/xml/escp2/media/standard_gen0.xml index 49141f1..a4d5e98 100644 --- a/src/xml/escp2/media/standard_gen0.xml +++ b/src/xml/escp2/media/standard_gen0.xml @@ -95,6 +95,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="PlainFast" text="Plain Paper Fast Load" class="plain"> @@ -132,6 +149,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Postcard" text="Postcard" class="plain"> @@ -169,6 +203,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.830000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="GlossyFilm" text="Glossy Film" class="photo"> @@ -206,6 +257,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Transparency" text="Transparencies" class="transparency"> @@ -243,6 +311,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">0.750000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Envelope" text="Envelopes" class="plain"> @@ -280,6 +365,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="BackFilm" text="Back Light Film" class="transparency"> @@ -317,6 +419,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">0.750000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Matte" text="Matte Paper" class="good"> @@ -354,6 +473,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.850000</parameter> + <parameter type="float" name="SubchannelCutoff">0.800000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="MatteHeavy" text="Matte Paper Heavyweight" class="good"> @@ -391,6 +527,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Inkjet" text="Inkjet Paper" class="good"> @@ -428,6 +581,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.850000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.100000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Coated" text="Photo Quality Inkjet Paper" class="good"> @@ -465,6 +635,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.100000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Photo" text="Photo Paper" class="photo"> @@ -502,6 +689,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="GlossyPhoto" text="Premium Glossy Photo Paper" @@ -540,6 +744,23 @@ class="premium"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.100000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Semigloss" text="Premium Semigloss Photo Paper" @@ -578,6 +799,23 @@ class="premium"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Luster" text="Premium Luster Photo Paper" class="premium"> @@ -615,6 +853,23 @@ class="premium"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper" @@ -653,6 +908,23 @@ class="premium"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.999000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Ilford" text="Ilford Heavy Paper" class="premium"> @@ -690,6 +962,23 @@ class="premium"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">1.350000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="ColorLife" text="ColorLife Paper" class="premium"> @@ -727,6 +1016,23 @@ class="premium"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">1.000000</parameter> + <parameter type="float" name="SubchannelCutoff">1.000000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.150000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> <paper translate="text" name="Other" text="Other" class="plain"> @@ -764,6 +1070,23 @@ class="premium"> <parameter type="curve" name="LumMap" ref="lum_map"/> <parameter type="curve" name="SatMap" ref="sat_map"/> </ink> + + <ink translate="text" name="MISQuadtone" text="MISQuadtone"> + <parameter type="float" name="Density">0.615000</parameter> + <parameter type="float" name="SubchannelCutoff">0.500000</parameter> + <parameter type="float" name="BlackTrans">1.000000</parameter> + <parameter type="float" name="GCRLower">0.075000</parameter> + <parameter type="float" name="GCRUpper">0.900000</parameter> + <parameter type="float" name="CyanBalance">1.000000</parameter> + <parameter type="float" name="MagentaBalance">1.000000</parameter> + <parameter type="float" name="YellowBalance">1.000000</parameter> + <parameter type="float" name="BlackDensity">1.000000</parameter> + <parameter type="float" name="Saturation">1.000000</parameter> + <parameter type="float" name="Gamma">1.000000</parameter> + <parameter type="curve" name="HueMap" ref="hue_map"/> + <parameter type="curve" name="LumMap" ref="lum_map"/> + <parameter type="curve" name="SatMap" ref="sat_map"/> + </ink> </paper> </escp2:papers> </gutenprint> diff --git a/src/xml/escp2/mediasizes/Makefile.am b/src/xml/escp2/mediasizes/Makefile.am index 588be38..5b7afcb 100644 --- a/src/xml/escp2/mediasizes/Makefile.am +++ b/src/xml/escp2/mediasizes/Makefile.am @@ -1,4 +1,4 @@ -## $Id: Makefile.am,v 1.3 2008/10/24 00:37:14 rleigh Exp $ +## $Id: Makefile.am,v 1.4 2009/05/30 14:10:32 rlk Exp $ ## Copyright (C) 2008 Robert Krawitz ## ## This program is free software; you can redistribute it and/or modify @@ -36,6 +36,7 @@ xml-stamp: $(pkgxmldata_DATA) Makefile.am all-local: xml-stamp +dist-hook: xml-stamp CLEANFILES = xmli18n-tmp.h xml-stamp xml-stamp.tmp EXTRA_DIST = $(pkgxmldata_DATA) diff --git a/src/xml/escp2/mediasizes/Makefile.in b/src/xml/escp2/mediasizes/Makefile.in index 017b1c5..b86829e 100644 --- a/src/xml/escp2/mediasizes/Makefile.in +++ b/src/xml/escp2/mediasizes/Makefile.in @@ -44,11 +44,14 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \ - $(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \ - $(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/stp.m4 \ + $(top_srcdir)/m4/stp_cups.m4 $(top_srcdir)/m4/stp_gimp.m4 \ + $(top_srcdir)/m4/stp_option.m4 $(top_srcdir)/m4/stp_release.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs @@ -85,10 +88,6 @@ CUPS_CFLAGS = @CUPS_CFLAGS@ CUPS_CONFIG = @CUPS_CONFIG@ CUPS_LIBS = @CUPS_LIBS@ CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DB2HTML = @DB2HTML@ DB2PDF = @DB2PDF@ @@ -98,16 +97,15 @@ DEPDIR = @DEPDIR@ DIALOG = @DIALOG@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ DVIPDF = @DVIPDF@ DVIPS = @DVIPS@ -ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ FIND = @FIND@ FOOMATIC_CONFIGURE = @FOOMATIC_CONFIGURE@ FOOMATIC_KITLOAD = @FOOMATIC_KITLOAD@ @@ -152,6 +150,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTLLIBS = @INTLLIBS@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -163,6 +162,7 @@ LIBREADLINE_DEPS = @LIBREADLINE_DEPS@ LIBS = $(INTLLIBS) @LIBS@ LIBTOOL = @LIBTOOL@ LIBTOOL_DEPS = @LIBTOOL_DEPS@ +LIPO = @LIPO@ LN_S = @LN_S@ LTALLOCA = @LTALLOCA@ LTLIBICONV = @LTLIBICONV@ @@ -175,8 +175,12 @@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ +NM = @NM@ NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -210,8 +214,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -256,6 +259,7 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -268,6 +272,7 @@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS) @@ -366,6 +371,9 @@ distdir: $(DISTFILES) || exit 1; \ fi; \ done + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$(top_distdir)" distdir="$(distdir)" \ + dist-hook check-am: all-am check: check-am all-am: Makefile $(DATA) all-local @@ -455,9 +463,9 @@ uninstall-am: uninstall-pkgxmldataDATA .MAKE: install-am install-strip .PHONY: all all-am all-local check check-am clean clean-generic \ - clean-libtool distclean distclean-generic distclean-libtool \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-dvi \ + clean-libtool dist-hook distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am install-man \ install-pdf install-pdf-am install-pkgxmldataDATA install-ps \ @@ -490,6 +498,8 @@ xml-stamp: $(pkgxmldata_DATA) Makefile.am mv $@.tmp $@ all-local: xml-stamp + +dist-hook: xml-stamp # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/src/xml/escp2/model/Makefile.am b/src/xml/escp2/model/Makefile.am index 97d744a..e416c58 100644 --- a/src/xml/escp2/model/Makefile.am +++ b/src/xml/escp2/model/Makefile.am @@ -1,4 +1,4 @@ -## $Id: Makefile.am,v 1.14 2008/12/10 00:44:12 rlk Exp $ +## $Id: Makefile.am,v 1.16 2009/05/30 14:10:32 rlk Exp $ ## Copyright (C) 2008 Robert Krawitz ## ## This program is free software; you can redistribute it and/or modify @@ -123,7 +123,8 @@ pkgxmldata_DATA = \ model_94.xml \ model_95.xml \ model_96.xml \ - model_97.xml + model_97.xml \ + model_98.xml xml-stamp: $(pkgxmldata_DATA) Makefile.am -rm -f $@ $@.tmp @@ -133,6 +134,7 @@ xml-stamp: $(pkgxmldata_DATA) Makefile.am all-local: xml-stamp +dist-hook: xml-stamp CLEANFILES = xmli18n-tmp.h xml-stamp xml-stamp.tmp EXTRA_DIST = $(pkgxmldata_DATA) diff --git a/src/xml/escp2/model/Makefile.in b/src/xml/escp2/model/Makefile.in index 6070456..3053266 100644 --- a/src/xml/escp2/model/Makefile.in +++ b/src/xml/escp2/model/Makefile.in @@ -44,11 +44,14 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \ - $(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \ - $(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/stp.m4 \ + $(top_srcdir)/m4/stp_cups.m4 $(top_srcdir)/m4/stp_gimp.m4 \ + $(top_srcdir)/m4/stp_option.m4 $(top_srcdir)/m4/stp_release.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs @@ -85,10 +88,6 @@ CUPS_CFLAGS = @CUPS_CFLAGS@ CUPS_CONFIG = @CUPS_CONFIG@ CUPS_LIBS = @CUPS_LIBS@ CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DB2HTML = @DB2HTML@ DB2PDF = @DB2PDF@ @@ -98,16 +97,15 @@ DEPDIR = @DEPDIR@ DIALOG = @DIALOG@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ DVIPDF = @DVIPDF@ DVIPS = @DVIPS@ -ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ FIND = @FIND@ FOOMATIC_CONFIGURE = @FOOMATIC_CONFIGURE@ FOOMATIC_KITLOAD = @FOOMATIC_KITLOAD@ @@ -152,6 +150,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTLLIBS = @INTLLIBS@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -163,6 +162,7 @@ LIBREADLINE_DEPS = @LIBREADLINE_DEPS@ LIBS = $(INTLLIBS) @LIBS@ LIBTOOL = @LIBTOOL@ LIBTOOL_DEPS = @LIBTOOL_DEPS@ +LIPO = @LIPO@ LN_S = @LN_S@ LTALLOCA = @LTALLOCA@ LTLIBICONV = @LTLIBICONV@ @@ -175,8 +175,12 @@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ +NM = @NM@ NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -210,8 +214,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -256,6 +259,7 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -268,6 +272,7 @@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS) @@ -371,7 +376,8 @@ pkgxmldata_DATA = \ model_94.xml \ model_95.xml \ model_96.xml \ - model_97.xml + model_97.xml \ + model_98.xml CLEANFILES = xmli18n-tmp.h xml-stamp xml-stamp.tmp EXTRA_DIST = $(pkgxmldata_DATA) @@ -463,6 +469,9 @@ distdir: $(DISTFILES) || exit 1; \ fi; \ done + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$(top_distdir)" distdir="$(distdir)" \ + dist-hook check-am: all-am check: check-am all-am: Makefile $(DATA) all-local @@ -552,9 +561,9 @@ uninstall-am: uninstall-pkgxmldataDATA .MAKE: install-am install-strip .PHONY: all all-am all-local check check-am clean clean-generic \ - clean-libtool distclean distclean-generic distclean-libtool \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-dvi \ + clean-libtool dist-hook distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am install-man \ install-pdf install-pdf-am install-pkgxmldataDATA install-ps \ @@ -587,6 +596,8 @@ xml-stamp: $(pkgxmldata_DATA) Makefile.am mv $@.tmp $@ all-local: xml-stamp + +dist-hook: xml-stamp # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/src/xml/escp2/model/model_77.xml b/src/xml/escp2/model/model_77.xml index 1083c9f..2ec951b 100644 --- a/src/xml/escp2/model/model_77.xml +++ b/src/xml/escp2/model/model_77.xml @@ -21,16 +21,16 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. </copyright> <escp2:model id="77"> - <media src="escp2/media/c64.xml"/> + <media src="escp2/media/photo_gen3_4.xml"/> <inputSlots src="escp2/inputslots/cd_roll_feed.xml"/> <qualityPresets src="escp2/qualitypresets/standard.xml"/> - <inkGroup src="escp2/inks/c64.xml"/> + <inkGroup src="escp2/inks/photo_gen3_4.xml"/> <verticalBorderlessSequence>US\003\000\000\000\002</verticalBorderlessSequence> <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence> <preinitRemoteSequence>PM\002\000\000\000</preinitRemoteSequence> <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence> <commandSet>2000</commandSet> - <borderless>Yes</borderless> + <borderless>Full</borderless> <supportsVariableDropsizes/> <hasFastGraymode/> <sendZeroAdvance/> @@ -46,7 +46,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <baseSeparation>360</baseSeparation> <resolutionScale>14400</resolutionScale> <minimumResolution>360 120</minimumResolution> - <maximumResolution>2880 1440</maximumResolution> + <maximumResolution>5760 1440</maximumResolution> <separationRows>1</separationRows> <zeroMarginOffset>80</zeroMarginOffset> <microLeftMargin>42</microLeftMargin> @@ -56,20 +56,19 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <minimumMediaSize>144 144</minimumMediaSize> <maximumMediaSize>612 86400</maximumMediaSize> <maximumImageableArea>612 86400</maximumImageableArea> - <margins interleave="soft" media="sheet">9 9 0 0</margins> - <margins interleave="printer" media="sheet">9 9 0 0</margins> + <margins interleave="soft" media="sheet">9 9 0 9</margins> + <margins interleave="printer" media="sheet">9 9 0 9</margins> <margins interleave="soft" media="roll">9 9 0 0</margins> <margins interleave="printer" media="roll">9 9 0 0</margins> <CDOffset>204 191</CDOffset> <CDMediaSize>595 842</CDMediaSize> + <extraBottom>24</extraBottom> <AlignmentChoices>4 15 0 0</AlignmentChoices> <ChannelNames> <ChannelName translate="name" name="Black"/> <ChannelName translate="name" name="Cyan"/> <ChannelName translate="name" name="Magenta"/> <ChannelName translate="name" name="Yellow"/> - <ChannelName translate="name" name="Light Cyan"/> - <ChannelName translate="name" name="Light Magenta"/> </ChannelNames> <resolutions> <resolution translate="text" name="360x120sw" text="360 x 120 DPI Economy"> @@ -150,6 +149,14 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <parameter type="integer" name="escp2_bits">2</parameter> <parameter type="float" name="DropSize1">1.000000</parameter> </resolution> + <resolution translate="text" name="5760x1440sw" text="5760 x 1440 DPI"> + <physicalResolution>5760 1440</physicalResolution> + <parameter type="float" name="escp2_density">0.283000</parameter> + <parameter type="integer" name="escp2_ink_type">18</parameter> + <parameter type="integer" name="escp2_base_res">360</parameter> + <parameter type="integer" name="escp2_bits">2</parameter> + <parameter type="float" name="DropSize1">1.000000</parameter> + </resolution> </resolutions> </escp2:model> </gutenprint> diff --git a/src/xml/escp2/model/model_95.xml b/src/xml/escp2/model/model_95.xml index 9d3545c..d4c0987 100644 --- a/src/xml/escp2/model/model_95.xml +++ b/src/xml/escp2/model/model_95.xml @@ -29,7 +29,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. <preinitRemoteSequence>PM\002\000\000\000</preinitRemoteSequence> <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence> <commandSet>2000</commandSet> - <borderless>Yes</borderless> + <borderless>Full</borderless> <supportsVariableDropsizes/> <hasFastGraymode/> <sendZeroAdvance/> diff --git a/src/xml/escp2/model/model_96.xml b/src/xml/escp2/model/model_96.xml index dac4c6e..ec776fd 100644 --- a/src/xml/escp2/model/model_96.xml +++ b/src/xml/escp2/model/model_96.xml @@ -21,14 +21,14 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. </copyright> <escp2:model id="96"> - <media src="escp2/media/claria.xml"/> + <media src="escp2/media/artisan.xml"/> <inputSlots src="escp2/inputslots/artisan.xml"/> <qualityPresets src="escp2/qualitypresets/v2880.xml"/> <inkGroup src="escp2/inks/artisan.xml"/> <mediaSizes src="escp2/mediasizes/standard.xml"/> <verticalBorderlessSequence>US\003\000\000\000\002</verticalBorderlessSequence> <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence> - <preinitRemoteSequence>SN\001\000\000</preinitRemoteSequence> + <preinitRemoteSequence>JS\014\000\000GUTENPRINT\000SN\001\000\000</preinitRemoteSequence> <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence> <commandSet>2000</commandSet> <borderless>Yes</borderless> diff --git a/src/xml/escp2/model/model_98.xml b/src/xml/escp2/model/model_98.xml new file mode 100644 index 0000000..ed8eb85 --- /dev/null +++ b/src/xml/escp2/model/model_98.xml @@ -0,0 +1,172 @@ +<?xml version="1.0"?> + +<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0" +xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" +xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd"> +<copyright> + * Copyright 2008 Robert Krawitz (rlk@alum.mit.edu) + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the Free + * Software Foundation; either version 2 of the License, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +</copyright> +<escp2:model id="98"> + <media src="escp2/media/f360_ultrachrome_k3v.xml"/> + <inputSlots src="escp2/inputslots/r2880.xml"/> + <qualityPresets src="escp2/qualitypresets/v2880.xml"/> + <inkGroup src="escp2/inks/f360_ultrachrome_k3v.xml"/> + <mediaSizes src="escp2/mediasizes/standard.xml"/> + <verticalBorderlessSequence>US\003\000\000\000\002</verticalBorderlessSequence> + <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence> + <preinitRemoteSequence>SN\001\000\000</preinitRemoteSequence> + <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence> + <commandSet>2000</commandSet> + <borderless>Full</borderless> + <supportsVariableDropsizes/> + <hasFastGraymode/> + <sendZeroAdvance/> + <supportsD4Mode/> + <hasInterchangeableInkCartridges/> + <preferredEnvelopeOrientation>Portrait</preferredEnvelopeOrientation> + <headConfiguration type="default"> + <Nozzles>180</Nozzles> + <MinNozzles>1</MinNozzles> + <FirstNozzle>0</FirstNozzle> + <NozzleSeparation>2</NozzleSeparation> + </headConfiguration> + <physicalChannels>8</physicalChannels> + <baseSeparation>360</baseSeparation> + <resolutionScale>14400</resolutionScale> + <minimumResolution>360 180</minimumResolution> + <maximumResolution>5760 2880</maximumResolution> + <extraVerticalFeed>10</extraVerticalFeed> + <separationRows>1</separationRows> + <zeroMarginOffset>96</zeroMarginOffset> + <microLeftMargin>42</microLeftMargin> + <minHorizontalAlignment>1</minHorizontalAlignment> + <baseHorizontalAlignment>180</baseHorizontalAlignment> + <bidirectionalAutoUpperLimit>2073600</bidirectionalAutoUpperLimit> + <minimumMediaSize>144 144</minimumMediaSize> + <maximumMediaSize>936 86400</maximumMediaSize> + <maximumImageableArea>936 86400</maximumImageableArea> + <margins interleave="soft" media="sheet">9 9 0 0</margins> + <margins interleave="printer" media="sheet">9 9 0 0</margins> + <margins interleave="soft" media="roll">9 9 0 0</margins> + <margins interleave="printer" media="roll">9 9 0 0</margins> + <CDOffset>221 262</CDOffset> + <CDMediaSize>595 842</CDMediaSize> + <AlignmentChoices>4 15 0 0</AlignmentChoices> + <ChannelNames> + <ChannelName translate="name" name="Light Light Black"/> + <ChannelName translate="name" name="Vivid Light Magenta"/> + <ChannelName translate="name" name="Light Cyan"/> + <ChannelName translate="name" name="Light Black"/> + <ChannelName translate="name" name="Black"/> + <ChannelName translate="name" name="Cyan"/> + <ChannelName translate="name" name="Vivid Magenta"/> + <ChannelName translate="name" name="Yellow"/> + </ChannelNames> + <resolutions> + <resolution translate="text" name="360x180sw" text="360 x 180 DPI Draft"> + <physicalResolution>360 180</physicalResolution> + <parameter type="float" name="escp2_density">3.270000</parameter> + <parameter type="integer" name="escp2_ink_type">16</parameter> + <parameter type="integer" name="escp2_base_res">360</parameter> + <parameter type="integer" name="escp2_bits">2</parameter> + <parameter type="float" name="DropSize1">1.000000</parameter> + </resolution> + <resolution translate="text" name="360sw" text="360 DPI"> + <physicalResolution>360 360</physicalResolution> + <parameter type="float" name="escp2_density">1.630000</parameter> + <parameter type="integer" name="escp2_ink_type">16</parameter> + <parameter type="integer" name="escp2_base_res">360</parameter> + <parameter type="integer" name="escp2_bits">2</parameter> + <parameter type="float" name="DropSize1">1.000000</parameter> + </resolution> + <resolution translate="text" name="720x360sw" text="720 x 360 DPI"> + <physicalResolution>720 360</physicalResolution> + <parameter type="float" name="escp2_density">3.110000</parameter> + <parameter type="integer" name="escp2_ink_type">18</parameter> + <parameter type="integer" name="escp2_base_res">720</parameter> + <parameter type="integer" name="escp2_bits">2</parameter> + <parameter type="float" name="DropSize1">0.180000</parameter> + <parameter type="float" name="DropSize2">0.440000</parameter> + <parameter type="float" name="DropSize3">1.000000</parameter> + </resolution> + <resolution translate="text" name="720sw" text="720 DPI"> + <physicalResolution>720 720</physicalResolution> + <parameter type="float" name="escp2_density">1.550000</parameter> + <parameter type="integer" name="escp2_ink_type">18</parameter> + <parameter type="integer" name="escp2_base_res">720</parameter> + <parameter type="integer" name="escp2_bits">2</parameter> + <parameter type="float" name="DropSize1">0.180000</parameter> + <parameter type="float" name="DropSize2">0.440000</parameter> + <parameter type="float" name="DropSize3">1.000000</parameter> + </resolution> + <resolution translate="text" name="1440x720sw" text="1440 x 720 DPI"> + <physicalResolution>1440 720</physicalResolution> + <parameter type="float" name="escp2_density">0.775000</parameter> + <parameter type="integer" name="escp2_ink_type">18</parameter> + <parameter type="integer" name="escp2_base_res">720</parameter> + <parameter type="integer" name="escp2_bits">2</parameter> + <parameter type="float" name="DropSize1">0.180000</parameter> + <parameter type="float" name="DropSize2">0.440000</parameter> + <parameter type="float" name="DropSize3">1.000000</parameter> + </resolution> + <resolution translate="text" name="1440x1440ov" text="1440 x 1440 DPI"> + <physicalResolution>2880 1440</physicalResolution> + <printedResolution>1440 1440</printedResolution> + <parameter type="float" name="escp2_density">0.387000</parameter> + <parameter type="integer" name="escp2_ink_type">18</parameter> + <parameter type="integer" name="escp2_base_res">720</parameter> + <parameter type="integer" name="escp2_bits">2</parameter> + <parameter type="float" name="DropSize1">0.180000</parameter> + <parameter type="float" name="DropSize2">0.440000</parameter> + <parameter type="float" name="DropSize3">1.000000</parameter> + </resolution> + <resolution translate="text" name="2880x1440sw" text="2880 x 1440 DPI"> + <physicalResolution>2880 1440</physicalResolution> + <parameter type="float" name="escp2_density">0.420000</parameter> + <parameter type="integer" name="escp2_ink_type">18</parameter> + <parameter type="integer" name="escp2_base_res">720</parameter> + <parameter type="integer" name="escp2_bits">2</parameter> + <parameter type="float" name="DropSize1">0.410000</parameter> + <parameter type="float" name="DropSize2">1.000000</parameter> + </resolution> + <resolution translate="text" name="5760x1440sw" text="5760 x 1440 DPI"> + <physicalResolution>5760 1440</physicalResolution> + <parameter type="float" name="escp2_density">0.513000</parameter> + <parameter type="integer" name="escp2_ink_type">18</parameter> + <parameter type="integer" name="escp2_base_res">720</parameter> + <parameter type="integer" name="escp2_bits">2</parameter> + <parameter type="float" name="DropSize1">1.000000</parameter> + </resolution> + <resolution translate="text" name="2880x2880sw" text="2880 x 2880 DPI"> + <physicalResolution>2880 2880</physicalResolution> + <parameter type="float" name="escp2_density">0.513000</parameter> + <parameter type="integer" name="escp2_ink_type">18</parameter> + <parameter type="integer" name="escp2_base_res">720</parameter> + <parameter type="integer" name="escp2_bits">2</parameter> + <parameter type="float" name="DropSize1">1.000000</parameter> + </resolution> + <resolution translate="text" name="5760x2880sw" text="5760 x 2880 DPI"> + <physicalResolution>5760 2880</physicalResolution> + <parameter type="float" name="escp2_density">0.255000</parameter> + <parameter type="integer" name="escp2_ink_type">18</parameter> + <parameter type="integer" name="escp2_base_res">720</parameter> + <parameter type="integer" name="escp2_bits">2</parameter> + <parameter type="float" name="DropSize1">1.000000</parameter> + </resolution> + </resolutions> +</escp2:model> +</gutenprint> diff --git a/src/xml/escp2/qualitypresets/Makefile.am b/src/xml/escp2/qualitypresets/Makefile.am index 3c73802..cc77328 100644 --- a/src/xml/escp2/qualitypresets/Makefile.am +++ b/src/xml/escp2/qualitypresets/Makefile.am @@ -1,4 +1,4 @@ -## $Id: Makefile.am,v 1.3 2008/10/24 00:37:14 rleigh Exp $ +## $Id: Makefile.am,v 1.4 2009/05/30 14:10:32 rlk Exp $ ## Copyright (C) 2008 Robert Krawitz ## ## This program is free software; you can redistribute it and/or modify @@ -40,6 +40,7 @@ xml-stamp: $(pkgxmldata_DATA) Makefile.am all-local: xml-stamp +dist-hook: xml-stamp CLEANFILES = xmli18n-tmp.h xml-stamp xml-stamp.tmp EXTRA_DIST = $(pkgxmldata_DATA) diff --git a/src/xml/escp2/qualitypresets/Makefile.in b/src/xml/escp2/qualitypresets/Makefile.in index 79a910a..39a8ab9 100644 --- a/src/xml/escp2/qualitypresets/Makefile.in +++ b/src/xml/escp2/qualitypresets/Makefile.in @@ -44,11 +44,14 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \ - $(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \ - $(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/stp.m4 \ + $(top_srcdir)/m4/stp_cups.m4 $(top_srcdir)/m4/stp_gimp.m4 \ + $(top_srcdir)/m4/stp_option.m4 $(top_srcdir)/m4/stp_release.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs @@ -85,10 +88,6 @@ CUPS_CFLAGS = @CUPS_CFLAGS@ CUPS_CONFIG = @CUPS_CONFIG@ CUPS_LIBS = @CUPS_LIBS@ CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DB2HTML = @DB2HTML@ DB2PDF = @DB2PDF@ @@ -98,16 +97,15 @@ DEPDIR = @DEPDIR@ DIALOG = @DIALOG@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ DVIPDF = @DVIPDF@ DVIPS = @DVIPS@ -ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ FIND = @FIND@ FOOMATIC_CONFIGURE = @FOOMATIC_CONFIGURE@ FOOMATIC_KITLOAD = @FOOMATIC_KITLOAD@ @@ -152,6 +150,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTLLIBS = @INTLLIBS@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -163,6 +162,7 @@ LIBREADLINE_DEPS = @LIBREADLINE_DEPS@ LIBS = $(INTLLIBS) @LIBS@ LIBTOOL = @LIBTOOL@ LIBTOOL_DEPS = @LIBTOOL_DEPS@ +LIPO = @LIPO@ LN_S = @LN_S@ LTALLOCA = @LTALLOCA@ LTLIBICONV = @LTLIBICONV@ @@ -175,8 +175,12 @@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ +NM = @NM@ NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -210,8 +214,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -256,6 +259,7 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -268,6 +272,7 @@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS) @@ -370,6 +375,9 @@ distdir: $(DISTFILES) || exit 1; \ fi; \ done + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$(top_distdir)" distdir="$(distdir)" \ + dist-hook check-am: all-am check: check-am all-am: Makefile $(DATA) all-local @@ -459,9 +467,9 @@ uninstall-am: uninstall-pkgxmldataDATA .MAKE: install-am install-strip .PHONY: all all-am all-local check check-am clean clean-generic \ - clean-libtool distclean distclean-generic distclean-libtool \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-dvi \ + clean-libtool dist-hook distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am install-man \ install-pdf install-pdf-am install-pkgxmldataDATA install-ps \ @@ -494,6 +502,8 @@ xml-stamp: $(pkgxmldata_DATA) Makefile.am mv $@.tmp $@ all-local: xml-stamp + +dist-hook: xml-stamp # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/src/xml/escp2/weaves/Makefile.am b/src/xml/escp2/weaves/Makefile.am index f114e9a..4de7cd3 100644 --- a/src/xml/escp2/weaves/Makefile.am +++ b/src/xml/escp2/weaves/Makefile.am @@ -1,4 +1,4 @@ -## $Id: Makefile.am,v 1.2 2008/10/24 00:37:14 rleigh Exp $ +## $Id: Makefile.am,v 1.3 2009/05/30 14:10:32 rlk Exp $ ## Copyright (C) 2008 Robert Krawitz ## ## This program is free software; you can redistribute it and/or modify @@ -39,6 +39,7 @@ xml-stamp: $(pkgxmldata_DATA) Makefile.am all-local: xml-stamp +dist-hook: xml-stamp CLEANFILES = xmli18n-tmp.h xml-stamp xml-stamp.tmp EXTRA_DIST = $(pkgxmldata_DATA) diff --git a/src/xml/escp2/weaves/Makefile.in b/src/xml/escp2/weaves/Makefile.in index 86a9dbd..1f949eb 100644 --- a/src/xml/escp2/weaves/Makefile.in +++ b/src/xml/escp2/weaves/Makefile.in @@ -44,11 +44,14 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \ - $(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \ - $(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/stp.m4 \ + $(top_srcdir)/m4/stp_cups.m4 $(top_srcdir)/m4/stp_gimp.m4 \ + $(top_srcdir)/m4/stp_option.m4 $(top_srcdir)/m4/stp_release.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs @@ -85,10 +88,6 @@ CUPS_CFLAGS = @CUPS_CFLAGS@ CUPS_CONFIG = @CUPS_CONFIG@ CUPS_LIBS = @CUPS_LIBS@ CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DB2HTML = @DB2HTML@ DB2PDF = @DB2PDF@ @@ -98,16 +97,15 @@ DEPDIR = @DEPDIR@ DIALOG = @DIALOG@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ DVIPDF = @DVIPDF@ DVIPS = @DVIPS@ -ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ FIND = @FIND@ FOOMATIC_CONFIGURE = @FOOMATIC_CONFIGURE@ FOOMATIC_KITLOAD = @FOOMATIC_KITLOAD@ @@ -152,6 +150,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTLLIBS = @INTLLIBS@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -163,6 +162,7 @@ LIBREADLINE_DEPS = @LIBREADLINE_DEPS@ LIBS = $(INTLLIBS) @LIBS@ LIBTOOL = @LIBTOOL@ LIBTOOL_DEPS = @LIBTOOL_DEPS@ +LIPO = @LIPO@ LN_S = @LN_S@ LTALLOCA = @LTALLOCA@ LTLIBICONV = @LTLIBICONV@ @@ -175,8 +175,12 @@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ +NM = @NM@ NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -210,8 +214,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -256,6 +259,7 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -268,6 +272,7 @@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS) @@ -369,6 +374,9 @@ distdir: $(DISTFILES) || exit 1; \ fi; \ done + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$(top_distdir)" distdir="$(distdir)" \ + dist-hook check-am: all-am check: check-am all-am: Makefile $(DATA) all-local @@ -458,9 +466,9 @@ uninstall-am: uninstall-pkgxmldataDATA .MAKE: install-am install-strip .PHONY: all all-am all-local check check-am clean clean-generic \ - clean-libtool distclean distclean-generic distclean-libtool \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-dvi \ + clean-libtool dist-hook distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am install-man \ install-pdf install-pdf-am install-pkgxmldataDATA install-ps \ @@ -493,6 +501,8 @@ xml-stamp: $(pkgxmldata_DATA) Makefile.am mv $@.tmp $@ all-local: xml-stamp + +dist-hook: xml-stamp # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/src/xml/papers.xml b/src/xml/papers.xml index fcda4f8..8d83276 100644 --- a/src/xml/papers.xml +++ b/src/xml/papers.xml @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!-- - "$Id: papers.xml,v 1.5 2008/07/28 12:25:23 rlk Exp $" + "$Id: papers.xml,v 1.7 2009/04/14 01:09:42 rlk Exp $" XML description of papers known to libgutenprint. You can add additional paper sizes here. @@ -138,6 +138,16 @@ <right value="18"/> <bottom value="45"/> </paper> + <paper name="w297h421"> + <description translate="value" value="Epson L Photo Paper (tear-off borders)"/> + <width value="297"/> + <height value="421"/> + <unit value="english-extended"/> + <top value="17"/> + <left value="22"/> + <right value="22"/> + <bottom value="43"/> + </paper> <paper name="w360h504"> <description translate="value" value="5x7"/> <width value="360"/> diff --git a/src/xml/printers.xml b/src/xml/printers.xml index d04e97a..c52bc41 100644 --- a/src/xml/printers.xml +++ b/src/xml/printers.xml @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!-- - "$Id: printers.xml,v 1.28 2008/12/21 10:49:50 faust3 Exp $" + "$Id: printers.xml,v 1.37 2009/06/20 08:35:32 faust3 Exp $" XML description of printers known to libgutenprint You can add additional printers here, but the underlying driver has @@ -141,6 +141,7 @@ <printer translate="name" name="Canon PIXMA iP6000D" driver="bjc-PIXMA-iP6000D" manufacturer="Canon" model="3006000" parameters="PIXMA_iP4000_params" /> <printer translate="name" name="Canon PIXMA iP6700" driver="bjc-PIXMA-iP6700" manufacturer="Canon" model="3006700" parameters="PIXMA_iP4000_params" /> <printer translate="name" name="Canon PIXMA iP8500" driver="bjc-PIXMA-iP8500" manufacturer="Canon" model="3008500" parameters="PIXMA_iP4000_params" /> + <printer translate="name" name="Canon PIXMA iX4000" driver="bjc-PIXMA-iX4000" manufacturer="Canon" model="4005000" parameters="PIXMA_iX5000_params" /> <printer translate="name" name="Canon PIXMA iX5000" driver="bjc-PIXMA-iX5000" manufacturer="Canon" model="4005000" parameters="PIXMA_iX5000_params" /> <printer translate="name" name="Canon PIXMA Pro9500" driver="bjc-PIXMA-Pro9500" manufacturer="Canon" model="7009500" parameters="PIXMA_iP4000_params" /> <printer translate="name" name="Canon PIXMA MP150" driver="bjc-MULTIPASS-MP150" manufacturer="Canon" model="5000150" parameters="PIXMA_iP4000_params" /> @@ -280,7 +281,7 @@ <printer translate="name" name="Epson Stylus Office BX300F" driver="escp2-of-bx300f" manufacturer="Epson" model="94" parameters="standard_params" /> <printer translate="name" name="Epson Stylus Office BX600FW" driver="escp2-of-bx600fw" manufacturer="Epson" model="92" parameters="standard_params" /> <printer translate="name" name="Epson Stylus Office SX600FW" driver="escp2-of-sx600fw" manufacturer="Epson" model="92" parameters="standard_params" /> - <printer translate="name" name="Epson Stylus Offixe TX300F" driver="escp2-of-tx300f" manufacturer="Epson" model="94" parameters="standard_params" /> + <printer translate="name" name="Epson Stylus Office TX300F" driver="escp2-of-tx300f" manufacturer="Epson" model="94" parameters="standard_params" /> <printer translate="name" name="Epson Stylus Office TX600FW" driver="escp2-of-tx600fw" manufacturer="Epson" model="92" parameters="standard_params" /> <printer translate="name" name="Epson Stylus Photo" driver="escp2-photo" manufacturer="Epson" model="9" parameters="standard_params" /> <printer translate="name" name="Epson Stylus Photo 700" driver="escp2-700" manufacturer="Epson" model="7" parameters="standard_params" /> @@ -343,6 +344,7 @@ <printer translate="name" name="Epson Stylus Photo R1800" driver="escp2-r1800" manufacturer="Epson" model="67" parameters="standard_params" /> <printer translate="name" name="Epson Stylus Photo R1900" driver="escp2-r1900" manufacturer="Epson" model="91" parameters="standard_params" /> <printer translate="name" name="Epson Stylus Photo R2400" driver="escp2-r2400" manufacturer="Epson" model="71" parameters="standard_params" /> + <printer translate="name" name="Epson Stylus Photo R2880" driver="escp2-r2880" manufacturer="Epson" model="98" parameters="standard_params" /> <printer translate="name" name="Epson Stylus Photo RX400" driver="escp2-rx400" manufacturer="Epson" model="84" parameters="standard_params" /> <printer translate="name" name="Epson Stylus Photo RX420" driver="escp2-rx420" manufacturer="Epson" model="84" parameters="standard_params" /> <printer translate="name" name="Epson Stylus Photo RX425" driver="escp2-rx425" manufacturer="Epson" model="84" parameters="standard_params" /> @@ -364,7 +366,7 @@ <printer translate="name" name="Epson Stylus Photo RX690" driver="escp2-rx690" manufacturer="Epson" model="97" parameters="claria_params" /> <printer translate="name" name="Epson Stylus Photo RX700" driver="escp2-rx700" manufacturer="Epson" model="70" parameters="standard_params" /> <printer translate="name" name="Epson Stylus Photo TX700W" driver="escp2-tx700w" manufacturer="Epson" model="96" parameters="claria_params" /> - <printer translate="name" name="Epson Stylus Photo TX800W" driver="escp2-tx800w" manufacturer="Epson" model="96" parameters="claria_params" /> + <printer translate="name" name="Epson Stylus Photo TX800FW" driver="escp2-tx800w" manufacturer="Epson" model="96" parameters="claria_params" /> <printer translate="name" name="Epson Stylus Pro 5000" driver="escp2-5000" manufacturer="Epson" model="27" parameters="standard_params" /> <printer translate="name" name="Epson Stylus Pro 5500" driver="escp2-5500" manufacturer="Epson" model="40" parameters="pro_5500_params" /> <printer translate="name" name="Epson Stylus Pro 7000" driver="escp2-7000" manufacturer="Epson" model="28" parameters="standard_params" /> @@ -430,6 +432,7 @@ <printer translate="name" name="Epson Stylus D120" driver="escp2-d120" manufacturer="Epson" model="85" parameters="standard_params" /> <printer translate="name" name="Epson Stylus DX3800" driver="escp2-dx3800" manufacturer="Epson" model="72" parameters="standard_params" /> <printer translate="name" name="Epson Stylus DX3850" driver="escp2-dx3850" manufacturer="Epson" model="72" parameters="standard_params" /> + <printer translate="name" name="Epson Stylus DX4000" driver="escp2-dx4000" manufacturer="Epson" model="72" parameters="standard_params" /> <printer translate="name" name="Epson Stylus DX4050" driver="escp2-dx4050" manufacturer="Epson" model="72" parameters="standard_params" /> <printer translate="name" name="Epson Stylus DX4200" driver="escp2-dx4200" manufacturer="Epson" model="95" parameters="cx3500_params" /> <printer translate="name" name="Epson Stylus DX4250" driver="escp2-dx4250" manufacturer="Epson" model="95" parameters="cx3500_params" /> @@ -448,7 +451,7 @@ <printer translate="name" name="Epson Stylus NX200" driver="escp2-nx200" manufacturer="Epson" model="93" parameters="standard_params" /> <printer translate="name" name="Epson Stylus NX300" driver="escp2-nx300" manufacturer="Epson" model="94" parameters="standard_params" /> <printer translate="name" name="Epson Stylus NX400" driver="escp2-nx400" manufacturer="Epson" model="93" parameters="standard_params" /> - <printer translate="name" name="Epson Stylus PX700FW" driver="escp2-px700fw" manufacturer="Epson" model="96" parameters="claria_params" /> + <printer translate="name" name="Epson Stylus PX700W" driver="escp2-px700fw" manufacturer="Epson" model="96" parameters="claria_params" /> <printer translate="name" name="Epson Stylus PX800FW" driver="escp2-px800fw" manufacturer="Epson" model="96" parameters="claria_params" /> <printer translate="name" name="Epson Stylus S20" driver="escp2-s20" manufacturer="Epson" model="66" parameters="standard_params" /> <printer translate="name" name="Epson Stylus SX100" driver="escp2-sx100" manufacturer="Epson" model="94" parameters="standard_params" /> @@ -586,6 +589,7 @@ <printer translate="name" name="Epson PX V630" driver="escp2-pxv630" manufacturer="Epson" model="69" parameters="standard_params" /> <printer translate="name" name="Epson PX V780" driver="escp2-pxv780" manufacturer="Epson" model="85" parameters="standard_params" /> <printer translate="name" name="Epson PX 5500" driver="escp2-px5500" manufacturer="Epson" model="71" parameters="standard_params" /> + <printer translate="name" name="Epson PX G5600" driver="escp2-pxg5600" manufacturer="Epson" model="98" parameters="standard_params" /> <printer translate="name" name="Epson PX 7000" driver="escp2-px7000" manufacturer="Epson" model="48" parameters="standard_params" /> <printer translate="name" name="Epson PX 9000" driver="escp2-px9000" manufacturer="Epson" model="49" parameters="standard_params" /> </family> @@ -709,11 +713,9 @@ <printer translate="name" name="Gestetner 2712" driver="gestetner-2712" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" /> <printer translate="name" name="Gestetner 3212" driver="gestetner-3212" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" /> <printer translate="name" name="Gestetner 3502" driver="gestetner-3502" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Gestetner 3532" driver="gestetner-3532" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Gestetner 4235g" driver="gestetner-4235g" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" /> + <printer translate="name" name="Gestetner 3532/4235g" driver="gestetner-4235g" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" /> <printer translate="name" name="Gestetner 4502" driver="gestetner-4502" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Gestetner 4532" driver="gestetner-4532" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Gestetner 4245g" driver="gestetner-4245g" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" /> + <printer translate="name" name="Gestetner 4532/4245g" driver="gestetner-4245g" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" /> <printer translate="name" name="Gestetner 6002" driver="gestetner-6002" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" /> <printer translate="name" name="Gestetner 7502" driver="gestetner-7502" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" /> <printer translate="name" name="Gestetner 9002" driver="gestetner-9002" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" /> @@ -726,49 +728,31 @@ <printer translate="name" name="Gestetner DSm620d" driver="gestetner-dsm620d" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" /> <printer translate="name" name="Gestetner DSm622" driver="gestetner-dsm622" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" /> <printer translate="name" name="Gestetner DSm627" driver="gestetner-dsm627" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Gestetner DSm635" driver="gestetner-dsm635" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Gestetner DSm635G" driver="gestetner-dsm635g" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Gestetner DSm645" driver="gestetner-dsm645" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Gestetner DS645G" driver="gestetner-ds645g" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" /> + <printer translate="name" name="Gestetner DSm635/635G" driver="gestetner-dsm635g" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" /> + <printer translate="name" name="Gestetner DSm645/645G" driver="gestetner-ds645g" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" /> <printer translate="name" name="Gestetner DSm651" driver="gestetner-dsm651" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" /> <printer translate="name" name="Gestetner DSm660" driver="gestetner-dsm660" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" /> <printer translate="name" name="Gestetner DSm675" driver="gestetner-dsm675" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" /> <printer translate="name" name="Gestetner DSm725" driver="gestetner-dsm725" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" /> <printer translate="name" name="Gestetner DSm730" driver="gestetner-dsm730" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Gestetner DSm735" driver="gestetner-dsm735" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Gestetner DSm735G" driver="gestetner-dsm735g" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Gestetner DSm745" driver="gestetner-dsm745" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Gestetner DSm745G" driver="gestetner-dsm745g" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Gestetner MP1100" driver="gestetner-mp1100" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Gestetner DSm7110" driver="gestetner-dsm7110" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Gestetner MP1350" driver="gestetner-mp1350" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Gestetner DSm7135" driver="gestetner-dsm7135" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Gestetner MP1600" driver="gestetner-mp1600" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Gestetner DSm716" driver="gestetner-dsm716" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Gestetner MP2000" driver="gestetner-mp2000" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Gestetner DSm721d" driver="gestetner-dsm721d" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Gestetner MP2500" driver="gestetner-mp2500" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Gestetner DSm625" driver="gestetner-dsm625" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Gestetner MP3500" driver="gestetner-mp3500" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Gestetner DSm735e" driver="gestetner-dsm735e" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Gestetner MP4500" driver="gestetner-mp4500" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Gestetner DSm745e" driver="gestetner-dsm745e" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Gestetner MP5500" driver="gestetner-mp5500" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Gestetner DSm755" driver="gestetner-dsm755" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Gestetner MP6500" driver="gestetner-mp6500" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Gestetner DSm765" driver="gestetner-dsm765" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Gestetner MP7500" driver="gestetner-mp7500" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Gestetner DSm775" driver="gestetner-dsm775" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Gestetner MP9000" driver="gestetner-mp9000" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Gestetner DSm790" driver="gestetner-dsm790" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Gestetner MP 161" driver="gestetner-mp_161" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Gestetner DSm416" driver="gestetner-dsm416" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Gestetner MP 2510" driver="gestetner-mp_2510" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Gestetner DSm725e" driver="gestetner-dsm725e" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" /> + <printer translate="name" name="Gestetner DSm735/735G" driver="gestetner-dsm735g" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" /> + <printer translate="name" name="Gestetner DSm745/745G" driver="gestetner-dsm745g" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" /> + <printer translate="name" name="Gestetner MP1100/DSm7110" driver="gestetner-dsm7110" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" /> + <printer translate="name" name="Gestetner MP1350/DSm7135" driver="gestetner-dsm7135" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" /> + <printer translate="name" name="Gestetner MP1600/DSm716" driver="gestetner-dsm716" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" /> + <printer translate="name" name="Gestetner MP2000/DSm721d" driver="gestetner-dsm721d" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" /> + <printer translate="name" name="Gestetner MP2500/DSm625" driver="gestetner-dsm625" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" /> + <printer translate="name" name="Gestetner MP3500/DSm735e" driver="gestetner-dsm735e" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" /> + <printer translate="name" name="Gestetner MP4500/DSm745e" driver="gestetner-dsm745e" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" /> + <printer translate="name" name="Gestetner MP5500/DSm755" driver="gestetner-dsm755" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" /> + <printer translate="name" name="Gestetner MP6500/DSm765" driver="gestetner-dsm765" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" /> + <printer translate="name" name="Gestetner MP7500/DSm775" driver="gestetner-dsm775" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" /> + <printer translate="name" name="Gestetner MP9000/DSm790" driver="gestetner-dsm790" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" /> + <printer translate="name" name="Gestetner MP 161/DSm416" driver="gestetner-dsm416" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" /> + <printer translate="name" name="Gestetner MP 2510/DSm725e" driver="gestetner-dsm725e" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" /> <printer translate="name" name="Gestetner MP 2550" driver="gestetner-mp_2550" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" /> <printer translate="name" name="Gestetner MP 2550B" driver="gestetner-mp_2550b" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Gestetner MP 3010" driver="gestetner-mp_3010" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Gestetner DSm730e" driver="gestetner-dsm730e" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" /> + <printer translate="name" name="Gestetner MP 3010/DSm730e" driver="gestetner-dsm730e" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" /> <printer translate="name" name="Gestetner MP 3350" driver="gestetner-mp_3350" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" /> <printer translate="name" name="Gestetner MP 3350B" driver="gestetner-mp_3350b" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" /> <printer translate="name" name="Gestetner MP 4000" driver="gestetner-mp_4000" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" /> @@ -1192,50 +1176,28 @@ <printer translate="name" name="Lanier LD230" driver="lanier-ld230" manufacturer="Lanier" model="6" parameters="pcl_laser_params" /> <printer translate="name" name="Lanier LD235" driver="lanier-ld235" manufacturer="Lanier" model="6" parameters="pcl_laser_params" /> <printer translate="name" name="Lanier LD245" driver="lanier-ld245" manufacturer="Lanier" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Lanier MP 2500" driver="lanier-mp_2500" manufacturer="Lanier" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Lanier LD125" driver="lanier-ld125" manufacturer="Lanier" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Lanier MP 1100" driver="lanier-mp_1100" manufacturer="Lanier" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Lanier LD1100" driver="lanier-ld1100" manufacturer="Lanier" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Lanier MP 1350" driver="lanier-mp_1350" manufacturer="Lanier" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Lanier LD1135" driver="lanier-ld1135" manufacturer="Lanier" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Lanier MP 1600" driver="lanier-mp_1600" manufacturer="Lanier" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Lanier LD316" driver="lanier-ld316" manufacturer="Lanier" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Lanier MP 161" driver="lanier-mp_161" manufacturer="Lanier" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Lanier LD016" driver="lanier-ld016" manufacturer="Lanier" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Lanier MP 2000" driver="lanier-mp_2000" manufacturer="Lanier" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Lanier LD320d" driver="lanier-ld320d" manufacturer="Lanier" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Lanier MP 2510" driver="lanier-mp_2510" manufacturer="Lanier" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Lanier LD325" driver="lanier-ld325" manufacturer="Lanier" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Lanier MP 2550B" driver="lanier-mp_2550b" manufacturer="Lanier" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Lanier LD425B" driver="lanier-ld425b" manufacturer="Lanier" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Lanier MP 2550" driver="lanier-mp_2550" manufacturer="Lanier" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Lanier LD425" driver="lanier-ld425" manufacturer="Lanier" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Lanier MP 3010" driver="lanier-mp_3010" manufacturer="Lanier" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Lanier LD330" driver="lanier-ld330" manufacturer="Lanier" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Lanier MP 3350B" driver="lanier-mp_3350b" manufacturer="Lanier" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Lanier LD433B" driver="lanier-ld433b" manufacturer="Lanier" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Lanier MP 3350" driver="lanier-mp_3350" manufacturer="Lanier" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Lanier LD433" driver="lanier-ld433" manufacturer="Lanier" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Lanier MP 3500" driver="lanier-mp_3500" manufacturer="Lanier" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Lanier LD335" driver="lanier-ld335" manufacturer="Lanier" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Lanier MP 4000B" driver="lanier-mp_4000b" manufacturer="Lanier" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Lanier LD040B" driver="lanier-ld040b" manufacturer="Lanier" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Lanier MP 4000" driver="lanier-mp_4000" manufacturer="Lanier" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Lanier LD040" driver="lanier-ld040" manufacturer="Lanier" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Lanier MP 4500" driver="lanier-mp_4500" manufacturer="Lanier" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Lanier LD345" driver="lanier-ld345" manufacturer="Lanier" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Lanier MP 5000B" driver="lanier-mp_5000b" manufacturer="Lanier" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Lanier LD050B" driver="lanier-ld050b" manufacturer="Lanier" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Lanier MP 5000" driver="lanier-mp_5000" manufacturer="Lanier" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Lanier LD050" driver="lanier-ld050" manufacturer="Lanier" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Lanier MP 5500" driver="lanier-mp_5500" manufacturer="Lanier" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Lanier LD255" driver="lanier-ld255" manufacturer="Lanier" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Lanier MP 6500" driver="lanier-mp_6500" manufacturer="Lanier" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Lanier LD265" driver="lanier-ld265" manufacturer="Lanier" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Lanier MP 7500" driver="lanier-mp_7500" manufacturer="Lanier" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Lanier LD275" driver="lanier-ld275" manufacturer="Lanier" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Lanier MP 9000" driver="lanier-mp_9000" manufacturer="Lanier" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Lanier LD190" driver="lanier-ld190" manufacturer="Lanier" model="6" parameters="pcl_laser_params" /> + <printer translate="name" name="Lanier MP2500/LD125" driver="lanier-ld125" manufacturer="Lanier" model="6" parameters="pcl_laser_params" /> + <printer translate="name" name="Lanier MP 1100/LD1100" driver="lanier-ld1100" manufacturer="Lanier" model="6" parameters="pcl_laser_params" /> + <printer translate="name" name="Lanier MP 1350/LD1135" driver="lanier-ld1135" manufacturer="Lanier" model="6" parameters="pcl_laser_params" /> + <printer translate="name" name="Lanier MP 1600/LD316" driver="lanier-ld316" manufacturer="Lanier" model="6" parameters="pcl_laser_params" /> + <printer translate="name" name="Lanier MP 161/LD016" driver="lanier-ld016" manufacturer="Lanier" model="6" parameters="pcl_laser_params" /> + <printer translate="name" name="Lanier MP 2000/LD320d" driver="lanier-ld320d" manufacturer="Lanier" model="6" parameters="pcl_laser_params" /> + <printer translate="name" name="Lanier MP 2510/LD325" driver="lanier-ld325" manufacturer="Lanier" model="6" parameters="pcl_laser_params" /> + <printer translate="name" name="Lanier MP 2550B/LD425B" driver="lanier-ld425b" manufacturer="Lanier" model="6" parameters="pcl_laser_params" /> + <printer translate="name" name="Lanier MP 2550/LD425" driver="lanier-ld425" manufacturer="Lanier" model="6" parameters="pcl_laser_params" /> + <printer translate="name" name="Lanier MP 3010/LD330" driver="lanier-ld330" manufacturer="Lanier" model="6" parameters="pcl_laser_params" /> + <printer translate="name" name="Lanier MP 3350B/LD433B" driver="lanier-ld433b" manufacturer="Lanier" model="6" parameters="pcl_laser_params" /> + <printer translate="name" name="Lanier MP 3350/LD433" driver="lanier-ld433" manufacturer="Lanier" model="6" parameters="pcl_laser_params" /> + <printer translate="name" name="Lanier MP 3500/LD335" driver="lanier-ld335" manufacturer="Lanier" model="6" parameters="pcl_laser_params" /> + <printer translate="name" name="Lanier MP 4000B/LD040B" driver="lanier-ld040b" manufacturer="Lanier" model="6" parameters="pcl_laser_params" /> + <printer translate="name" name="Lanier MP 4000/LD040" driver="lanier-ld040" manufacturer="Lanier" model="6" parameters="pcl_laser_params" /> + <printer translate="name" name="Lanier MP 4500/LD345" driver="lanier-ld345" manufacturer="Lanier" model="6" parameters="pcl_laser_params" /> + <printer translate="name" name="Lanier MP 5000B/LD050B" driver="lanier-ld050b" manufacturer="Lanier" model="6" parameters="pcl_laser_params" /> + <printer translate="name" name="Lanier MP 5000/LD050" driver="lanier-ld050" manufacturer="Lanier" model="6" parameters="pcl_laser_params" /> + <printer translate="name" name="Lanier MP 5500/LD255" driver="lanier-ld255" manufacturer="Lanier" model="6" parameters="pcl_laser_params" /> + <printer translate="name" name="Lanier MP 6500/LD265" driver="lanier-ld265" manufacturer="Lanier" model="6" parameters="pcl_laser_params" /> + <printer translate="name" name="Lanier MP 7500/LD275" driver="lanier-ld275" manufacturer="Lanier" model="6" parameters="pcl_laser_params" /> + <printer translate="name" name="Lanier MP 9000/LD190" driver="lanier-ld190" manufacturer="Lanier" model="6" parameters="pcl_laser_params" /> <printer translate="name" name="Lexmark 4076" driver="lexmark-4076" manufacturer="Lexmark" model="500" parameters="pcl_inkjet_params" /> <printer translate="name" name="Lexmark Optra E" driver="lexmark-optra_e" manufacturer="Lexmark" model="6" parameters="pcl_laser_params" /> <printer translate="name" name="Lexmark Optra E+" driver="lexmark-optra_eplus" manufacturer="Lexmark" model="6" parameters="pcl_laser_params" /> @@ -1255,39 +1217,17 @@ <printer translate="name" name="NEC SuperScript 1260" driver="nec-ssc_1260" manufacturer="NEC" model="2" parameters="pcl_laser_params" /> <printer translate="name" name="NEC SuperScript 1400" driver="nec-ssc_1400" manufacturer="NEC" model="6" parameters="pcl_laser_params" /> <printer translate="name" name="NEC SuperScript 1800" driver="nec-ssc_1800" manufacturer="NEC" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="NRG 10515" driver="nrg-10515" manufacturer="NRG" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="NRG 10518" driver="nrg-10518" manufacturer="NRG" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="NRG 10512" driver="nrg-10512" manufacturer="NRG" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="NRG 2205" driver="nrg-2205" manufacturer="NRG" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="NRG 2238" driver="nrg-2238" manufacturer="NRG" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="NRG 2212" driver="nrg-2212" manufacturer="NRG" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="NRG 2705" driver="nrg-2705" manufacturer="NRG" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="NRG 2738" driver="nrg-2738" manufacturer="NRG" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="NRG 2712" driver="nrg-2712" manufacturer="NRG" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="NRG 3205" driver="nrg-3205" manufacturer="NRG" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="NRG 3238" driver="nrg-3238" manufacturer="NRG" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="NRG 3212" driver="nrg-3212" manufacturer="NRG" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="NRG 3525" driver="nrg-3525" manufacturer="NRG" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="NRG 3508" driver="nrg-3508" manufacturer="NRG" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="NRG 3502" driver="nrg-3502" manufacturer="NRG" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="NRG 3545" driver="nrg-3545" manufacturer="NRG" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="NRG 3518" driver="nrg-3518" manufacturer="NRG" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="NRG 3532" driver="nrg-3532" manufacturer="NRG" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="NRG 4525" driver="nrg-4525" manufacturer="NRG" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="NRG 4508" driver="nrg-4508" manufacturer="NRG" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="NRG 4502" driver="nrg-4502" manufacturer="NRG" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="NRG 4545" driver="nrg-4545" manufacturer="NRG" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="NRG 4518" driver="nrg-4518" manufacturer="NRG" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="NRG 4532" driver="nrg-4532" manufacturer="NRG" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="NRG 6002" driver="nrg-6002" manufacturer="NRG" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="NRG 6005" driver="nrg-6005" manufacturer="NRG" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="NRG 6008" driver="nrg-6008" manufacturer="NRG" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="NRG 7502" driver="nrg-7502" manufacturer="NRG" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="NRG 7505" driver="nrg-7505" manufacturer="NRG" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="NRG 7508" driver="nrg-7508" manufacturer="NRG" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="NRG 9005" driver="nrg-9005" manufacturer="NRG" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="NRG 9008" driver="nrg-9008" manufacturer="NRG" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="NRG 9002" driver="nrg-9002" manufacturer="NRG" model="6" parameters="pcl_laser_params" /> + <printer translate="name" name="NRG 10515/10518/10512" driver="nrg-10512" manufacturer="NRG" model="6" parameters="pcl_laser_params" /> + <printer translate="name" name="NRG 2205/2238/2212" driver="nrg-2212" manufacturer="NRG" model="6" parameters="pcl_laser_params" /> + <printer translate="name" name="NRG 2705/2738/2712" driver="nrg-2712" manufacturer="NRG" model="6" parameters="pcl_laser_params" /> + <printer translate="name" name="NRG 3205/3238/3212" driver="nrg-3212" manufacturer="NRG" model="6" parameters="pcl_laser_params" /> + <printer translate="name" name="NRG 3525/3508/3502" driver="nrg-3502" manufacturer="NRG" model="6" parameters="pcl_laser_params" /> + <printer translate="name" name="NRG 3545/3518/3532" driver="nrg-3532" manufacturer="NRG" model="6" parameters="pcl_laser_params" /> + <printer translate="name" name="NRG 4525/4508/4502" driver="nrg-4502" manufacturer="NRG" model="6" parameters="pcl_laser_params" /> + <printer translate="name" name="NRG 4545/4518/4532" driver="nrg-4532" manufacturer="NRG" model="6" parameters="pcl_laser_params" /> + <printer translate="name" name="NRG 6002/6005/6008" driver="nrg-6008" manufacturer="NRG" model="6" parameters="pcl_laser_params" /> + <printer translate="name" name="NRG 7502/7505/7508" driver="nrg-7508" manufacturer="NRG" model="6" parameters="pcl_laser_params" /> + <printer translate="name" name="NRG 9005/9008/9002" driver="nrg-9002" manufacturer="NRG" model="6" parameters="pcl_laser_params" /> <printer translate="name" name="NRG DSm415" driver="nrg-dsm415" manufacturer="NRG" model="6" parameters="pcl_laser_params" /> <printer translate="name" name="NRG DSm615" driver="nrg-dsm615" manufacturer="NRG" model="6" parameters="pcl_laser_params" /> <printer translate="name" name="NRG DSm616" driver="nrg-dsm616" manufacturer="NRG" model="6" parameters="pcl_laser_params" /> @@ -1439,10 +1379,8 @@ <printer translate="name" name="Savin 2522" driver="savin-2522" manufacturer="Savin" model="6" parameters="pcl_laser_params" /> <printer translate="name" name="Savin 2527" driver="savin-2527" manufacturer="Savin" model="6" parameters="pcl_laser_params" /> <printer translate="name" name="Savin 2532" driver="savin-2532" manufacturer="Savin" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Savin 2535" driver="savin-2535" manufacturer="Savin" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Savin 2235" driver="savin-2235" manufacturer="Savin" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Savin 2545" driver="savin-2545" manufacturer="Savin" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Savin 2245" driver="savin-2245" manufacturer="Savin" model="6" parameters="pcl_laser_params" /> + <printer translate="name" name="Savin 2535/2235" driver="savin-2235" manufacturer="Savin" model="6" parameters="pcl_laser_params" /> + <printer translate="name" name="Savin 2545/2245" driver="savin-2245" manufacturer="Savin" model="6" parameters="pcl_laser_params" /> <printer translate="name" name="Savin 2560" driver="savin-2560" manufacturer="Savin" model="6" parameters="pcl_laser_params" /> <printer translate="name" name="Savin 2575" driver="savin-2575" manufacturer="Savin" model="6" parameters="pcl_laser_params" /> <printer translate="name" name="Savin 3515" driver="savin-3515" manufacturer="Savin" model="6" parameters="pcl_laser_params" /> @@ -1452,14 +1390,10 @@ <printer translate="name" name="Savin 4018d" driver="savin-4018d" manufacturer="Savin" model="6" parameters="pcl_laser_params" /> <printer translate="name" name="Savin 4022" driver="savin-4022" manufacturer="Savin" model="6" parameters="pcl_laser_params" /> <printer translate="name" name="Savin 4027" driver="savin-4027" manufacturer="Savin" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Savin 4035" driver="savin-4035" manufacturer="Savin" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Savin 4135g" driver="savin-4135g" manufacturer="Savin" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Savin 4035e" driver="savin-4035e" manufacturer="Savin" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Savin 4135eG" driver="savin-4135eg" manufacturer="Savin" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Savin 4045" driver="savin-4045" manufacturer="Savin" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Savin 4145g" driver="savin-4145g" manufacturer="Savin" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Savin 4045e" driver="savin-4045e" manufacturer="Savin" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Savin 4145eG" driver="savin-4145eg" manufacturer="Savin" model="6" parameters="pcl_laser_params" /> + <printer translate="name" name="Savin 4035/4135g" driver="savin-4135g" manufacturer="Savin" model="6" parameters="pcl_laser_params" /> + <printer translate="name" name="Savin 4035e/4135eG" driver="savin-4135eg" manufacturer="Savin" model="6" parameters="pcl_laser_params" /> + <printer translate="name" name="Savin 4045/4145g" driver="savin-4145g" manufacturer="Savin" model="6" parameters="pcl_laser_params" /> + <printer translate="name" name="Savin 4045e/4145eG" driver="savin-4145eg" manufacturer="Savin" model="6" parameters="pcl_laser_params" /> <printer translate="name" name="Savin 4051" driver="savin-4051" manufacturer="Savin" model="6" parameters="pcl_laser_params" /> <printer translate="name" name="Savin 4060" driver="savin-4060" manufacturer="Savin" model="6" parameters="pcl_laser_params" /> <printer translate="name" name="Savin 4075" driver="savin-4075" manufacturer="Savin" model="6" parameters="pcl_laser_params" /> @@ -1472,11 +1406,9 @@ <printer translate="name" name="Savin 8025e" driver="savin-8025e" manufacturer="Savin" model="6" parameters="pcl_laser_params" /> <printer translate="name" name="Savin 8030" driver="savin-8030" manufacturer="Savin" model="6" parameters="pcl_laser_params" /> <printer translate="name" name="Savin 8030e" driver="savin-8030e" manufacturer="Savin" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Savin 8035" driver="savin-8035" manufacturer="Savin" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Savin 8035g" driver="savin-8035g" manufacturer="Savin" model="6" parameters="pcl_laser_params" /> + <printer translate="name" name="Savin 8035/8035g" driver="savin-8035g" manufacturer="Savin" model="6" parameters="pcl_laser_params" /> <printer translate="name" name="Savin 8035e" driver="savin-8035e" manufacturer="Savin" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Savin 8045" driver="savin-8045" manufacturer="Savin" model="6" parameters="pcl_laser_params" /> - <printer translate="name" name="Savin 8045g" driver="savin-8045g" manufacturer="Savin" model="6" parameters="pcl_laser_params" /> + <printer translate="name" name="Savin 8045/8045g" driver="savin-8045g" manufacturer="Savin" model="6" parameters="pcl_laser_params" /> <printer translate="name" name="Savin 8045e" driver="savin-8045e" manufacturer="Savin" model="6" parameters="pcl_laser_params" /> <printer translate="name" name="Savin 8055" driver="savin-8055" manufacturer="Savin" model="6" parameters="pcl_laser_params" /> <printer translate="name" name="Savin 8065" driver="savin-8065" manufacturer="Savin" model="6" parameters="pcl_laser_params" /> @@ -1547,6 +1479,7 @@ <printer translate="name" name="Canon SELPHY-CP-400" driver="canon-cp400" manufacturer="Canon" model="1001" /> <printer translate="name" name="Canon SELPHY-CP-500" driver="canon-cp500" manufacturer="Canon" model="1001" /> <printer translate="name" name="Canon SELPHY-CP-510" driver="canon-cp510" manufacturer="Canon" model="1001" /> + <printer translate="name" name="Canon SELPHY-CP-520" driver="canon-cp520" manufacturer="Canon" model="1004" /> <printer translate="name" name="Canon SELPHY-CP-600" driver="canon-cp600" manufacturer="Canon" model="1001" /> <printer translate="name" name="Canon SELPHY-CP-710" driver="canon-cp710" manufacturer="Canon" model="1001" /> <printer translate="name" name="Canon SELPHY-CP-720" driver="canon-cp720" manufacturer="Canon" model="1001" /> @@ -1566,6 +1499,8 @@ <printer translate="name" name="Fujifilm FinePix-NX-500" driver="fujifilm-nx500" manufacturer="Fujifilm" model="3002" /> <printer translate="name" name="Kodak Easyshare-Printer-Dock" driver="kodak-dock" manufacturer="Kodak" model="4000"/> <printer translate="name" name="Shinko CHC-S9045" driver="shinko-chcs9045" manufacturer="Shinko" model="5000"/> + <printer translate="name" name="Dai Nippon Printing DS40" driver="dnp-ds40" manufacturer="DNP" model="6000"/> + <printer translate="name" name="Dai Nippon Printing DS80" driver="dnp-ds80" manufacturer="DNP" model="6001"/> </family> <family name="raw"> <printer translate="name" name="RAW DATA 16 bit" driver="raw-data-16" manufacturer="" model="0" /> |