Imported Upstream version 5.2.1

284 files changed, 73049 insertions, 13255 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index fc635f1..2123bad 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.20 2006/09/18 02:31:57 rlk Exp $
+## $Id: Makefile.am,v 1.22 2008/06/14 02:45:19 rlk Exp $
 ## Copyright (C) 2000 Roger Leigh
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -23,7 +23,8 @@ include $(top_srcdir)/scripts/global.mk
 
 SUBDIRS = 					\
 	main					\
-	gutenprintui2			\
+	xml					\
+	gutenprintui2				\
 	escputil				\
 	gimp2					\
 	cups					\
diff --git a/src/Makefile.in b/src/Makefile.in
index 77e3e94..afa9459 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,7 +17,7 @@
 # Variables
 
 #export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
-#export STP_DATA_PATH = $(top_srcdir)/src/main
+#export STP_DATA_PATH = $(top_srcdir)/src/xml
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -43,7 +43,8 @@ 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/progtest.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
@@ -98,6 +99,7 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
+DSYMUTIL = @DSYMUTIL@
 DVIPDF = @DVIPDF@
 DVIPS = @DVIPS@
 ECHO = @ECHO@
@@ -118,6 +120,7 @@ GIMP2_LIBS = @GIMP2_LIBS@
 GIMPTOOL2_CHECK = @GIMPTOOL2_CHECK@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
 GNUCFLAGS = @GNUCFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
@@ -150,6 +153,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
@@ -170,9 +174,10 @@ MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -199,6 +204,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WHICH_PPDS = @WHICH_PPDS@
 XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
 abs_builddir = @abs_builddir@
@@ -270,7 +276,8 @@ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS
 GUTENPRINTUI_LIBS = $(top_builddir)/src/gutenprintui/libgutenprintui.la
 SUBDIRS = \
 	main					\
-	gutenprintui2			\
+	xml					\
+	gutenprintui2				\
 	escputil				\
 	gimp2					\
 	cups					\
@@ -393,8 +400,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -419,8 +426,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -430,13 +437,12 @@ ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff --git a/src/cups/Info.plist.in b/src/cups/Info.plist.in
new file mode 100644
index 0000000..c89a5dd
--- /dev/null
+++ b/src/cups/Info.plist.in
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+        <key>CFBundleDisplayName</key>
+        <string>Gutenprint</string>
+	<key>CFBundleExecutable</key>
+	<string>rastertogutenprint.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@</string>
+        <key>CFBundleGetInfoString</key>
+        <string>@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@.@GUTENPRINT_MICRO_VERSION@, Copyright 1993-2008 Mike Sweet and Robert Krawitz</string>
+	<key>CFBundleIdentifier</key>
+	<string>org.cups.gutenprint</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+        <key>CFBundleName</key>
+        <string>Gutenprint</string>
+	<key>CFBundlePackageType</key>
+	<string>BNDL</string>
+        <key>CFBundleShortVersionString</key>
+        <string>@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@.@GUTENPRINT_MICRO_VERSION@</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@.@GUTENPRINT_MICRO_VERSION@</string>
+</dict>
+</plist>
diff --git a/src/cups/Makefile.am b/src/cups/Makefile.am
index 0331e80..c093bde 100644
--- a/src/cups/Makefile.am
+++ b/src/cups/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.96 2008/04/06 01:10:52 rlk Exp $
+## $Id: Makefile.am,v 1.118 2008/09/22 03:10:45 easysw Exp $
 ## Copyright (C) 2000 Roger Leigh
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -45,14 +45,20 @@ endif
 
 LOCAL_CPPFLAGS = $(GUTENPRINT_CFLAGS) $(CUPS_CFLAGS)
 
-STP_ENV= STP_MODULE_PATH=$(top_builddir)/src/main/.libs:$(top_builddir)/src/main STP_DATA_PATH=$(top_srcdir)/src/main
+STP_ENV= STP_MODULE_PATH=$(top_builddir)/src/main/.libs:$(top_builddir)/src/main STP_DATA_PATH=$(top_srcdir)/src/xml STP_LOCALEDIR=$(top_srcdir)/src/cups/catalog
 
 ## Programs
 
 if BUILD_TRANSLATED_CUPS_PPDS
-PPD_NLS = $(PPD_NLS_1)
+if BUILD_GLOBALIZED_CUPS_PPDS
+PPD = ppd-global
+else
+PPD = $(PPD_NLS_1)
+endif
 LINGUAS = $(ALL_LINGUAS)
 TRANSLATE_PPDS = -DCUPS_TRANSLATED_PPDS
+else
+PPD = ppd-nonls
 endif
 
 if BUILD_SIMPLIFIED_CUPS_PPDS
@@ -86,18 +92,18 @@ commandtocanon_LDADD = $(CUPS_LIBS)
 commandtoepson_SOURCES = commandtoepson.c
 commandtoepson_LDADD = $(CUPS_LIBS)
 
-cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_SOURCES = genppd.c
+cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_SOURCES = genppd.c i18n.c i18n.h
 cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_CFLAGS = -DALL_LINGUAS='"@ALL_LINGUAS@"' $(BUILD_SIMPLE_PPDS) $(TRANSLATE_PPDS)
-cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDADD = $(CUPS_LIBS) $(GENPPD_LIBS) $(GUTENPRINT_LIBS)
+cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDADD = $(CUPS_LIBS) $(GENPPD_LIBS) $(GUTENPRINT_LIBS) @LIBICONV@
 cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDFLAGS = $(STATIC_LDOPTS)
 
-gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_SOURCES = genppd.c
+gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_SOURCES = genppd.c i18n.c i18n.h
 gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_CFLAGS = -DCUPS_DRIVER_INTERFACE -DALL_LINGUAS='"@ALL_LINGUAS@"' $(BUILD_SIMPLE_PPDS) $(TRANSLATE_PPDS)
-gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDADD = $(CUPS_LIBS) $(GUTENPRINT_LIBS)
+gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDADD = $(CUPS_LIBS) $(GUTENPRINT_LIBS) @LIBICONV@
 gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDFLAGS = $(STATIC_LDOPTS)
 
-rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_SOURCES = rastertoprinter.c
-rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDADD = $(CUPS_LIBS) $(GUTENPRINT_LIBS)
+rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_SOURCES = rastertoprinter.c i18n.c i18n.h
+rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDADD = $(CUPS_LIBS) $(GUTENPRINT_LIBS) @LIBICONV@
 rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDFLAGS = $(STATIC_LDOPTS)
 
 ## Data
@@ -121,8 +127,6 @@ PPD_NLS_1 = ppd-nls
 endif
 
 
-## Rules
-
 install-data-local: $(INSTALL_DATA_LOCAL_DEPS)
 	if test -n "$(CUPS_PKG)" -a -n "$(INSTALL_DATA_LOCAL_DEPS)" ; then \
 	  $(mkdir_p) $(DESTDIR)$(cups_modeldir); \
@@ -137,14 +141,24 @@ install-data-local: $(INSTALL_DATA_LOCAL_DEPS)
 	  cd ..; \
 	  done \
 	fi
+	$(mkdir_p) "$(DESTDIR)$(localedir)"
+	for file in $(srcdir)/../../po/*.po; do \
+	  lang=`basename $$file .po`; \
+	  $(mkdir_p) "$(DESTDIR)$(localedir)/$$lang"; \
+	  $(INSTALL_DATA) $$file "$(DESTDIR)$(localedir)/$$lang/gutenprint_$$lang.po"; \
+	done
 
 uninstall-local: $(INSTALL_DATA_LOCAL_DEPS)
 # Remove PPDs installed in new PPD location
 	if test -z "DONT_UNINSTALL_PPDS" ; then \
 	  if test -n "$(INSTALL_DATA_LOCAL_DEPS)" ; then \
 	    $(RM) -fr $(DESTDIR)$(cups_modeldir)/* ; \
-	  fi \
+	  fi ; \
 	fi
+	for file in $(srcdir)/../../po/*.po; do \
+	  lang=`basename $$file .po`; \
+	  $(RM) "$(DESTDIR)$(localedir)/$$lang/gutenprint_$$lang.po"; \
+	done
 
 install-data-hook:
 # Remove unused directories in install tree
@@ -167,34 +181,47 @@ all-local: $(INSTALL_DATA_LOCAL_DEPS)
 
 ppd: ppd-stamp
 
-ppd-stamp: cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ $(top_srcdir)/src/main/printers.xml $(top_srcdir)/src/main/papers.xml
+ppd-stamp: cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ $(top_srcdir)/src/xml/xml-stamp
 	$(MAKE) ppd-stamp-phony
 	touch ppd-stamp
 
-ppd-stamp-phony: ppd-stamp-pre ppd-nonls $(PPD_NLS)
+ppd-stamp-phony: ppd-stamp-pre $(PPD)
 
 ppd-stamp-pre:
 	-$(RM) -r ppd
-	-mkdir ppd
 
-ppd-nonls: cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@
-	for language in C ; do \
-	  mkdir ppd/$$language ; \
-	  echo "$$language:" ; \
-	  LC_ALL=$$language LANG=$$language LANGUAGE=$$language $(STP_ENV) ./cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ @WHICH_PPDS@ -p ppd/$$language ; \
+ppd-catalog:
+	$(mkdir_p) catalog
+	for file in $(srcdir)/../../po/*.po; do \
+	  lang=`basename $$file .po`; \
+	  $(mkdir_p) "catalog/$$lang"; \
+	  $(INSTALL_DATA) $$file "catalog/$$lang/gutenprint_$$lang.po"; \
 	done
 
-ppd-nls: cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@
-	wdir=`pwd` ; \
-	cd $(top_builddir)/po ; \
-	$(MAKE) ; \
-	$(MAKE) DESTDIR= prefix=$${wdir}/catalog datadir=$${wdir}/catalog/share install
-	for language in `$(STP_ENV) ./cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ -L -c \`pwd\`/catalog/share/locale` ; do \
+ppd-nonls: cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@
+	$(mkdir_p) ppd/C
+	LC_ALL= LANG= LANGUAGE= $(STP_ENV) ./cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ @WHICH_PPDS@ -l C -p ppd/C
+
+ppd-global: cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ ppd-catalog
+	$(mkdir_p) ppd/Global
+	@echo "Global PPDs:"
+	LC_ALL= LANG= LANGUAGE= $(STP_ENV) ./cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ @WHICH_PPDS@ -p ppd/Global
+	-$(RM) -r catalog
+
+ppd-global-ln: cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ ppd-catalog
+	$(mkdir_p) ppd/Global
+	@echo "Global PPDs (localized numbers for testing):"
+	LC_ALL= LANG= LANGUAGE= $(STP_ENV) ./cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ @WHICH_PPDS@ -p ppd/Global -N
+	-$(RM) -r catalog
+
+ppd-nls: cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ ppd-catalog ppd-nonls
+	$(mkdir_p) ppd
+	for language in `$(STP_ENV) ./cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ -L` ; do \
 	  mkdir ppd/$$language ; \
 	  echo "$$language:" ; \
-	  LC_ALL=$$language LANG=$$language LANGUAGE=$$language $(STP_ENV) ./cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ @WHICH_PPDS@ -l $$language -p ppd/$$language -c `pwd`/catalog/share/locale ; \
+	  LC_ALL=$$language LANG=$$language LANGUAGE=$$language $(STP_ENV) ./cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ @WHICH_PPDS@ -l $$language -p ppd/$$language; \
 	done
-	$(RM) -r catalog
+	-$(RM) -r catalog
 
 dist-hook:
 	for dir in commands ; do \
@@ -227,3 +254,4 @@ EXTRA_DIST = \
 	test-ppds
 
 
+
diff --git a/src/cups/Makefile.in b/src/cups/Makefile.in
index fd5895c..4bbd121 100644
--- a/src/cups/Makefile.in
+++ b/src/cups/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,7 +17,7 @@
 # Variables
 
 #export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
-#export STP_DATA_PATH = $(top_srcdir)/src/main
+#export STP_DATA_PATH = $(top_srcdir)/src/xml
 
 
 
@@ -37,8 +37,8 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/cups-genppdupdate.in \
+DIST_COMMON = README $(srcdir)/Info.plist.in $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in $(srcdir)/cups-genppdupdate.in \
 	$(srcdir)/test-rastertogutenprint.in \
 	$(top_srcdir)/scripts/global.mk COPYING
 @BUILD_CUPS_1_2_TRUE@cupsexec_driver_PROGRAMS = gutenprint.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@$(EXEEXT)
@@ -52,7 +52,8 @@ 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/progtest.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
@@ -60,7 +61,8 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES = cups-genppdupdate test-rastertogutenprint
+CONFIG_CLEAN_FILES = Info.plist cups-genppdupdate \
+	test-rastertogutenprint
 am__installdirs = "$(DESTDIR)$(bindir)" \
 	"$(DESTDIR)$(cupsexec_driverdir)" \
 	"$(DESTDIR)$(cupsexec_filterdir)" "$(DESTDIR)$(sbindir)" \
@@ -82,7 +84,8 @@ commandtoepson_DEPENDENCIES = $(am__DEPENDENCIES_1)
 am_cups_calibrate_OBJECTS = cups-calibrate.$(OBJEXT)
 cups_calibrate_OBJECTS = $(am_cups_calibrate_OBJECTS)
 cups_calibrate_DEPENDENCIES =
-am_cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_OBJECTS = cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-genppd.$(OBJEXT)
+am_cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_OBJECTS = cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-genppd.$(OBJEXT) \
+	cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-i18n.$(OBJEXT)
 cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_OBJECTS = $(am_cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_OBJECTS)
 cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_DEPENDENCIES =  \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) $(GUTENPRINT_LIBS)
@@ -93,7 +96,8 @@ cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LINK =  \
 	$(CFLAGS) \
 	$(cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDFLAGS) \
 	$(LDFLAGS) -o $@
-am_gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_OBJECTS = gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-genppd.$(OBJEXT)
+am_gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_OBJECTS = gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-genppd.$(OBJEXT) \
+	gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-i18n.$(OBJEXT)
 gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_OBJECTS = $(am_gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_OBJECTS)
 gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_DEPENDENCIES =  \
 	$(am__DEPENDENCIES_1) $(GUTENPRINT_LIBS)
@@ -105,7 +109,7 @@ gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LINK =  \
 	$(gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDFLAGS) \
 	$(LDFLAGS) -o $@
 am_rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_OBJECTS =  \
-	rastertoprinter.$(OBJEXT)
+	rastertoprinter.$(OBJEXT) i18n.$(OBJEXT)
 rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_OBJECTS = $(am_rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_OBJECTS)
 rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_DEPENDENCIES =  \
 	$(am__DEPENDENCIES_1) $(GUTENPRINT_LIBS)
@@ -116,7 +120,7 @@ rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LINK =
 	$(LDFLAGS) -o $@
 sbinSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 SCRIPTS = $(noinst_SCRIPTS) $(sbin_SCRIPTS)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -183,6 +187,7 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
+DSYMUTIL = @DSYMUTIL@
 DVIPDF = @DVIPDF@
 DVIPS = @DVIPS@
 ECHO = @ECHO@
@@ -203,6 +208,7 @@ GIMP2_LIBS = @GIMP2_LIBS@
 GIMPTOOL2_CHECK = @GIMPTOOL2_CHECK@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
 GNUCFLAGS = @GNUCFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
@@ -235,6 +241,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
@@ -255,9 +262,10 @@ MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = cups
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -284,6 +292,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WHICH_PPDS = @WHICH_PPDS@
 XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
 abs_builddir = @abs_builddir@
@@ -361,8 +370,10 @@ cupsexec_filterdir = $(pkglibdir)/filter
 @CUPS_PPDS_AT_TOP_LEVEL_TRUE@cups_modeldir = $(pkgdatadir)/model/
 @CUPS_PPDS_AT_TOP_LEVEL_TRUE@DONT_UNINSTALL_PPDS = true
 LOCAL_CPPFLAGS = $(GUTENPRINT_CFLAGS) $(CUPS_CFLAGS)
-STP_ENV = STP_MODULE_PATH=$(top_builddir)/src/main/.libs:$(top_builddir)/src/main STP_DATA_PATH=$(top_srcdir)/src/main
-@BUILD_TRANSLATED_CUPS_PPDS_TRUE@PPD_NLS = $(PPD_NLS_1)
+STP_ENV = STP_MODULE_PATH=$(top_builddir)/src/main/.libs:$(top_builddir)/src/main STP_DATA_PATH=$(top_srcdir)/src/xml STP_LOCALEDIR=$(top_srcdir)/src/cups/catalog
+@BUILD_GLOBALIZED_CUPS_PPDS_FALSE@@BUILD_TRANSLATED_CUPS_PPDS_TRUE@PPD = $(PPD_NLS_1)
+@BUILD_GLOBALIZED_CUPS_PPDS_TRUE@@BUILD_TRANSLATED_CUPS_PPDS_TRUE@PPD = ppd-global
+@BUILD_TRANSLATED_CUPS_PPDS_FALSE@PPD = ppd-nonls
 @BUILD_TRANSLATED_CUPS_PPDS_TRUE@LINGUAS = $(ALL_LINGUAS)
 @BUILD_TRANSLATED_CUPS_PPDS_TRUE@TRANSLATE_PPDS = -DCUPS_TRANSLATED_PPDS
 @BUILD_SIMPLIFIED_CUPS_PPDS_TRUE@BUILD_SIMPLE_PPDS = -DGENERATE_SIMPLIFIED_PPDS
@@ -376,16 +387,16 @@ commandtocanon_SOURCES = commandtocanon.c
 commandtocanon_LDADD = $(CUPS_LIBS)
 commandtoepson_SOURCES = commandtoepson.c
 commandtoepson_LDADD = $(CUPS_LIBS)
-cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_SOURCES = genppd.c
+cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_SOURCES = genppd.c i18n.c i18n.h
 cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_CFLAGS = -DALL_LINGUAS='"@ALL_LINGUAS@"' $(BUILD_SIMPLE_PPDS) $(TRANSLATE_PPDS)
-cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDADD = $(CUPS_LIBS) $(GENPPD_LIBS) $(GUTENPRINT_LIBS)
+cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDADD = $(CUPS_LIBS) $(GENPPD_LIBS) $(GUTENPRINT_LIBS) @LIBICONV@
 cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDFLAGS = $(STATIC_LDOPTS)
-gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_SOURCES = genppd.c
+gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_SOURCES = genppd.c i18n.c i18n.h
 gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_CFLAGS = -DCUPS_DRIVER_INTERFACE -DALL_LINGUAS='"@ALL_LINGUAS@"' $(BUILD_SIMPLE_PPDS) $(TRANSLATE_PPDS)
-gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDADD = $(CUPS_LIBS) $(GUTENPRINT_LIBS)
+gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDADD = $(CUPS_LIBS) $(GUTENPRINT_LIBS) @LIBICONV@
 gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDFLAGS = $(STATIC_LDOPTS)
-rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_SOURCES = rastertoprinter.c
-rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDADD = $(CUPS_LIBS) $(GUTENPRINT_LIBS)
+rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_SOURCES = rastertoprinter.c i18n.c i18n.h
+rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDADD = $(CUPS_LIBS) $(GUTENPRINT_LIBS) @LIBICONV@
 rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDFLAGS = $(STATIC_LDOPTS)
 @BUILD_CUPS_TRUE@CUPS_PKG = calibrate.ppm
 @BUILD_CUPS_TRUE@CUPS_CONF = command.types
@@ -437,6 +448,8 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+Info.plist: $(top_builddir)/config.status $(srcdir)/Info.plist.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 cups-genppdupdate: $(top_builddir)/config.status $(srcdir)/cups-genppdupdate.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 test-rastertogutenprint: $(top_builddir)/config.status $(srcdir)/test-rastertogutenprint.in
@@ -450,8 +463,8 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	     || test -f $$p1 \
 	  ; then \
 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -478,8 +491,8 @@ install-cupsexec_driverPROGRAMS: $(cupsexec_driver_PROGRAMS)
 	     || test -f $$p1 \
 	  ; then \
 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(cupsexec_driverPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(cupsexec_driverdir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(cupsexec_driverPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(cupsexec_driverdir)/$$f" || exit 1; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(cupsexec_driverPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(cupsexec_driverdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(cupsexec_driverPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(cupsexec_driverdir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -506,8 +519,8 @@ install-cupsexec_filterPROGRAMS: $(cupsexec_filter_PROGRAMS)
 	     || test -f $$p1 \
 	  ; then \
 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(cupsexec_filterPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(cupsexec_filterdir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(cupsexec_filterPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(cupsexec_filterdir)/$$f" || exit 1; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(cupsexec_filterPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(cupsexec_filterdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(cupsexec_filterPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(cupsexec_filterdir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -534,8 +547,8 @@ install-sbinPROGRAMS: $(sbin_PROGRAMS)
 	     || test -f $$p1 \
 	  ; then \
 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -601,7 +614,10 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/commandtoepson.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cups-calibrate.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-genppd.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-i18n.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-genppd.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-i18n.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i18n.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rastertoprinter.Po@am__quote@
 
 .c.o:
@@ -639,6 +655,20 @@ cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-genppd.obj: ge
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_CFLAGS) $(CFLAGS) -c -o cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-genppd.obj `if test -f 'genppd.c'; then $(CYGPATH_W) 'genppd.c'; else $(CYGPATH_W) '$(srcdir)/genppd.c'; fi`
 
+cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-i18n.o: i18n.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_CFLAGS) $(CFLAGS) -MT cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-i18n.o -MD -MP -MF $(DEPDIR)/cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-i18n.Tpo -c -o cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-i18n.o `test -f 'i18n.c' || echo '$(srcdir)/'`i18n.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-i18n.Tpo $(DEPDIR)/cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-i18n.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='i18n.c' object='cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-i18n.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_CFLAGS) $(CFLAGS) -c -o cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-i18n.o `test -f 'i18n.c' || echo '$(srcdir)/'`i18n.c
+
+cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-i18n.obj: i18n.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_CFLAGS) $(CFLAGS) -MT cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-i18n.obj -MD -MP -MF $(DEPDIR)/cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-i18n.Tpo -c -o cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-i18n.obj `if test -f 'i18n.c'; then $(CYGPATH_W) 'i18n.c'; else $(CYGPATH_W) '$(srcdir)/i18n.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-i18n.Tpo $(DEPDIR)/cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-i18n.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='i18n.c' object='cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-i18n.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_CFLAGS) $(CFLAGS) -c -o cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-i18n.obj `if test -f 'i18n.c'; then $(CYGPATH_W) 'i18n.c'; else $(CYGPATH_W) '$(srcdir)/i18n.c'; fi`
+
 gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-genppd.o: genppd.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_CFLAGS) $(CFLAGS) -MT gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-genppd.o -MD -MP -MF $(DEPDIR)/gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-genppd.Tpo -c -o gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-genppd.o `test -f 'genppd.c' || echo '$(srcdir)/'`genppd.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-genppd.Tpo $(DEPDIR)/gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-genppd.Po
@@ -653,6 +683,20 @@ gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-genppd.obj: gen
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_CFLAGS) $(CFLAGS) -c -o gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-genppd.obj `if test -f 'genppd.c'; then $(CYGPATH_W) 'genppd.c'; else $(CYGPATH_W) '$(srcdir)/genppd.c'; fi`
 
+gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-i18n.o: i18n.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_CFLAGS) $(CFLAGS) -MT gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-i18n.o -MD -MP -MF $(DEPDIR)/gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-i18n.Tpo -c -o gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-i18n.o `test -f 'i18n.c' || echo '$(srcdir)/'`i18n.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-i18n.Tpo $(DEPDIR)/gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-i18n.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='i18n.c' object='gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-i18n.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_CFLAGS) $(CFLAGS) -c -o gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-i18n.o `test -f 'i18n.c' || echo '$(srcdir)/'`i18n.c
+
+gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-i18n.obj: i18n.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_CFLAGS) $(CFLAGS) -MT gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-i18n.obj -MD -MP -MF $(DEPDIR)/gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-i18n.Tpo -c -o gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-i18n.obj `if test -f 'i18n.c'; then $(CYGPATH_W) 'i18n.c'; else $(CYGPATH_W) '$(srcdir)/i18n.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-i18n.Tpo $(DEPDIR)/gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-i18n.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='i18n.c' object='gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-i18n.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_CFLAGS) $(CFLAGS) -c -o gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-i18n.obj `if test -f 'i18n.c'; then $(CYGPATH_W) 'i18n.c'; else $(CYGPATH_W) '$(srcdir)/i18n.c'; fi`
+
 mostlyclean-libtool:
 	-rm -f *.lo
 
@@ -698,8 +742,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -711,8 +755,8 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -722,13 +766,12 @@ ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
@@ -1003,14 +1046,24 @@ install-data-local: $(INSTALL_DATA_LOCAL_DEPS)
 	  cd ..; \
 	  done \
 	fi
+	$(mkdir_p) "$(DESTDIR)$(localedir)"
+	for file in $(srcdir)/../../po/*.po; do \
+	  lang=`basename $$file .po`; \
+	  $(mkdir_p) "$(DESTDIR)$(localedir)/$$lang"; \
+	  $(INSTALL_DATA) $$file "$(DESTDIR)$(localedir)/$$lang/gutenprint_$$lang.po"; \
+	done
 
 uninstall-local: $(INSTALL_DATA_LOCAL_DEPS)
 # Remove PPDs installed in new PPD location
 	if test -z "DONT_UNINSTALL_PPDS" ; then \
 	  if test -n "$(INSTALL_DATA_LOCAL_DEPS)" ; then \
 	    $(RM) -fr $(DESTDIR)$(cups_modeldir)/* ; \
-	  fi \
+	  fi ; \
 	fi
+	for file in $(srcdir)/../../po/*.po; do \
+	  lang=`basename $$file .po`; \
+	  $(RM) "$(DESTDIR)$(localedir)/$$lang/gutenprint_$$lang.po"; \
+	done
 
 install-data-hook:
 # Remove unused directories in install tree
@@ -1033,34 +1086,47 @@ all-local: $(INSTALL_DATA_LOCAL_DEPS)
 
 ppd: ppd-stamp
 
-ppd-stamp: cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ $(top_srcdir)/src/main/printers.xml $(top_srcdir)/src/main/papers.xml
+ppd-stamp: cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ $(top_srcdir)/src/xml/xml-stamp
 	$(MAKE) ppd-stamp-phony
 	touch ppd-stamp
 
-ppd-stamp-phony: ppd-stamp-pre ppd-nonls $(PPD_NLS)
+ppd-stamp-phony: ppd-stamp-pre $(PPD)
 
 ppd-stamp-pre:
 	-$(RM) -r ppd
-	-mkdir ppd
 
-ppd-nonls: cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@
-	for language in C ; do \
-	  mkdir ppd/$$language ; \
-	  echo "$$language:" ; \
-	  LC_ALL=$$language LANG=$$language LANGUAGE=$$language $(STP_ENV) ./cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ @WHICH_PPDS@ -p ppd/$$language ; \
+ppd-catalog:
+	$(mkdir_p) catalog
+	for file in $(srcdir)/../../po/*.po; do \
+	  lang=`basename $$file .po`; \
+	  $(mkdir_p) "catalog/$$lang"; \
+	  $(INSTALL_DATA) $$file "catalog/$$lang/gutenprint_$$lang.po"; \
 	done
 
-ppd-nls: cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@
-	wdir=`pwd` ; \
-	cd $(top_builddir)/po ; \
-	$(MAKE) ; \
-	$(MAKE) DESTDIR= prefix=$${wdir}/catalog datadir=$${wdir}/catalog/share install
-	for language in `$(STP_ENV) ./cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ -L -c \`pwd\`/catalog/share/locale` ; do \
+ppd-nonls: cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@
+	$(mkdir_p) ppd/C
+	LC_ALL= LANG= LANGUAGE= $(STP_ENV) ./cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ @WHICH_PPDS@ -l C -p ppd/C
+
+ppd-global: cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ ppd-catalog
+	$(mkdir_p) ppd/Global
+	@echo "Global PPDs:"
+	LC_ALL= LANG= LANGUAGE= $(STP_ENV) ./cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ @WHICH_PPDS@ -p ppd/Global
+	-$(RM) -r catalog
+
+ppd-global-ln: cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ ppd-catalog
+	$(mkdir_p) ppd/Global
+	@echo "Global PPDs (localized numbers for testing):"
+	LC_ALL= LANG= LANGUAGE= $(STP_ENV) ./cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ @WHICH_PPDS@ -p ppd/Global -N
+	-$(RM) -r catalog
+
+ppd-nls: cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ ppd-catalog ppd-nonls
+	$(mkdir_p) ppd
+	for language in `$(STP_ENV) ./cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ -L` ; do \
 	  mkdir ppd/$$language ; \
 	  echo "$$language:" ; \
-	  LC_ALL=$$language LANG=$$language LANGUAGE=$$language $(STP_ENV) ./cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ @WHICH_PPDS@ -l $$language -p ppd/$$language -c `pwd`/catalog/share/locale ; \
+	  LC_ALL=$$language LANG=$$language LANGUAGE=$$language $(STP_ENV) ./cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ @WHICH_PPDS@ -l $$language -p ppd/$$language; \
 	done
-	$(RM) -r catalog
+	-$(RM) -r catalog
 
 dist-hook:
 	for dir in commands ; do \
diff --git a/src/cups/cups-genppdupdate.in b/src/cups/cups-genppdupdate.in
index 9892ce0..48324ee 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.42 2008/04/12 01:20:33 rlk Exp $
+# $Id: cups-genppdupdate.in,v 1.53 2008/09/22 11:04:24 rlk Exp $
 # Update CUPS PPDs for Gutenprint queues.
 # Copyright (C) 2002-2003 Roger Leigh (rleigh@debian.org)
 #
@@ -20,8 +20,6 @@
 use strict;
 use Getopt::Std;
 use Fcntl qw(:mode);
-use File::Temp qw(:POSIX);
-use File::Copy qw(mv);
 
 sub parse_options ();
 sub update_ppd ($); # Original PPD filename
@@ -43,6 +41,7 @@ our $opt_o; # Output directory
 our $opt_r; # Gutenprint version
 our $opt_i; # Interactive
 our $opt_f; # Force upgrade
+our $opt_l; # Language
 
 my $debug = 0;
 my $verbose = 0;   # Verbose output
@@ -64,6 +63,7 @@ my $updated_ppd_count = 0;
 my $skipped_ppd_count = 0;
 my $failed_ppd_count = 0;
 my $exit_after_parse_args = 0;
+my @languages = qw(Global C @ALL_LINGUAS@);
 
 my $serverdir = "@cups_conf_serverbin@";
 my $driver_bin = "$serverdir/driver/gutenprint.$version";
@@ -170,7 +170,11 @@ if (!$quiet || $verbose) {
 	print STDOUT "No Gutenprint PPD files to update.\n";
     } elsif ($updated_ppd_count > 0) {
 	my $plural = $updated_ppd_count == 1 ? "" : "s";
-	print STDOUT "Updated $updated_ppd_count PPD file${plural}.  Restart cupsd for the changes to take effect.\n";
+	print STDOUT "Updated $updated_ppd_count PPD file${plural}.";
+	if (!defined $opt_o || $opt_o ne "") {
+	    print STDOUT "Restart cupsd for the changes to take effect.";
+	}
+	print STDOUT "\n";
     } else {
 	if ($failed_ppd_count > 0) {
 	    print STDOUT "Failed to update any PPD files\n";
@@ -198,6 +202,10 @@ sub HELP_MESSAGE($;$$$) {
     print $fh "  -r version  Use PPD files for Gutenprint major.minor version.\n";
     print $fh "  -f          Ignore new PPD file safety checks.\n";
     print $fh "  -i          Prompt (interactively) for each PPD file.\n";
+    print $fh "  -l language Language choice (Gutenprint 5.1 or below).\n";
+    print $fh "              Choices: " . join(" ", @languages) . "\n";
+    print $fh "              Or -loriginal to preserve original language\n";
+    print $fh "                 with Gutenprint 5.2 or above\n";
     exit(0);
 }
 
@@ -216,7 +224,7 @@ sub help() {
 }
 
 sub parse_options () {
-    if (!getopts('d:hnqs:vNo:p:P:r:if')) {
+    if (!getopts('d:hnqs:vNo:p:P:r:ifl:')) {
 	help();
     }
     if ($opt_n) {
@@ -251,6 +259,7 @@ sub parse_options () {
 		if (-d $opt_s) {
 		    $ppd_base_dir = "$opt_s";
 		    $driver_bin = "";
+		    $use_static_ppd = "yes";
 		} else {
 		    die "$opt_s: invalid directory: $!\n";
 		}
@@ -264,6 +273,7 @@ sub parse_options () {
 	    $file_version = "\"$version";
 	    if (-x $driver_bin) {
 		$driver_version = `$driver_bin VERSION`;
+		$use_static_ppd = "no";
 		chomp $driver_version;
 		$file_version = "\"$driver_version\"\$";
 	    } elsif (! -d $ppd_base_dir && ! -l $ppd_base_dir) {
@@ -276,6 +286,7 @@ sub parse_options () {
 	    $ppd_base_dir = "$opt_s";
 	    $driver_bin = "";
 	    $driver_version = "";
+	    $use_static_ppd = "yes";
 	}
 	else {
 	    die "$opt_s: invalid directory: $!\n";
@@ -292,6 +303,9 @@ sub parse_options () {
     if ($opt_P) {
 	if (-x $opt_P) {
 	    $driver_bin = "$opt_P";
+	    $driver_version = `$driver_bin VERSION`;
+	    chomp $driver_version;
+	    $use_static_ppd = "no";
 	}
 	else {
 	    die "$opt_P: invalid executable: $!\n";
@@ -300,6 +314,10 @@ sub parse_options () {
     if ($opt_h) {
 	help();
     }
+    if ($opt_l && lc $opt_l ne "original" && ! grep { $_ eq $opt_l } @languages) {
+	print STDERR "Unknown language '$opt_l'\n";
+	help();
+    }
     if ($opt_i) {
 	$interactive = 1;
     }
@@ -326,7 +344,9 @@ sub get_ppd_fh($$$$$) {
 	}
 	my ($url);
 	my (@url_list);
-	if ($locale) {
+	if (((defined $opt_r && $opt_r < 5.2) ||
+	     (defined $opt_l && $opt_l ne "")) &&
+	    $locale ne "") {
 	    if ($region) {
 		push @url_list, "gutenprint.$version://$driver/$simplified/${locale}_${region}";
 	    }
@@ -393,11 +413,13 @@ sub update_ppd ($) {
     my ($lingo) = "";
     my ($region) = "";
     my ($valid) = 0;
+    my ($orig_locale) = "";
     while (<ORIG>) {
 	if (/\*StpLocale:/) {
-	    ($locale) = m/^\*StpLocale:\s\"*(.*)\"$/;
+	    ($locale) = m/^\*StpLocale:\s*\"(.*)\"$/;
+	    $orig_locale = $locale;
 	    $valid = 1;
-	} elsif (/\*LanguageVersion/) {
+	} elsif (/^\*LanguageVersion/) {
 	    ($lingo) = m/^\*LanguageVersion:\s*(.*)$/;
 	} elsif (/^\*StpDriverName:/ ) {
 	    ($driver) = m/^\*StpDriverName:\s*\"(.*)\"$/;
@@ -421,18 +443,26 @@ sub update_ppd ($) {
 #	print STDERR "Skipping $ppd_source_filename: not a Gutenprint PPD file\n";
 	return -1;
     }
+    if (defined $opt_l && $opt_l ne "" && lc $opt_l ne "original") {
+	$locale = $opt_l;
+	$orig_locale = $locale;
+    }
     if ($debug & 2) {
 	print "Gutenprint Filename: $filename\n";
-	print "Locale: $locale\n";
+	if ($opt_l) {
+	    print "Locale: $locale (from -l)\n";
+	} else {
+	    print "Locale: $locale\n";
+	}
 	print "Language: $lingo\n";
 	print "Driver: $driver\n";
     }
     if ($locale) {
 	# Split into the language and territory.
-	($locale, $region) = split(/-/, $locale);
+	($locale, $region) = split(/_/, $locale);
     } else {
 	# Split into the language and territory.
-	($locale, $region) = split(/-/, $lingo);
+	($locale, $region) = split(/_/, $lingo);
 	# Convert language into language code.
 	$locale = $languagemappings{"\L$lingo"};
 	if (!defined($locale)) {
@@ -475,7 +505,7 @@ sub update_ppd ($) {
 
     seek(ORIG, 0, 0);
 
-    my ($odt, $oopt, $ores, $odef) = get_ppd_data(ORIG, 1, 0, 0, 1, 0);
+    my ($odt, $oopt, $ores, $odef) = get_ppd_data(ORIG, 1, 0, 1, 1, 0);
     my ($ndt, $nopt, $nres, $ndef, $source_data) = get_ppd_data($source_fd, 1, 1, 1, 1, 1);
 
     # Close original and temporary files...
@@ -492,6 +522,14 @@ sub update_ppd ($) {
     my %new_defaults = %$ndef;
     my %options = %$nopt;
     my %resolution_map = %$nres;
+    my %old_resolution_map = reverse %$ores;
+
+    # Store previous language in the PPD file so that -l original works
+    # correctly.
+
+    if ($orig_locale ne "") {
+	$source_data =~ s/(\*StpLocale:\s*\")(.*)(\")/$1$orig_locale$3/;
+    }
 
     if ($debug & 4) {
 	print "Options (Old->New Default Type):\n";
@@ -518,7 +556,13 @@ sub update_ppd ($) {
 	if (keys %resolution_map) {
 	    print "Resolution Map:\n";
 	    foreach (sort keys %resolution_map) {
-		print "$_: $resolution_map{$_}\n";
+		print "   $_: $resolution_map{$_}\n";
+	    }
+	}
+	if (keys %old_resolution_map) {
+	    print "Old Resolution Map:\n";
+	    foreach (sort keys %old_resolution_map) {
+		print "   $_: $old_resolution_map{$_}\n";
 	    }
 	}
 	print "Non-UI Defaults:\n";
@@ -576,16 +620,31 @@ default_loop:
 		# Check the old setting is valid
 		foreach my $opt (@{$options{$option}}) {
 		    my $def_option = $default_option_value;
-		    if (($def_option eq $opt) ||
-			($option eq "Resolution" &&
-			 (defined $resolution_map{$default_option_value}) &&
-			 ($def_option = $resolution_map{$default_option_value}) eq $opt)) { # Valid option
-			# Set the option in the new PPD
-			$source_data =~ s/\*($default_option).*/*$1:$def_option/m;
-			if ($verbose) {
-			    print "$ppd_source_filename: Set *$default_option to $def_option\n";
+		    my $odef_option = $def_option;
+		    if ($option eq "Resolution" &&
+			defined $old_resolution_map{$def_option}) {
+			if ($debug & 4) {
+			    print "Intermapping old resolution $def_option to $old_resolution_map{$def_option}\n";
+			}
+			$def_option = $old_resolution_map{$def_option};
+		    }
+		    my @dopts = ($def_option);
+		    if ($def_option ne $odef_option) {
+			push @dopts, $odef_option;
+		    }
+
+		    foreach my $dopt (@dopts) {
+			if (($dopt eq $opt) ||
+			    ($option eq "Resolution" &&
+			     (defined $resolution_map{$dopt}) &&
+			     ($dopt = $resolution_map{$dopt}) eq $opt)) { # Valid option
+			    # Set the option in the new PPD
+			    $source_data =~ s/^\*($default_option).*/*$1:$dopt/m;
+			    if ($verbose) {
+				print "$ppd_source_filename: Set *$default_option to $dopt\n";
+			    }
+			    next default_loop;
 			}
-			next default_loop;
 		    }
 		}
 		warn "Warning: $ppd_source_filename: Invalid option: *$default_option: $defaults{$default_option}.  Using default setting $new_defaults{$default_option}.\n";
@@ -664,6 +723,7 @@ sub find_ppd ($$$$) {
 	push @lingos, "C/";
     }
     push @lingos, "en/", "";
+    push @lingos, "Global/";
     my (@bases);
     push @bases, "stp-${drivername}.$version${simplified}";
     push @bases, "${drivername}.$version${simplified}";
diff --git a/src/cups/genppd.c b/src/cups/genppd.c
index 8df934f..2325fbd 100644
--- a/src/cups/genppd.c
+++ b/src/cups/genppd.c
@@ -1,9 +1,9 @@
 /*
- * "$Id: genppd.c,v 1.142 2008/04/06 21:16:08 rlk Exp $"
+ * "$Id: genppd.c,v 1.170 2008/09/25 23:41:00 rlk Exp $"
  *
  *   PPD file generation program for the CUPS drivers.
  *
- *   Copyright 1993-2007 by Easy Software Products and Robert Krawitz.
+ *   Copyright 1993-2008 by Mike Sweet and Robert Krawitz.
  *
  *   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
@@ -32,7 +32,6 @@
  *   print_group_open()  - Open a new UI group.
  *   printlangs()        - Print list of available translations.
  *   printmodels()       - Print a list of available models.
- *   set_language()      - Set the current translation language.
  *   usage()             - Show program usage.
  *   write_ppd()         - Write a PPD file.
  */
@@ -80,26 +79,18 @@ static const char *gzext = "";
 #include <cups/cups.h>
 #include <cups/raster.h>
 
-#include <gutenprint/gutenprint.h>
-#include <gutenprint/gutenprint-intl.h>
+#include "i18n.h"
 
 /*
- * Some of the Gutenprint resolution names are not PPD-compliant.
- * In Gutenprint 5.0, use the legacy names with the CUPS 1.1 interface
- * for back compatibility.  With CUPS 1.2, or Gutenprint 5.1 or above,
- * generate compliant names.
- *
- * As of Gutenprint 5.0.2 and 5.1.4, *always* use the compliant names.
- * OS X Leopard seems to be very unhappy if there are invalid resolution
- * names.  We've added a mapping between the invalid names and the
- * valid names so that genppdupdate knows how to translate the names.
+ * Some applications use the XxYdpi tags rather than the actual
+ * hardware resolutions to decide what resolution to print at.  Some
+ * applications get very unhappy if the vertical resolution exceeds
+ * a certain amount.  Some of those applications even get very happy if
+ * the PPD file even contains a resolution that exceeds that limit.
+ * Feh.
  */
-
-#if 0
-#if defined(CUPS_DRIVER_INTERFACE) || (STP_MAJOR_VERSION > 5) || (STP_MAJOR_VERSION == 5 && STP_MINOR_VERSION > 0)
-#define USE_COMPLIANT_RESOLUTIONS 1
-#endif
-#endif
+#define MAXIMUM_SAFE_PPD_Y_RESOLUTION (720)
+#define MAXIMUM_SAFE_PPD_X_RESOLUTION (1500)
 
 /*
  * Note:
@@ -109,6 +100,7 @@ static const char *gzext = "";
  */
 
 int cups_ppd_ps_level = CUPS_PPD_PS_LEVEL;
+int localize_numbers = 0;
 
 /*
  * File handling stuff...
@@ -140,20 +132,27 @@ const char *special_options[] =
   NULL
 };
 
+/*
+ * TRANSLATORS:
+ * Please keep these translated names SHORT.  The number of bytes in
+ * the parameter class name plus the number of bytes in the parameter
+ * name must not exceed 38 BYTES (not characters!)
+ */
+
 const char *parameter_class_names[] =
 {
-  N_("Printer Features"),
-  N_("Output Control")
+  _("Printer Features"),
+  _("Output Control")
 };
 
 const char *parameter_level_names[] =
 {
-  N_("Common"),
-  N_("Extra 1"),
-  N_("Extra 2"),
-  N_("Extra 3"),
-  N_("Extra 4"),
-  N_("Extra 5")
+  _("Common"),
+  _("Extra 1"),
+  _("Extra 2"),
+  _("Extra 3"),
+  _("Extra 4"),
+  _("Extra 5")
 };
 
 
@@ -173,47 +172,18 @@ static void	printlangs(char** langs);
 static void	printmodels(int verbose);
 static void	usage(void);
 #endif /* !CUPS_DRIVER_INTERFACE */
-#ifdef ENABLE_NLS
 static char	**getlangs(void);
-static void	set_language(const char *lang);
-#endif /* ENABLE_NLS */
 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);
+				  stp_parameter_level_t p_level,
+				  const char *language, stp_string_list_t *po);
 static void	print_group_open(gzFile fp, stp_parameter_class_t p_class,
-				 stp_parameter_level_t p_level);
+				 stp_parameter_level_t p_level,
+				 const char *language, 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);
 
-#ifdef ENABLE_NLS
-
-typedef struct {
-  const char *lang;
-  const char *mapping;
-} locale_map;
-
-static const locale_map lang_mappings[] =
-  {
-    { "cs", "CS_CZ" },
-    { "da", "da_DK" },
-    { "de", "de_DE" },
-    { "el", "el_GR" },
-    { "es", "es_ES" },
-    { "fr", "fr_FR" },
-    { "hu", "hu_HU" },
-    { "ja", "ja_JP" },
-    { "nb", "nb_NO" },
-    { "nl", "nl_NL" },
-    { "pl", "pl_PL" },
-    { "pt", "pt_PT" },
-    { "sk", "sk_SK" },
-    { "sv", "sv_SE" },
-  };
-static int lang_map_count = sizeof(lang_mappings) / sizeof(locale_map);
-
-static const char *baselocaledir = PACKAGE_LOCALE_DIR;
-#endif
 
 /*
  * Global variables...
@@ -274,14 +244,12 @@ cat_ppd(int argc, char **argv)	/* I - Driver URI */
   int			port;		/* URI port (unused) */
   http_uri_status_t	status;		/* URI decode status */
   const stp_printer_t	*p;		/* Printer driver */
-  const char		*lang = "C";
+  const char		*lang = NULL;
   char			*s;
-#ifdef ENABLE_NLS
-  char			**all_langs = getlangs();
-#endif
   char			filename[1024],		/* Filename */
 			ppd_location[1024];	/* Installed location */
 
+
   if ((status = httpSeparateURI(HTTP_URI_CODING_ALL, uri,
                                 scheme, sizeof(scheme),
                                 userpass, sizeof(userpass),
@@ -306,24 +274,6 @@ cat_ppd(int argc, char **argv)	/* I - Driver URI */
       *s = '\0';
     }
 
-#ifdef ENABLE_NLS
-  if (!lang || strcmp(lang, "C") != 0)
-    {
-      while (*all_langs)
-	{
-	  if (!strcmp(lang, *all_langs))
-	    break;
-	  all_langs++;
-	}
-      if (! *all_langs)
-	{
-	  fprintf(stderr, "ERROR: Unable to find language \"%s\"!\n", lang);
-	  return (1);
-	}
-    }
-  set_language(lang);
-#endif
-
   if ((p = stp_get_printer_by_driver(hostname)) == NULL)
   {
     fprintf(stderr, "ERROR: Unable to find driver \"%s\"!\n", hostname);
@@ -359,10 +309,6 @@ list_ppds(const char *argv0)		/* I - Name of program */
   const char		*scheme;	/* URI scheme */
   int			i;		/* Looping var */
   const stp_printer_t	*printer;	/* Pointer to printer driver */
-#if defined(ENABLE_NLS) && defined(CUPS_TRANSLATED_PPDS)
-  char **langs = getlangs();
-  char **langptr;
-#endif
 
   if ((scheme = strrchr(argv0, '/')) != NULL)
     scheme ++;
@@ -376,55 +322,27 @@ list_ppds(const char *argv0)		/* I - Name of program */
 	  !strcmp(stp_printer_get_family(printer), "raw"))
         continue;
 
-      printf("\"%s://%s/expert/%s\" "
+      printf("\"%s://%s/expert\" "
              "%s "
 	     "\"%s\" "
              "\"%s" CUPS_PPD_NICKNAME_STRING VERSION "\" "
 	     "\"\"\n",			/* No IEEE-1284 Device ID yet */
-             scheme, stp_printer_get_driver(printer), "C",
+             scheme, stp_printer_get_driver(printer),
 	     "en",
 	     stp_printer_get_manufacturer(printer),
 	     stp_printer_get_long_name(printer));
 
 #ifdef GENERATE_SIMPLIFIED_PPDS
-      printf("\"%s://%s/simple/%s\" "
+      printf("\"%s://%s/simple\" "
              "%s "
 	     "\"%s\" "
              "\"%s" CUPS_PPD_NICKNAME_STRING VERSION " Simplified\" "
 	     "\"\"\n",			/* No IEEE-1284 Device ID yet */
-             scheme, stp_printer_get_driver(printer), "C",
+             scheme, stp_printer_get_driver(printer),
 	     "en",
 	     stp_printer_get_manufacturer(printer),
 	     stp_printer_get_long_name(printer));
 #endif
-#if defined(ENABLE_NLS) && defined(CUPS_TRANSLATED_PPDS)
-      langptr = langs;
-      while (*langptr != 0 && strcmp(*langptr, "") != 0)
-	{
-	  printf("\"%s://%s/expert/%s\" "
-		 "%s "
-		 "\"%s\" "
-		 "\"%s" CUPS_PPD_NICKNAME_STRING VERSION "\" "
-		 "\"\"\n",		/* No IEEE-1284 Device ID yet */
-		 scheme, stp_printer_get_driver(printer), *langptr,
-		 *langptr,
-		 stp_printer_get_manufacturer(printer),
-		 stp_printer_get_long_name(printer));
-
-#ifdef GENERATE_SIMPLIFIED_PPDS
-	  printf("\"%s://%s/simple/%s\" "
-		 "%s "
-		 "\"%s\" "
-		 "\"%s" CUPS_PPD_NICKNAME_STRING VERSION " Simplified\" "
-		 "\"\"\n",		/* No IEEE-1284 Device ID yet */
-		 scheme, stp_printer_get_driver(printer), *langptr,
-		 *langptr,
-		 stp_printer_get_manufacturer(printer),
-		 stp_printer_get_long_name(printer));
-#endif
-	  langptr++;
-	}
-#endif
     }
 
   return (0);
@@ -460,7 +378,7 @@ main(int  argc,			    /* I - Number of command-line arguments */
 
   for (;;)
   {
-    if ((i = getopt(argc, argv, "23hvqc:p:l:LMVd:sa")) == -1)
+    if ((i = getopt(argc, argv, "23hvqc:p:l:LMVd:saN")) == -1)
       break;
 
     switch (i)
@@ -482,12 +400,7 @@ main(int  argc,			    /* I - Number of command-line arguments */
       verbose = 0;
       break;
     case 'c':
-#  ifdef ENABLE_NLS
-      baselocaledir = optarg;
-#  ifdef DEBUG
-      fprintf(stderr, "DEBUG: baselocaledir: %s\n", baselocaledir);
-#  endif
-#  endif
+      fputs("ERROR: -c option no longer supported!\n", stderr);
       break;
     case 'p':
       prefix = optarg;
@@ -513,9 +426,12 @@ main(int  argc,			    /* I - Number of command-line arguments */
     case 'a':
       which_ppds = 3;
       break;
+    case 'N':
+      localize_numbers = !localize_numbers;
+      break;
     case 'V':
       printf("cups-genppd version %s, "
-	     "Copyright 1993-2006 by Easy Software Products and Robert Krawitz.\n\n",
+	     "Copyright 1993-2008 by Michael R Sweet and Robert Krawitz.\n\n",
 	     VERSION);
       printf("Default CUPS PPD PostScript Level: %d\n", cups_ppd_ps_level);
       printf("Default PPD location (prefix):     %s\n", CUPS_MODELDIR);
@@ -527,20 +443,7 @@ main(int  argc,			    /* I - Number of command-line arguments */
 	   "This program is distributed in the hope that it will be useful,\n"
 	   "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
 	   "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-	   "GNU General Public License for more details.\n"
-	   "\n");
-      puts("You should have received a copy of the GNU General Public License\n"
-	   "along with this program; if not, please contact Easy Software\n"
-	   "Products at:\n"
-	   "\n"
-	   "    Attn: CUPS Licensing Information\n"
-	   "    Easy Software Products\n"
-	   "    44141 Airport View Drive, Suite 204\n"
-	   "    Hollywood, Maryland 20636-3111 USA\n"
-	   "\n"
-	   "    Voice: (301) 373-9603\n"
-	   "    EMail: cups-info@cups.org\n"
-	   "      WWW: http://www.cups.org\n");
+	   "GNU General Public License for more details.\n");
       exit(EXIT_SUCCESS);
       break;
     default:
@@ -568,17 +471,8 @@ main(int  argc,			    /* I - Number of command-line arguments */
 
   stp_init();
 
- /*
-  * Set the language...
-  */
-
-#  ifdef ENABLE_NLS
   langs = getlangs();
 
-  if (language)
-    set_language(language);
-#  endif /* ENABLE_NLS */
-
  /*
   * Print lists
   */
@@ -752,7 +646,6 @@ help(void)
        "  -V            Show version information and defaults.\n"
        "  The default is to output PPDs.\n");
   puts("Options:\n"
-       "  -c localedir  Use localedir as the base directory for locale data.\n"
        "  -l locale     Output PPDs translated with messages for locale.\n"
        "  -p prefix     Output PPDs in directory prefix.\n"
        "  -d prefix     Embed directory prefix in PPD file.\n"
@@ -771,9 +664,9 @@ help(void)
 void
 usage(void)
 {
-  puts("Usage: cups-genppd [-c localedir] "
+  puts("Usage: cups-genppd "
         "[-l locale] [-p prefix] [-s | -a] [-q] [-v] models...\n"
-        "       cups-genppd -L [-c localedir]\n"
+        "       cups-genppd -L\n"
 	"       cups-genppd -M [-v]\n"
 	"       cups-genppd -h\n"
 	"       cups-genppd -V\n");
@@ -833,7 +726,6 @@ printmodels(int verbose)		/* I - Verbosity level */
  * 'getlangs()' - Get a list of available translations.
  */
 
-#ifdef ENABLE_NLS
 char **					/* O - Array of languages */
 getlangs(void)
 {
@@ -867,69 +759,6 @@ getlangs(void)
   return (langs);
 }
 
-/*
- * 'set_language()' - Set the current translation language.
- */
-
-static void
-set_language(const char *lang)		/* I - Locale name */
-{
-  char *l = setlocale(LC_ALL, lang ? lang : "");
-
-  /* Make sure the locale we tried to set was accepted! */
-  if (lang && !l)
-    {
-      int i;
-      for (i = 0; i < lang_map_count; i++)
-	{
-	  const locale_map *lm = &(lang_mappings[i]);
-	  if (!strcmp(lang, lm->lang))
-	    {
-	      l = setlocale(LC_ALL, lm->mapping);
-	      if (l)
-		break;
-	    }
-	}
-    }
-
-#  ifdef LC_CTYPE
-  setlocale(LC_CTYPE, l ? l : "");
-#  endif /* LC_CTYPE */
-#  ifdef LC_NUMERIC
-  setlocale(LC_NUMERIC, "C");
-#  endif /* LC_NUMERIC */
-
- /*
-  * Set up the catalog
-  */
-
-  if (baselocaledir)
-  {
-    if ((bindtextdomain(PACKAGE, baselocaledir)) == NULL)
-    {
-      fprintf(stderr, "cups-genppd: cannot load message catalog %s under %s: %s\n",
-	      PACKAGE, baselocaledir, strerror(errno));
-      exit(EXIT_FAILURE);
-    }
-
-#  ifdef DEBUG
-    fprintf(stderr, "DEBUG: bound textdomain: %s under %s\n",
-	    PACKAGE, baselocaledir);
-#  endif /* DEBUG */
-
-    if ((textdomain(PACKAGE)) == NULL)
-    {
-      fprintf(stderr,
-              "cups-genppd: cannot select message catalog %s under %s: %s\n",
-              PACKAGE, baselocaledir, strerror(errno));
-      exit(EXIT_FAILURE);
-    }
-#  ifdef DEBUG
-    fprintf(stderr, "DEBUG: textdomain set: %s\n", PACKAGE);
-#  endif /* DEBUG */
-  }
-}
-#endif /* ENABLE_NLS */
 
 /*
  * 'is_special_option()' - Determine if an option should be grouped.
@@ -948,6 +777,57 @@ is_special_option(const char *name)	/* I - Option name */
   return 0;
 }
 
+static size_t
+bytelen(const char *buffer)
+{
+  size_t answer = 0;
+  while (*buffer++ != '\0')
+    answer++;
+  return answer;
+}
+
+static void
+print_group(
+    gzFile                fp,		/* I - File to write to */
+    const char		  *what,
+    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 */
+{
+  char buf[64];
+  const char *class = stp_i18n_lookup(po, parameter_class_names[p_class]);
+  const char *level = stp_i18n_lookup(po, parameter_level_names[p_level]);
+  size_t bytes = bytelen(class) + bytelen(level);
+  snprintf(buf, 40, "%s%s%s", class, bytes < 39 ? " " : "", level);
+  gzprintf(fp, "*%sGroup: C%dL%d/%s\n", what, p_class, p_level, buf);
+  if (language && !strcmp(language, "C") && !strcmp(what, "Open"))
+    {
+      char		**all_langs = getlangs();/* All languages */
+      const char *lang;
+      int langnum;
+
+      for (langnum = 0; all_langs[langnum]; langnum ++)
+	{
+	  stp_string_list_t *altpo;
+
+	  lang = all_langs[langnum];
+
+	  if (!strcmp(lang, "C") || !strcmp(lang, "en"))
+	    continue;
+	  if ((altpo = stp_i18n_load(lang)) != NULL)
+	    {
+	      class = stp_i18n_lookup(altpo, parameter_class_names[p_class]);
+	      level = stp_i18n_lookup(altpo, parameter_level_names[p_level]);
+	      bytes = bytelen(class) + bytelen(level);
+	      snprintf(buf, 40, "%s%s%s", class, bytes < 39 ? " " : "", level);
+	      gzprintf(fp, "*%s.Translation C%dL%d/%s: \"\"\n",
+		       lang, p_class, p_level, buf);
+            }
+	}
+    }
+  gzputs(fp, "\n");
+}
 
 /*
  * 'print_group_close()' - Close a UI group.
@@ -957,11 +837,11 @@ static void
 print_group_close(
     gzFile                fp,		/* I - File to write to */
     stp_parameter_class_t p_class,	/* I - Option class */
-    stp_parameter_level_t p_level)	/* I - Option level */
+    stp_parameter_level_t p_level,	/* I - Option level */
+    const char		 *language,	/* I - language */
+    stp_string_list_t    *po)		/* I - Message catalog */
 {
-  gzprintf(fp, "*CloseGroup: %s %s\n\n",
-	   gettext(parameter_class_names[p_class]),
-	   gettext(parameter_level_names[p_level]));
+  print_group(fp, "Close", p_class, p_level, NULL, NULL);
 }
 
 
@@ -973,11 +853,11 @@ static void
 print_group_open(
     gzFile                fp,		/* I - File to write to */
     stp_parameter_class_t p_class,	/* I - Option class */
-    stp_parameter_level_t p_level)	/* I - Option level */
+    stp_parameter_level_t p_level,	/* I - Option level */
+    const char		 *language,	/* I - language */
+    stp_string_list_t    *po)		/* I - Message catalog */
 {
-  gzprintf(fp, "*OpenGroup: %s %s\n\n",
-	   gettext(parameter_class_names[p_class]),
-	   gettext(parameter_level_names[p_level]));
+  print_group(fp, "Open", p_class, p_level, language ? language : "C", po);
 }
 
 
@@ -1020,6 +900,11 @@ write_ppd(
   int printer_is_color = 0;
   int maximum_level = simplified ?
     STP_PARAMETER_LEVEL_BASIC : STP_PARAMETER_LEVEL_ADVANCED4;
+  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);
+					/* Message catalog */
 
 
  /*
@@ -1039,9 +924,12 @@ write_ppd(
   * Write a standard header...
   */
 
+#undef _
+#define _(x) stp_i18n_lookup(po, x)
+
   gzputs(fp, "*PPD-Adobe: \"4.3\"\n");
   gzputs(fp, "*% PPD file for CUPS/Gutenprint.\n");
-  gzputs(fp, "*% Copyright 1993-2006 by Easy Software Products and Robert Krawitz.\n");
+  gzputs(fp, "*% Copyright 1993-2008 by Mike Sweet and Robert Krawitz.\n");
   gzputs(fp, "*% This program is free software; you can redistribute it and/or\n");
   gzputs(fp, "*% modify it under the terms of the GNU General Public License,\n");
   gzputs(fp, "*% version 2, as published by the Free Software Foundation.\n");
@@ -1062,8 +950,10 @@ write_ppd(
    * Use the English name of your language here, e.g. "Swedish" instead of
    * "Svenska". */
   gzprintf(fp, "*LanguageVersion: %s\n", _("English"));
-  /* TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1 */
-  gzprintf(fp, "*LanguageEncoding: %s\n", _("ISOLatin1"));
+  if (language)
+    gzputs(fp, "*LanguageEncoding: UTF-8\n");
+  else
+    gzputs(fp, "*LanguageEncoding: ISOLatin1\n");
 
  /*
   * Strictly speaking, the PCFileName attribute should be a 12 character
@@ -1080,13 +970,13 @@ write_ppd(
  /*
   * The Product attribute specifies the string returned by the PostScript
   * interpreter.  The last one will appear in the CUPS "product" field,
-  * while all instances are available as attributes.
+  * while all instances are available as attributes.  Rather than listing
+  * the PostScript interpreters we might encounter, we instead just list
+  * a single product line with the "long name" to be compatible with other
+  * CUPS-based drivers. (This is a change from Gutenprint 5.0 and earlier)
   */
 
-  gzputs(fp, "*Product:	\"(AFPL Ghostscript)\"\n");
-  gzputs(fp, "*Product:	\"(GNU Ghostscript)\"\n");
-  gzputs(fp, "*Product:	\"(ESP Ghostscript)\"\n");
-  gzputs(fp, "*Product:	\"(GPL Ghostscript)\"\n");
+  gzprintf(fp, "*Product:	\"(%s)\"\n", long_name);
 
  /*
   * The ModelName attribute now provides the long name rather than the
@@ -1112,18 +1002,7 @@ write_ppd(
   if (cups_ppd_ps_level == 2)
     gzputs(fp, "*PSVersion:	\"(2017.000) 550\"\n");
   else
-    {
-      gzputs(fp, "*PSVersion:	\"(3010.000) 651\"\n");
-      gzputs(fp, "*PSVersion:	\"(3010.000) 652\"\n");
-      gzputs(fp, "*PSVersion:	\"(3010.000) 653\"\n");
-      gzputs(fp, "*PSVersion:	\"(3010.000) 704\"\n");
-      gzputs(fp, "*PSVersion:	\"(3010.000) 705\"\n");
-      gzputs(fp, "*PSVersion:	\"(3010.000) 707\"\n");
-      gzputs(fp, "*PSVersion:	\"(3010.000) 800\"\n");
-      gzputs(fp, "*PSVersion:	\"(3010.000) 815\"\n");
-      gzputs(fp, "*PSVersion:	\"(3010.000) 850\"\n");
-      gzputs(fp, "*PSVersion:	\"(3010.000) 81501\"\n");
-    }
+    gzputs(fp, "*PSVersion:	\"(3010.000) 0\"\n");
   gzprintf(fp, "*LanguageLevel:	\"%d\"\n", cups_ppd_ps_level);
 
   /* Set Job Mode to "Job" as this enables the Duplex option */
@@ -1154,12 +1033,39 @@ write_ppd(
   gzputs(fp, "*LandscapeOrientation: Plus90\n");
   gzputs(fp, "*TTRasterizer:	Type42\n");
 
-  gzputs(fp, "*cupsVersion:	1.1\n");
-  gzprintf(fp, "*cupsModelNumber: \"0\"\n");
+  gzputs(fp, "*cupsVersion:	1.2\n");
   gzputs(fp, "*cupsManualCopies: True\n");
   gzprintf(fp, "*cupsFilter:	\"application/vnd.cups-raster 100 rastertogutenprint.%s\"\n", GUTENPRINT_RELEASE_VERSION);
   if (strcasecmp(manufacturer, "EPSON") == 0)
     gzputs(fp, "*cupsFilter:	\"application/vnd.cups-command 33 commandtoepson\"\n");
+  if (!language)
+  {
+   /*
+    * Generate globalized PPDs when POSIX language is requested...
+    */
+
+    const char *prefix = "*cupsLanguages: \"";
+
+    for (i = 0; all_langs[i]; i ++)
+    {
+      if (!strcmp(all_langs[i], "C") || !strcmp(all_langs[i], "en"))
+        continue;
+
+      gzprintf(fp, "%s%s", prefix, all_langs[i]);
+      prefix = " ";
+    }
+
+    if (!strcmp(prefix, " "))
+      gzputs(fp, "\"\n");
+  }
+
+  /* Macintosh color management */
+  gzputs(fp, "*cupsICCProfile Gray../Grayscale:	\"/System/Library/ColorSync/Profiles/sRGB Profile.icc\"\n");
+  gzputs(fp, "*cupsICCProfile RGB../Color:	\"/System/Library/ColorSync/Profiles/sRGB Profile.icc\"\n");
+  gzputs(fp, "*cupsICCProfile CMYK../Color:	\"/System/Library/ColorSync/Profiles/Generic CMYK Profile.icc\"\n");
+  gzputs(fp, "*APSupportsCustomColorMatching: true\n");
+  gzputs(fp, "*APCustomColorMatchingProfile: sRGB\n");
+
   gzputs(fp, "\n");
   gzprintf(fp, "*StpDriverName:	\"%s\"\n", driver);
   gzprintf(fp, "*StpDriverModelFamily:	\"%d_%s\"\n", model, family);
@@ -1223,7 +1129,7 @@ write_ppd(
       top = 0;
 
     the_papers[cur_opt].name   = opt->name;
-    the_papers[cur_opt].text   = opt->text;
+    the_papers[cur_opt].text   = stp_i18n_lookup(po, opt->text);
     the_papers[cur_opt].width  = width;
     the_papers[cur_opt].height = height;
     the_papers[cur_opt].left   = left;
@@ -1242,7 +1148,8 @@ write_ppd(
 
   gzprintf(fp, "*VariablePaperSize: %s\n\n", variable_sizes ? "true" : "false");
 
-  gzputs(fp, "*OpenUI *PageSize: PickOne\n");
+  gzprintf(fp, "*OpenUI *PageSize/%s: PickOne\n", _("Media Size"));
+  gzputs(fp, "*OPOptionHints PageSize: \"dropdown\"\n");
   gzputs(fp, "*OrderDependency: 10 AnySetup *PageSize\n");
   gzprintf(fp, "*StpStp%s: %d %d %d %d %d %.3f %.3f %.3f\n",
 	   desc.name, desc.p_type, desc.is_mandatory,
@@ -1257,7 +1164,8 @@ write_ppd(
   }
   gzputs(fp, "*CloseUI: *PageSize\n\n");
 
-  gzputs(fp, "*OpenUI *PageRegion: PickOne\n");
+  gzprintf(fp, "*OpenUI *PageRegion/%s: PickOne\n", _("Media Size"));
+  gzputs(fp, "*OPOptionHints PageRegion: \"dropdown\"\n");
   gzputs(fp, "*OrderDependency: 10 AnySetup *PageRegion\n");
   gzprintf(fp, "*DefaultPageRegion: %s\n", desc.deflt.str);
   gzprintf(fp, "*StpDefaultPageRegion: %s\n", desc.deflt.str);
@@ -1293,8 +1201,7 @@ write_ppd(
 
   if (variable_sizes)
   {
-    stp_get_size_limit(v, &max_width, &max_height,
-			       &min_width, &min_height);
+    stp_get_size_limit(v, &max_width, &max_height, &min_width, &min_height);
     stp_set_string_parameter(v, "PageSize", "Custom");
     stp_get_media_size(v, &width, &height);
     stp_get_maximum_imageable_area(v, &left, &right, &bottom, &top);
@@ -1330,7 +1237,8 @@ write_ppd(
   * Do we support color?
   */
 
-  gzputs(fp, "*OpenUI *ColorModel/Color Model: PickOne\n");
+  gzprintf(fp, "*OpenUI *ColorModel/%s: PickOne\n", _("Color Model"));
+  gzputs(fp, "*OPOptionHints ColorModel: \"radiobuttons\"\n");
   gzputs(fp, "*OrderDependency: 10 AnySetup *ColorModel\n");
 
   if (printer_is_color)
@@ -1344,51 +1252,51 @@ write_ppd(
       gzputs(fp, "*StpDefaultColorModel: Gray\n");
     }
 
-  gzprintf(fp, "*ColorModel Gray/Grayscale:\t\"<<"
+  gzprintf(fp, "*ColorModel Gray/%s:\t\"<<"
                "/cupsColorSpace %d"
 	       "/cupsColorOrder %d"
 	       "%s"
 	       ">>setpagedevice\"\n",
-           CUPS_CSPACE_W, CUPS_ORDER_CHUNKED,
-	   simplified ? "/cupsBitsPerColor 8" : "");
-  gzprintf(fp, "*ColorModel Black/Inverted Grayscale:\t\"<<"
+           _("Grayscale"), CUPS_CSPACE_W, CUPS_ORDER_CHUNKED,
+	   simplified ? "/cupsBitsPerColor 8/cupsPreferredBitsPerColor 16" : "");
+  gzprintf(fp, "*ColorModel Black/%s:\t\"<<"
                "/cupsColorSpace %d"
 	       "/cupsColorOrder %d"
 	       "%s"
 	       ">>setpagedevice\"\n",
-           CUPS_CSPACE_K, CUPS_ORDER_CHUNKED,
-	   simplified ? "/cupsBitsPerColor 8" : "");
+           _("Inverted Grayscale"), CUPS_CSPACE_K, CUPS_ORDER_CHUNKED,
+	   simplified ? "/cupsBitsPerColor 8/cupsPreferredBitsPerColor 16" : "");
 
   if (printer_is_color)
   {
-    gzprintf(fp, "*ColorModel RGB/RGB Color:\t\"<<"
+    gzprintf(fp, "*ColorModel RGB/%s:\t\"<<"
                  "/cupsColorSpace %d"
 		 "/cupsColorOrder %d"
 	         "%s"
 		 ">>setpagedevice\"\n",
-             CUPS_CSPACE_RGB, CUPS_ORDER_CHUNKED,
-	     simplified ? "/cupsBitsPerColor 8" : "");
-    gzprintf(fp, "*ColorModel CMY/CMY Color:\t\"<<"
+             _("RGB Color"), CUPS_CSPACE_RGB, CUPS_ORDER_CHUNKED,
+	     simplified ? "/cupsBitsPerColor 8/cupsPreferredBitsPerColor 16" : "");
+    gzprintf(fp, "*ColorModel CMY/%s:\t\"<<"
                  "/cupsColorSpace %d"
 		 "/cupsColorOrder %d"
 	         "%s"
 		 ">>setpagedevice\"\n",
-             CUPS_CSPACE_CMY, CUPS_ORDER_CHUNKED,
-	     simplified ? "/cupsBitsPerColor 8" : "");
-    gzprintf(fp, "*ColorModel CMYK/CMYK:\t\"<<"
+             _("CMY Color"), CUPS_CSPACE_CMY, CUPS_ORDER_CHUNKED,
+	     simplified ? "/cupsBitsPerColor 8/cupsPreferredBitsPerColor 16" : "");
+    gzprintf(fp, "*ColorModel CMYK/%s:\t\"<<"
                  "/cupsColorSpace %d"
 		 "/cupsColorOrder %d"
 	         "%s"
 		 ">>setpagedevice\"\n",
-             CUPS_CSPACE_CMYK, CUPS_ORDER_CHUNKED,
-	     simplified ? "/cupsBitsPerColor 8" : "");
-    gzprintf(fp, "*ColorModel KCMY/KCMY:\t\"<<"
+             _("CMYK"), CUPS_CSPACE_CMYK, CUPS_ORDER_CHUNKED,
+	     simplified ? "/cupsBitsPerColor 8/cupsPreferredBitsPerColor 16" : "");
+    gzprintf(fp, "*ColorModel KCMY/%s:\t\"<<"
                  "/cupsColorSpace %d"
 		 "/cupsColorOrder %d"
 	         "%s"
 		 ">>setpagedevice\"\n",
-             CUPS_CSPACE_KCMY, CUPS_ORDER_CHUNKED,
-	     simplified ? "/cupsBitsPerColor 8" : "");
+             _("KCMY"), CUPS_CSPACE_KCMY, CUPS_ORDER_CHUNKED,
+	     simplified ? "/cupsBitsPerColor 8/cupsPreferredBitsPerColor 16" : "");
   }
 
   gzputs(fp, "*CloseUI: *ColorModel\n\n");
@@ -1398,15 +1306,16 @@ write_ppd(
       /*
        * 8 or 16 bit color (16 bit is slower)
        */
-      gzputs(fp, "*OpenUI *StpColorPrecision/Color Precision: PickOne\n");
+      gzprintf(fp, "*OpenUI *StpColorPrecision/%s: PickOne\n", _("Color Precision"));
+      gzputs(fp, "*OPOptionHints StpColorPrecision: \"radiobuttons\"\n");
       gzputs(fp, "*OrderDependency: 10 AnySetup *StpColorPrecision\n");
       gzputs(fp, "*DefaultStpColorPrecision: Normal\n");
       gzputs(fp, "*StpDefaultStpColorPrecision: Normal\n");
-      gzputs(fp, "*StpColorPrecision Normal/Normal:\t\"<<"
-	     "/cupsBitsPerColor 8>>setpagedevice\"\n");
-      gzputs(fp, "*StpColorPrecision Best/Best:\t\"<<"
-	     "/cupsBitsPerColor 8"
-	     "/cupsPreferredBitsPerColor 16>>setpagedevice\"\n");
+      gzprintf(fp, "*StpColorPrecision Normal/%s:\t\"<<"
+	           "/cupsBitsPerColor 8>>setpagedevice\"\n", _("Normal"));
+      gzprintf(fp, "*StpColorPrecision Best/%s:\t\"<<"
+		   "/cupsBitsPerColor 8"
+		   "/cupsPreferredBitsPerColor 16>>setpagedevice\"\n", _("Best"));
       gzputs(fp, "*CloseUI: *StpColorPrecision\n\n");
     }
 
@@ -1420,6 +1329,7 @@ write_ppd(
   if (num_opts > 0)
   {
     gzprintf(fp, "*OpenUI *MediaType/%s: PickOne\n", _("Media Type"));
+    gzputs(fp, "*OPOptionHints MediaType: \"dropdown\"\n");
     gzputs(fp, "*OrderDependency: 10 AnySetup *MediaType\n");
     gzprintf(fp, "*StpStp%s: %d %d %d %d %d %.3f %.3f %.3f\n",
 	     desc.name, desc.p_type, desc.is_mandatory,
@@ -1431,7 +1341,7 @@ write_ppd(
     {
       opt = stp_string_list_param(desc.bounds.str, i);
       gzprintf(fp, "*MediaType %s/%s:\t\"<</MediaType(%s)>>setpagedevice\"\n",
-               opt->name, opt->text, opt->name);
+               opt->name, stp_i18n_lookup(po, opt->text), opt->name);
     }
 
     gzputs(fp, "*CloseUI: *MediaType\n\n");
@@ -1448,6 +1358,7 @@ write_ppd(
   if (num_opts > 0)
   {
     gzprintf(fp, "*OpenUI *InputSlot/%s: PickOne\n", _("Media Source"));
+    gzputs(fp, "*OPOptionHints InputSlot: \"dropdown\"\n");
     gzputs(fp, "*OrderDependency: 10 AnySetup *InputSlot\n");
     gzprintf(fp, "*StpStp%s: %d %d %d %d %d %.3f %.3f %.3f\n",
 	     desc.name, desc.p_type, desc.is_mandatory,
@@ -1459,7 +1370,7 @@ write_ppd(
     {
       opt = stp_string_list_param(desc.bounds.str, i);
       gzprintf(fp, "*InputSlot %s/%s:\t\"<</MediaClass(%s)>>setpagedevice\"\n",
-               opt->name, opt->text, opt->name);
+               opt->name, stp_i18n_lookup(po, opt->text), opt->name);
     }
 
     gzputs(fp, "*CloseUI: *InputSlot\n\n");
@@ -1475,14 +1386,18 @@ write_ppd(
     {
       stp_clear_string_parameter(v, "Resolution");
       has_quality_parameter = 1;
-      gzprintf(fp, "*OpenUI *StpQuality/%s: PickOne\n", gettext(desc.text));
+      num_opts = stp_string_list_count(desc.bounds.str);
+      gzprintf(fp, "*OpenUI *StpQuality/%s: PickOne\n", stp_i18n_lookup(po, desc.text));
+      if (num_opts > 3)
+	gzputs(fp, "*OPOptionHints Quality: \"radiobuttons\"\n");
+      else
+	gzputs(fp, "*OPOptionHints Quality: \"dropdown\"\n");
       gzputs(fp, "*OrderDependency: 10 AnySetup *StpQuality\n");
       gzprintf(fp, "*StpStp%s: %d %d %d %d %d %.3f %.3f %.3f\n",
 	       desc.name, desc.p_type, desc.is_mandatory,
 	       desc.p_type, desc.p_level, desc.channel, 0.0, 0.0, 0.0);
       gzprintf(fp, "*DefaultStpQuality: %s\n", desc.deflt.str);
       gzprintf(fp, "*StpDefaultStpQuality: %s\n", desc.deflt.str);
-      num_opts = stp_string_list_count(desc.bounds.str);
       for (i = 0; i < num_opts; i++)
 	{
 	  opt = stp_string_list_param(desc.bounds.str, i);
@@ -1499,7 +1414,7 @@ write_ppd(
 	      stp_parameter_description_destroy(&res_desc);
 	    }
 	  gzprintf(fp, "*StpQuality %s/%s:\t\"<</HWResolution[%d %d]/cupsRowFeed %d>>setpagedevice\"\n",
-		   opt->name, opt->text, xdpi, ydpi, i + 1);
+		   opt->name, stp_i18n_lookup(po, opt->text), xdpi, ydpi, i + 1);
 	}
       gzputs(fp, "*CloseUI: *StpQuality\n\n");
     }
@@ -1521,6 +1436,10 @@ write_ppd(
       int tmp_xdpi, tmp_ydpi;
 
       gzprintf(fp, "*OpenUI *Resolution/%s: PickOne\n", _("Resolution"));
+      if (num_opts > 3)
+	gzputs(fp, "*OPOptionHints Resolution: \"resolution radiobuttons\"\n");
+      else
+	gzputs(fp, "*OPOptionHints Resolution: \"resolution dropdown\"\n");
       gzputs(fp, "*OrderDependency: 10 AnySetup *Resolution\n");
       gzprintf(fp, "*StpStp%s: %d %d %d %d %d %.3f %.3f %.3f\n",
 	       desc.name, desc.p_type, desc.is_mandatory,
@@ -1535,10 +1454,12 @@ write_ppd(
 	  stp_describe_resolution(v, &xdpi, &ydpi);
 	  stp_clear_string_parameter(v, "Quality");
 	  tmp_xdpi = xdpi;
+	  while (tmp_xdpi > MAXIMUM_SAFE_PPD_X_RESOLUTION)
+	    tmp_xdpi /= 2;
 	  tmp_ydpi = ydpi;
-	  if (tmp_ydpi > tmp_xdpi)
-	    tmp_ydpi = tmp_xdpi;
-	  else
+	  while (tmp_ydpi > MAXIMUM_SAFE_PPD_Y_RESOLUTION)
+	    tmp_ydpi /= 2;
+	  if (tmp_ydpi < tmp_xdpi)
 	    tmp_xdpi = tmp_ydpi;
 	  /*
 	     Make the default resolution look like an almost square resolution
@@ -1546,12 +1467,13 @@ write_ppd(
 	     excess resolution.  However, make the hardware resolution
 	     match the printer default.
 	  */
-	  (void) snprintf(res_name, 63, "%dx%ddpi", tmp_xdpi, tmp_xdpi + 1);
+	  (void) snprintf(res_name, 63, "%dx%ddpi", tmp_xdpi + 1, tmp_xdpi);
+	  default_resolution = stp_strdup(res_name);
 	  stp_string_list_add_string(res_list, res_name, res_name);
 	  gzprintf(fp, "*DefaultResolution: %s\n", res_name);
 	  gzprintf(fp, "*StpDefaultResolution: %s\n", res_name);
-	  gzprintf(fp, "*Resolution %s/Automatic:\t\"<</HWResolution[%d %d]>>setpagedevice\"\n",
-		   res_name, xdpi, ydpi);
+	  gzprintf(fp, "*Resolution %s/%s:\t\"<</HWResolution[%d %d]>>setpagedevice\"\n",
+		   res_name, _("Automatic"), xdpi, ydpi);
 	  gzprintf(fp, "*StpResolutionMap: %s %s\n", res_name, "None");
 	}
       else
@@ -1583,32 +1505,44 @@ write_ppd(
 	  stp_set_string_parameter(v, "Resolution", opt->name);
 	  stp_describe_resolution(v, &xdpi, &ydpi);
 
-	  /* This should not happen! */
+	  /* This should only happen with a "None" resolution */
 	  if (xdpi == -1 || ydpi == -1)
 	    continue;
 
 	  resolution_ok = 0;
 	  tmp_xdpi = xdpi;
+	  while (tmp_xdpi > MAXIMUM_SAFE_PPD_X_RESOLUTION)
+	    tmp_xdpi /= 2;
 	  tmp_ydpi = ydpi;
+	  while (tmp_ydpi > MAXIMUM_SAFE_PPD_Y_RESOLUTION)
+	    tmp_ydpi /= 2;
 	  do
 	    {
 	      if (tmp_xdpi == tmp_ydpi)
 		(void) snprintf(res_name, 63, "%ddpi", tmp_xdpi);
 	      else
 		(void) snprintf(res_name, 63, "%dx%ddpi", tmp_xdpi, tmp_ydpi);
-	      if (strcmp(opt->name, desc.deflt.str) == 0 ||
+	      if ((!has_quality_parameter &&
+		   strcmp(opt->name, desc.deflt.str) == 0) ||
 		  !stp_string_list_is_present(res_list, res_name))
 		{
 		  resolution_ok = 1;
 		  stp_string_list_add_string(res_list, res_name, res_name);
 		}
-	      else if (tmp_ydpi > tmp_xdpi)
+	      else if (tmp_ydpi > tmp_xdpi &&
+		       tmp_ydpi < MAXIMUM_SAFE_PPD_Y_RESOLUTION)
+		/* Note that we're incrementing the *higher* resolution.
+		   This will generate less aliasing, and apps that convert
+		   down to a square resolution will do the right thing. */
 		tmp_ydpi++;
-	      else
+	      else if (tmp_xdpi < MAXIMUM_SAFE_PPD_X_RESOLUTION)
 		tmp_xdpi++;
+	      else
+		tmp_xdpi /= 2;
 	    } while (!resolution_ok);
+	  stp_string_list_add_string(resolutions, res_name, res_name);
 	  gzprintf(fp, "*Resolution %s/%s:\t\"<</HWResolution[%d %d]/cupsCompression %d>>setpagedevice\"\n",
-		   res_name, opt->text, xdpi, ydpi, i + 1);
+		   res_name, stp_i18n_lookup(po, opt->text), xdpi, ydpi, i + 1);
 	  if (strcmp(res_name, opt->name) != 0)
 	    gzprintf(fp, "*StpResolutionMap: %s %s\n", res_name, opt->name);
 	}
@@ -1622,12 +1556,13 @@ write_ppd(
   stp_describe_parameter(v, "OutputOrder", &desc);
   if (desc.p_type == STP_PARAMETER_TYPE_STRING_LIST)
     {
-      gzputs(fp, "*OpenUI *OutputOrder: PickOne\n");
+      gzprintf(fp, "*OpenUI *OutputOrder/%s: PickOne\n", _("Output Order"));
+      gzputs(fp, "*OPOptionHints OutputOrder: \"radiobuttons\"\n");
       gzputs(fp, "*OrderDependency: 10 AnySetup *OutputOrder\n");
       gzprintf(fp, "*DefaultOutputOrder: %s\n", desc.deflt.str);
       gzprintf(fp, "*StpDefaultOutputOrder: %s\n", desc.deflt.str);
-      gzputs(fp, "*OutputOrder Normal/Normal: \"\"\n");
-      gzputs(fp, "*OutputOrder Reverse/Reverse: \"\"\n");
+      gzprintf(fp, "*OutputOrder Normal/%s: \"\"\n", _("Normal"));
+      gzprintf(fp, "*OutputOrder Reverse/%s: \"\"\n", _("Reverse"));
       gzputs(fp, "*CloseUI: *OutputOrder\n\n");
     }
   stp_parameter_description_destroy(&desc);
@@ -1639,12 +1574,13 @@ write_ppd(
   */
 
   stp_describe_parameter(v, "Duplex", &desc);
-  if (desc.p_type == STP_PARAMETER_TYPE_STRING_LIST)
+  if (desc.is_active && desc.p_type == STP_PARAMETER_TYPE_STRING_LIST)
     {
       num_opts = stp_string_list_count(desc.bounds.str);
       if (num_opts > 0)
       {
         gzprintf(fp, "*OpenUI *Duplex/%s: PickOne\n", _("2-Sided Printing"));
+	gzputs(fp, "*OPOptionHints Duplex: \"radiobuttons\"\n");
         gzputs(fp, "*OrderDependency: 10 AnySetup *Duplex\n");
 	gzprintf(fp, "*StpStp%s: %d %d %d %d %d %.3f %.3f %.3f\n",
 		 desc.name, desc.p_type, desc.is_mandatory,
@@ -1656,11 +1592,11 @@ write_ppd(
           {
             opt = stp_string_list_param(desc.bounds.str, i);
             if (strcmp(opt->name, "None") == 0)
-              gzprintf(fp, "*Duplex %s/%s: \"<</Duplex false>>setpagedevice\"\n", opt->name, opt->text);
+              gzprintf(fp, "*Duplex %s/%s: \"<</Duplex false>>setpagedevice\"\n", opt->name, stp_i18n_lookup(po, opt->text));
             else if (strcmp(opt->name, "DuplexNoTumble") == 0)
-              gzprintf(fp, "*Duplex %s/%s: \"<</Duplex true/Tumble false>>setpagedevice\"\n", opt->name, opt->text);
+              gzprintf(fp, "*Duplex %s/%s: \"<</Duplex true/Tumble false>>setpagedevice\"\n", opt->name, stp_i18n_lookup(po, opt->text));
             else if (strcmp(opt->name, "DuplexTumble") == 0)
-              gzprintf(fp, "*Duplex %s/%s: \"<</Duplex true/Tumble true>>setpagedevice\"\n", opt->name, opt->text);
+              gzprintf(fp, "*Duplex %s/%s: \"<</Duplex true/Tumble true>>setpagedevice\"\n", opt->name, stp_i18n_lookup(po, opt->text));
            }
         gzputs(fp, "*CloseUI: *Duplex\n\n");
       }
@@ -1669,6 +1605,7 @@ write_ppd(
 
   gzprintf(fp, "*OpenUI *StpiShrinkOutput/%s: PickOne\n",
 	   _("Shrink Page If Necessary to Fit Borders"));
+  gzputs(fp, "*OPOptionHints StpiShrinkOutput: \"radiobuttons\"\n");
   gzputs(fp, "*OrderDependency: 10 AnySetup *StpiShrinkOutput\n");
   gzputs(fp, "*DefaultStpiShrinkOutput: Shrink\n");
   gzputs(fp, "*StpDefaultStpiShrinkOutput: Shrink\n");
@@ -1695,6 +1632,7 @@ write_ppd(
 		  (lparam->p_type != STP_PARAMETER_TYPE_STRING_LIST &&
 		   lparam->p_type != STP_PARAMETER_TYPE_BOOLEAN &&
 		   lparam->p_type != STP_PARAMETER_TYPE_DIMENSION &&
+		   lparam->p_type != STP_PARAMETER_TYPE_INT &&
 		   lparam->p_type != STP_PARAMETER_TYPE_DOUBLE))
 		  continue;
 	      stp_describe_parameter(v, lparam->name, &desc);
@@ -1703,16 +1641,23 @@ write_ppd(
 		  int printed_default_value = 0;
 		  if (!printed_open_group)
 		    {
-		      print_group_open(fp, j, k);
+		      print_group_open(fp, j, k, language, po);
 		      printed_open_group = 1;
 		    }
 		  gzprintf(fp, "*OpenUI *Stp%s/%s: PickOne\n",
-			   desc.name, gettext(desc.text));
+			   desc.name, stp_i18n_lookup(po, desc.text));
 		  gzprintf(fp, "*OrderDependency: 10 AnySetup *Stp%s\n",
 			   desc.name);
 		  switch (desc.p_type)
 		    {
 		    case STP_PARAMETER_TYPE_STRING_LIST:
+		      num_opts = stp_string_list_count(desc.bounds.str);
+		      if (num_opts > 3)
+			gzprintf(fp, "*OPOptionHints Stp%s: \"dropdown\"\n",
+				 lparam->name);
+		      else
+			gzprintf(fp, "*OPOptionHints Stp%s: \"radiobuttons\"\n",
+				 lparam->name);
 		      gzprintf(fp, "*StpStp%s: %d %d %d %d %d %.3f %.3f %.3f\n",
 			       desc.name, desc.p_type, desc.is_mandatory,
 			       desc.p_class, desc.p_level, desc.channel,
@@ -1731,15 +1676,16 @@ write_ppd(
 			  gzprintf(fp, "*Stp%s %s/%s: \"\"\n", desc.name,
 				   "None", _("None"));
 			}
-		      num_opts = stp_string_list_count(desc.bounds.str);
 		      for (i = 0; i < num_opts; i++)
 			{
 			  opt = stp_string_list_param(desc.bounds.str, i);
 			  gzprintf(fp, "*Stp%s %s/%s: \"\"\n",
-				   desc.name, opt->name, opt->text);
+				   desc.name, opt->name, stp_i18n_lookup(po, opt->text));
 			}
 		      break;
 		    case STP_PARAMETER_TYPE_BOOLEAN:
+		      gzprintf(fp, "*OPOptionHints Stp%s: \"checkbox\"\n",
+			       lparam->name);
 		      gzprintf(fp, "*StpStp%s: %d %d %d %d %d %.3f %.3f %.3f\n",
 			       desc.name, desc.p_type, desc.is_mandatory,
 			       desc.p_class, desc.p_level, desc.channel,
@@ -1764,6 +1710,8 @@ write_ppd(
 			       desc.name, "True", _("Yes"));
 		      break;
 		    case STP_PARAMETER_TYPE_DOUBLE:
+		      gzprintf(fp, "*OPOptionHints Stp%s: \"slider input spinbox\"\n",
+			       lparam->name);
 		      gzprintf(fp, "*StpStp%s: %d %d %d %d %d %.3f %.3f %.3f\n",
 			       desc.name, desc.p_type, desc.is_mandatory,
 			       desc.p_class, desc.p_level, desc.channel,
@@ -1785,8 +1733,8 @@ write_ppd(
 				     desc.name, i, ((double) i) * .001);
 			}
 		      if (!desc.is_mandatory)
-			gzprintf(fp, "*Stp%s None/None: \"\"\n",
-				 desc.name);
+			gzprintf(fp, "*Stp%s None/%s: \"\"\n",
+				 desc.name, _("None"));
 		      else if (! printed_default_value)
 			gzprintf(fp, "*Stp%s None/%.3f: \"\"\n",
 				 desc.name, desc.deflt.dbl);
@@ -1803,7 +1751,9 @@ write_ppd(
 		      if (!simplified)
 			{
 			  gzprintf(fp, "*OpenUI *StpFine%s/%s %s: PickOne\n",
-				   desc.name, gettext(desc.text), _("Fine Adjustment"));
+				   desc.name, stp_i18n_lookup(po, desc.text), _("Fine Adjustment"));
+			  gzprintf(fp, "*OPOptionHints Stp%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,
 				   0, 0, -1, 0.0, 0.0, 0.0);
@@ -1819,6 +1769,8 @@ write_ppd(
 
 		      break;
 		    case STP_PARAMETER_TYPE_DIMENSION:
+		      gzprintf(fp, "*OPOptionHints Stp%s: \"length slider input spinbox\"\n",
+			       lparam->name);
 		      gzprintf(fp, "*StpStp%s: %d %d %d %d %d %.3f %.3f %.3f\n",
 			       desc.name, desc.p_type, desc.is_mandatory,
 			       desc.p_class, desc.p_level, desc.channel,
@@ -1865,6 +1817,50 @@ write_ppd(
 			       desc.bounds.dimension.upper);
 
 		      break;
+		    case STP_PARAMETER_TYPE_INT:
+		      gzprintf(fp, "*OPOptionHints Stp%s: \"input spinbox\"\n",
+			       lparam->name);
+		      gzprintf(fp, "*StpStp%s: %d %d %d %d %d %.3f %.3f %.3f\n",
+			       desc.name, desc.p_type, desc.is_mandatory,
+			       desc.p_class, desc.p_level, desc.channel,
+			       (double) desc.bounds.integer.lower,
+			       (double) desc.bounds.integer.upper,
+			       (double) desc.deflt.integer);
+		      if (desc.is_mandatory)
+			{
+			  gzprintf(fp, "*DefaultStp%s: %d\n",
+				   desc.name, desc.deflt.integer);
+			  gzprintf(fp, "*StpDefaultStp%s: %d\n",
+				   desc.name, desc.deflt.integer);
+			}
+		      else
+			{
+			  gzprintf(fp, "*DefaultStp%s: None\n", desc.name);
+			  gzprintf(fp, "*StpDefaultStp%s: None\n", desc.name);
+			  gzprintf(fp, "*Stp%s %s/%s: \"\"\n", desc.name,
+				   "None", _("None"));
+			}
+		      for (i = desc.bounds.integer.lower;
+			   i <= desc.bounds.integer.upper; i++)
+			{
+			  gzprintf(fp, "*Stp%s %d/%d: \"\"\n",
+				   desc.name, i, i);
+			}
+
+		      print_close_ui = 0;
+		      gzprintf(fp, "*CloseUI: *Stp%s\n\n", desc.name);
+
+                     /*
+		      * Add custom option code and value parameter...
+		      */
+
+		      gzprintf(fp, "*CustomStp%s True: \"pop\"\n", desc.name);
+		      gzprintf(fp, "*ParamCustomStp%s Value/%s: 1 points %d %d\n\n",
+		               desc.name, _("Value"),
+			       desc.bounds.dimension.lower,
+			       desc.bounds.dimension.upper);
+
+		      break;
 		    default:
 		      break;
 		    }
@@ -1874,16 +1870,409 @@ write_ppd(
 	      stp_parameter_description_destroy(&desc);
 	    }
 	  if (printed_open_group)
-	    print_group_close(fp, j, k);
+	    print_group_close(fp, j, k, language, po);
+	}
+    }
+  stp_describe_parameter(v, "ImageType", &desc);
+  if (desc.is_active && desc.p_type == STP_PARAMETER_TYPE_STRING_LIST)
+    {
+      num_opts = stp_string_list_count(desc.bounds.str);
+      if (num_opts > 0)
+	{
+	  for (i = 0; i < num_opts; i++)
+	    {
+	      opt = stp_string_list_param(desc.bounds.str, i);
+	      if (strcmp(opt->name, "None") != 0)
+		gzprintf(fp, "*APPrinterPreset %s/%s: \"*StpImageType %s\"\n",
+			 opt->name, stp_i18n_lookup(po, opt->text), opt->name);
+	    }
+	  gzputs(fp, "\n");
+	}
+    }
+  stp_parameter_description_destroy(&desc);
+
+#undef _
+#define _(x) stp_i18n_lookup(altpo, x)
+
+  if (!language)
+  {
+   /*
+    * Generate globalized PPDs when POSIX language is requested...
+    */
+
+    const char *lang;
+    stp_string_list_t *altpo;
+    int langnum;
+
+    for (langnum = 0; all_langs[langnum]; langnum ++)
+    {
+      lang = all_langs[langnum];
+
+      if (!strcmp(lang, "C") || !strcmp(lang, "en"))
+        continue;
+
+      if ((altpo = stp_i18n_load(lang)) == NULL)
+        continue;
+
+     /*
+      * Get the page sizes from the driver...
+      */
+
+      if (printer_is_color)
+	stp_set_string_parameter(v, "PrintingMode", "Color");
+      else
+	stp_set_string_parameter(v, "PrintingMode", "BW");
+      stp_set_string_parameter(v, "ChannelBitDepth", "8");
+      stp_describe_parameter(v, "PageSize", &desc);
+      num_opts = stp_string_list_count(desc.bounds.str);
+
+      gzprintf(fp, "*%s.Translation PageSize/%s: \"\"\n", lang, _("Media Size"));
+      gzprintf(fp, "*%s.Translation PageRegion/%s: \"\"\n", lang, _("Media Size"));
+
+      for (i = 0; i < num_opts; i++)
+      {
+	const stp_papersize_t *papersize;
+	opt = stp_string_list_param(desc.bounds.str, i);
+	papersize = stp_get_papersize_by_name(opt->name);
+
+	if (!papersize)
+	  continue;
+
+/*
+	if (strcmp(opt->name, "Custom") == 0)
+	  continue;
+*/
+
+	if (simplified && num_opts >= 10 &&
+	    (papersize->paper_unit == PAPERSIZE_ENGLISH_EXTENDED ||
+	     papersize->paper_unit == PAPERSIZE_METRIC_EXTENDED))
+	  continue;
+
+	if ((papersize->width <= 0 || papersize->height <= 0) &&
+	    strcmp(opt->name, "Custom") != 0)
+	  continue;
+
+        gzprintf(fp, "*%s.PageSize %s/%s: \"\"\n", lang, opt->name, stp_i18n_lookup(altpo, opt->text));
+        gzprintf(fp, "*%s.PageRegion %s/%s: \"\"\n", lang, opt->name, stp_i18n_lookup(altpo, opt->text));
+      }
+
+      stp_parameter_description_destroy(&desc);
+
+     /*
+      * Do we support color?
+      */
+
+      gzprintf(fp, "*%s.Translation ColorModel/%s: \"\"\n", lang, _("Color Model"));
+      gzprintf(fp, "*%s.ColorModel Gray/%s: \"\"\n", lang, _("Grayscale"));
+      gzprintf(fp, "*%s.ColorModel Black/%s: \"\"\n", lang, _("Inverted Grayscale"));
+
+      if (printer_is_color)
+      {
+	gzprintf(fp, "*%s.ColorModel RGB/%s: \"\"\n", lang, _("RGB Color"));
+	gzprintf(fp, "*%s.ColorModel CMY/%s: \"\"\n", lang, _("CMY Color"));
+	gzprintf(fp, "*%s.ColorModel CMYK/%s: \"\"\n", lang, _("CMYK"));
+	gzprintf(fp, "*%s.ColorModel KCMY/%s: \"\"\n", lang, _("KCMY"));
+      }
+
+      if (!simplified)
+	{
+	  /*
+	   * 8 or 16 bit color (16 bit is slower)
+	   */
+	  gzprintf(fp, "*%s.Translation StpColorPrecision/%s: \"\"\n", lang, _("Color Precision"));
+	  gzprintf(fp, "*%s.StpColorPrecision Normal/%s: \"\"\n", lang, _("Normal"));
+	  gzprintf(fp, "*%s.StpColorPrecision Best/%s: \"\"\n", lang, _("Best"));
+	}
+
+     /*
+      * Media types...
+      */
+
+      stp_describe_parameter(v, "MediaType", &desc);
+      num_opts = stp_string_list_count(desc.bounds.str);
+
+      if (num_opts > 0)
+      {
+	gzprintf(fp, "*%s.Translation MediaType/%s: \"\"\n", lang, _("Media Type"));
+
+	for (i = 0; i < num_opts; i ++)
+	{
+	  opt = stp_string_list_param(desc.bounds.str, i);
+	  gzprintf(fp, "*%s.MediaType %s/%s: \"\"\n", lang, opt->name, stp_i18n_lookup(altpo, opt->text));
+	}
+      }
+      stp_parameter_description_destroy(&desc);
+
+     /*
+      * Input slots...
+      */
+
+      stp_describe_parameter(v, "InputSlot", &desc);
+      num_opts = stp_string_list_count(desc.bounds.str);
+
+      if (num_opts > 0)
+      {
+	gzprintf(fp, "*%s.Translation InputSlot/%s: \"\"\n", lang, _("Media Source"));
+
+	for (i = 0; i < num_opts; i ++)
+	{
+	  opt = stp_string_list_param(desc.bounds.str, i);
+	  gzprintf(fp, "*%s.InputSlot %s/%s: \"\"\n", lang, opt->name, stp_i18n_lookup(altpo, opt->text));
 	}
+      }
+      stp_parameter_description_destroy(&desc);
+
+     /*
+      * Quality settings
+      */
+
+      stp_describe_parameter(v, "Quality", &desc);
+      if (desc.p_type == STP_PARAMETER_TYPE_STRING_LIST && desc.is_active)
+	{
+	  gzprintf(fp, "*%s.Translation StpQuality/%s: \"\"\n", lang, stp_i18n_lookup(altpo, desc.text));
+	  num_opts = stp_string_list_count(desc.bounds.str);
+	  for (i = 0; i < num_opts; i++)
+	    {
+	      opt = stp_string_list_param(desc.bounds.str, i);
+	      gzprintf(fp, "*%s.StpQuality %s/%s: \"\"\n", lang, opt->name, stp_i18n_lookup(altpo, opt->text));
+	    }
+	}
+      stp_parameter_description_destroy(&desc);
+
+     /*
+      * Resolution
+      */
+
+      stp_describe_parameter(v, "Resolution", &desc);
+      num_opts = stp_string_list_count(resolutions);
+
+      if (!simplified || desc.p_level == STP_PARAMETER_LEVEL_BASIC)
+	{
+	  gzprintf(fp, "*%s.Translation Resolution/%s: \"\"\n", lang, _("Resolution"));
+	  if (has_quality_parameter)
+	    gzprintf(fp, "*%s.Resolution %s/%s: \"\"\n", lang,
+		     default_resolution, _("Automatic"));
+
+	  for (i = 0; i < num_opts; i ++)
+	    {
+	      opt = stp_string_list_param(resolutions, i);
+	      gzprintf(fp, "*%s.Resolution %s/%s: \"\"\n", lang,
+		       opt->name, stp_i18n_lookup(altpo, opt->text));
+	    }
+	}
+
+      stp_parameter_description_destroy(&desc);
+
+     /*
+      * OutputOrder
+      */
+
+      stp_describe_parameter(v, "OutputOrder", &desc);
+      if (desc.p_type == STP_PARAMETER_TYPE_STRING_LIST)
+	{
+	  gzprintf(fp, "*%s.Translation OutputOrder/%s: \"\"\n", lang, _("Output Order"));
+	  gzprintf(fp, "*%s.OutputOrder Normal/%s: \"\"\n", lang, _("Normal"));
+	  gzprintf(fp, "*%s.OutputOrder Reverse/%s: \"\"\n", lang, _("Reverse"));
+	}
+      stp_parameter_description_destroy(&desc);
+
+     /*
+      * Duplex
+      * Note that the opt->name strings MUST match those in the printer driver(s)
+      * else the PPD files will not be generated correctly
+      */
+
+      stp_describe_parameter(v, "Duplex", &desc);
+      if (desc.is_active && desc.p_type == STP_PARAMETER_TYPE_STRING_LIST)
+	{
+	  num_opts = stp_string_list_count(desc.bounds.str);
+	  if (num_opts > 0)
+	  {
+	    gzprintf(fp, "*%s.Translation Duplex/%s: \"\"\n", lang, _("2-Sided Printing"));
+
+	    for (i = 0; i < num_opts; i++)
+	      {
+		opt = stp_string_list_param(desc.bounds.str, i);
+		if (strcmp(opt->name, "None") == 0)
+		  gzprintf(fp, "*%s.Duplex %s/%s: \"\"\n", lang, opt->name, stp_i18n_lookup(altpo, opt->text));
+		else if (strcmp(opt->name, "DuplexNoTumble") == 0)
+		  gzprintf(fp, "*%s.Duplex %s/%s: \"\"\n", lang, opt->name, stp_i18n_lookup(altpo, opt->text));
+		else if (strcmp(opt->name, "DuplexTumble") == 0)
+		  gzprintf(fp, "*%s.Duplex %s/%s: \"\"\n", lang, opt->name, stp_i18n_lookup(altpo, opt->text));
+	       }
+	  }
+	}
+      stp_parameter_description_destroy(&desc);
+
+      gzprintf(fp, "*%s.Translation StpiShrinkOutput/%s: \"\"\n", lang,
+	       _("Shrink Page If Necessary to Fit Borders"));
+      gzprintf(fp, "*%s.StpiShrinkOutput %s/%s: \"\"\n", lang, "Shrink", _("Shrink (print the whole page)"));
+      gzprintf(fp, "*%s.StpiShrinkOutput %s/%s: \"\"\n", lang, "Crop", _("Crop (preserve dimensions)"));
+      gzprintf(fp, "*%s.StpiShrinkOutput %s/%s: \"\"\n", lang, "Expand", _("Expand (use maximum page area)"));
+
+      param_list = stp_get_parameter_list(v);
+
+      for (j = 0; j <= STP_PARAMETER_CLASS_OUTPUT; j++)
+	{
+	  for (k = 0; k <= maximum_level; k++)
+	    {
+	      size_t param_count = stp_parameter_list_count(param_list);
+	      for (l = 0; l < param_count; l++)
+		{
+		  const stp_parameter_t *lparam =
+		    stp_parameter_list_param(param_list, l);
+		  if (lparam->p_class != j || lparam->p_level != k ||
+		      is_special_option(lparam->name) || lparam->read_only ||
+		      (lparam->p_type != STP_PARAMETER_TYPE_STRING_LIST &&
+		       lparam->p_type != STP_PARAMETER_TYPE_BOOLEAN &&
+		       lparam->p_type != STP_PARAMETER_TYPE_DIMENSION &&
+		       lparam->p_type != STP_PARAMETER_TYPE_INT &&
+		       lparam->p_type != STP_PARAMETER_TYPE_DOUBLE))
+		      continue;
+		  stp_describe_parameter(v, lparam->name, &desc);
+		  if (desc.is_active)
+		    {
+		      gzprintf(fp, "*%s.Translation Stp%s/%s: \"\"\n", lang,
+			       desc.name, stp_i18n_lookup(altpo, desc.text));
+		      switch (desc.p_type)
+			{
+			case STP_PARAMETER_TYPE_STRING_LIST:
+			  if (!desc.is_mandatory)
+			      gzprintf(fp, "*%s.Stp%s %s/%s: \"\"\n", lang, desc.name,
+				       "None", _("None"));
+			  num_opts = stp_string_list_count(desc.bounds.str);
+			  for (i = 0; i < num_opts; i++)
+			    {
+			      opt = stp_string_list_param(desc.bounds.str, i);
+			      gzprintf(fp, "*%s.Stp%s %s/%s: \"\"\n", lang,
+				       desc.name, opt->name, stp_i18n_lookup(altpo, opt->text));
+			    }
+			  break;
+
+			case STP_PARAMETER_TYPE_BOOLEAN:
+			  if (!desc.is_mandatory)
+			      gzprintf(fp, "*%s.Stp%s %s/%s: \"\"\n", lang, desc.name,
+				       "None", _("None"));
+			  gzprintf(fp, "*%s.Stp%s %s/%s: \"\"\n", lang,
+				   desc.name, "False", _("No"));
+			  gzprintf(fp, "*%s.Stp%s %s/%s: \"\"\n", lang,
+				   desc.name, "True", _("Yes"));
+			  break;
+
+			case STP_PARAMETER_TYPE_DOUBLE:
+			  if (localize_numbers)
+			    {
+			      for (i = desc.bounds.dbl.lower * 1000;
+				   i <= desc.bounds.dbl.upper * 1000 ; i += 100)
+				{
+				  if (desc.deflt.dbl * 1000 == i && desc.is_mandatory)
+				    gzprintf(fp, "*%s.Stp%s None/%.3f: \"\"\n", lang,
+					     desc.name, ((double) i) * .001);
+				  else
+				    gzprintf(fp, "*%s.Stp%s %d/%.3f: \"\"\n", lang,
+					     desc.name, i, ((double) i) * .001);
+				}
+			    }
+			  if (!desc.is_mandatory)
+			    gzprintf(fp, "*%s.Stp%s None/%s: \"\"\n", lang,
+				     desc.name, _("None"));
+			  gzprintf(fp, "*%s.ParamCustomStp%s Value/%s: \"\"\n", lang,
+				   desc.name, _("Value"));
+			  if (!simplified)
+			    {
+			      gzprintf(fp, "*%s.Translation StpFine%s/%s %s: \"\"\n", lang,
+				       desc.name, stp_i18n_lookup(altpo, desc.text), _("Fine Adjustment"));
+			      gzprintf(fp, "*%s.StpFine%s None/%.3f: \"\"\n", lang,
+			               desc.name, 0.0);
+			      if (localize_numbers)
+				{
+				  for (i = 0; i < 100; i += 5)
+				    gzprintf(fp, "*%s.StpFine%s %d/%.3f: \"\"\n", lang,
+					     desc.name, i, ((double) i) * .001);
+				}
+			    }
+			  break;
+
+			case STP_PARAMETER_TYPE_DIMENSION:
+			  if (!desc.is_mandatory)
+			    gzprintf(fp, "*%s.Stp%s %s/%s: \"\"\n", lang, desc.name,
+				     "None", _("None"));
+			  if (localize_numbers)
+			    {
+			      for (i = desc.bounds.dimension.lower;
+				   i <= desc.bounds.dimension.upper; i++)
+				{
+				  /* FIXME
+				   * For now, just use mm; we'll fix it later
+				   * for the locale-appropriate setting.
+				   * --rlk 20040818
+				   */
+				  gzprintf(fp, "*%s.Stp%s %d/%.1f mm: \"\"\n", lang,
+					   desc.name, i, ((double) i) * 25.4 / 72);
+				}
+			    }
+			  gzprintf(fp, "*%s.ParamCustomStp%s Value/%s: \"\"\n", lang,
+				   desc.name, _("Value"));
+			  break;
+
+			case STP_PARAMETER_TYPE_INT:
+			  if (!desc.is_mandatory)
+			    gzprintf(fp, "*%s.Stp%s %s/%s: \"\"\n", lang, desc.name,
+				     "None", _("None"));
+			  if (localize_numbers)
+			    {
+			      for (i = desc.bounds.integer.lower;
+				   i <= desc.bounds.integer.upper; i++)
+				{
+				  gzprintf(fp, "*%s.Stp%s %d/%d: \"\"\n", lang,
+					   desc.name, i, i);
+				}
+			    }
+			  gzprintf(fp, "*%s.ParamCustomStp%s Value/%s: \"\"\n", lang,
+				   desc.name, _("Value"));
+			  break;
+
+			default:
+			  break;
+			}
+		    }
+		  stp_parameter_description_destroy(&desc);
+		}
+	    }
+	}
+      stp_describe_parameter(v, "ImageType", &desc);
+      if (desc.is_active && desc.p_type == STP_PARAMETER_TYPE_STRING_LIST)
+	{
+	  num_opts = stp_string_list_count(desc.bounds.str);
+	  if (num_opts > 0)
+	    {
+	      for (i = 0; i < num_opts; i++)
+		{
+		  opt = stp_string_list_param(desc.bounds.str, i);
+		  if (strcmp(opt->name, "None") != 0)
+		    gzprintf(fp, "*%s.APPrinterPreset %s/%s: \"*StpImageType %s\"\n",
+			     lang, opt->name, opt->text, opt->name);
+		}
+	    }
+	}
+      stp_parameter_description_destroy(&desc);
     }
+  }
+  if (has_quality_parameter)
+    stp_free(default_resolution);
+  stp_string_list_destroy(resolutions);
+
   stp_parameter_list_destroy(param_list);
 
+#undef _
+#define _(x) x
+
+
  /*
   * Fonts...
   */
 
-  gzputs(fp, "*DefaultFont: Courier\n");
+  gzputs(fp, "\n*DefaultFont: Courier\n");
   gzputs(fp, "*Font AvantGarde-Book: Standard \"(001.006S)\" Standard ROM\n");
   gzputs(fp, "*Font AvantGarde-BookOblique: Standard \"(001.006S)\" Standard ROM\n");
   gzputs(fp, "*Font AvantGarde-Demi: Standard \"(001.007S)\" Standard ROM\n");
@@ -1925,10 +2314,11 @@ write_ppd(
 	   ppdext);
 
   stp_vars_destroy(v);
+
   return (0);
 }
 
 
 /*
- * End of "$Id: genppd.c,v 1.142 2008/04/06 21:16:08 rlk Exp $".
+ * End of "$Id: genppd.c,v 1.170 2008/09/25 23:41:00 rlk Exp $".
  */
diff --git a/src/cups/i18n.c b/src/cups/i18n.c
new file mode 100644
index 0000000..59406ec
--- /dev/null
+++ b/src/cups/i18n.c
@@ -0,0 +1,481 @@
+/*
+ * "$Id: i18n.c,v 1.6 2008/08/16 16:56:06 rlk Exp $"
+ *
+ *   Internationalization functions for CUPS drivers.
+ *
+ *   Copyright 2008 Michael Sweet (mike@easysw.com)
+ *
+ *   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.
+ *
+ * Contents:
+ *
+ *   stp_i18n_load()   - Load a message catalog for a locale.
+ *   stp_i18n_lookup() - Lookup a string in the message catalog...
+ *   stp_i18n_printf() - Send a formatted string to stderr.
+ *   stpi_unquote()    - Unquote characters in strings.
+ */
+
+/*
+ * Include necessary files...
+ */
+
+#include "i18n.h"
+#include <config.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <ctype.h>
+#include <unistd.h>
+#include <errno.h>
+#include <iconv.h>
+
+
+/*
+ * GNU gettext uses a simple .po file format:
+ *
+ *   # comment
+ *   msgid "id"
+ *   "optional continuation"
+ *   msgstr "str"
+ *   "optional continuation"
+ *
+ * Both the id and str strings use standard C quoting for special characters
+ * like newline and the double quote character.
+ */
+
+
+/*
+ * Cache structure...
+ */
+
+typedef struct stpi_i18n_s
+{
+  struct stpi_i18n_s	*next;		/* Next catalog */
+  char			locale[6];	/* Locale */
+  stp_string_list_t	*po;		/* Message catalog */
+} stpi_i18n_t;
+
+
+/*
+ * Local functions...
+ */
+
+static void	stpi_unquote(char *s);
+
+
+/*
+ * Local globals...
+ */
+
+static stpi_i18n_t	*stpi_pocache = NULL;
+
+
+/*
+ * 'stp_i18n_load()' - Load a message catalog for a locale.
+ */
+
+stp_string_list_t *			/* O - Message catalog */
+stp_i18n_load(const char *locale)	/* I - Locale name */
+{
+  stp_string_list_t	*po;		/* Message catalog */
+  char			ll_CC[6],	/* Locale ID */
+			poname[1024];	/* .po filename */
+  stpi_i18n_t		*pocache;	/* Current cache entry */
+  FILE			*pofile;	/* .po file */
+  const char		*stp_localedir;	/* STP_LOCALEDIR environment variable */
+  char			line[4096],	/* Line buffer */
+			*ptr,		/* Pointer into buffer */
+			id[4096],	/* Translation ID */
+			str[4096],	/* Translation string */
+			utf8str[4096];	/* UTF-8 translation string */
+  int			in_id,		/* Processing "id" string? */
+			in_str,		/* Processing "str" string? */
+			linenum;	/* Line number in .po file */
+  iconv_t		ic;		/* Transcoder to UTF-8 */
+  size_t		inbytes,	/* Number of input buffer bytes */
+			outbytes;	/* Number of output buffer bytes */
+  char			*inptr,		/* Pointer into input buffer */
+			*outptr;	/* Pointer into output buffer */
+  int			fuzzy = 0;	/* Fuzzy translation? */
+
+
+  if (!locale)
+    return (NULL);
+
+ /*
+  * See if the locale is already loaded...
+  */
+
+  for (pocache = stpi_pocache; pocache; pocache = pocache->next)
+    if (!strcmp(locale, pocache->locale))
+      return (pocache->po);
+
+ /*
+  * Find the message catalog for the given locale...
+  */
+
+  if ((stp_localedir = getenv("STP_LOCALEDIR")) == NULL)
+    stp_localedir = PACKAGE_LOCALE_DIR;
+
+  strncpy(ll_CC, locale, sizeof(ll_CC) - 1);
+  ll_CC[sizeof(ll_CC) - 1] = '\0';
+
+  if ((ptr = strchr(ll_CC, '.')) != NULL)
+    *ptr = '\0';
+
+  snprintf(poname, sizeof(poname), "%s/%s/gutenprint_%s.po", stp_localedir,
+	   ll_CC, ll_CC);
+  if (access(poname, 0) && strlen(ll_CC) > 2)
+  {
+    ll_CC[2] = '\0';
+
+    snprintf(poname, sizeof(poname), "%s/%s/gutenprint_%s.po", stp_localedir,
+             ll_CC, ll_CC);
+  }
+
+  if ((pofile = fopen(poname, "rb")) == NULL)
+    return (NULL);
+
+ /*
+  * Read the messages and add them to a string list...
+  */
+
+  if ((po = stp_string_list_create()) == NULL)
+  {
+    fclose(pofile);
+    return (NULL);
+  }
+
+  linenum = 0;
+  id[0]   = '\0';
+  str[0]  = '\0';
+  in_id   = 0;
+  in_str  = 0;
+  ic      = 0;
+
+  while (fgets(line, sizeof(line), pofile))
+  {
+    linenum ++;
+
+   /*
+    * Skip blank and comment lines...
+    */
+
+    if (line[0] == '#')
+    {
+      if (line[1] == ':')
+        fuzzy = 0;
+
+      if (strstr(line, "fuzzy"))
+        fuzzy = 1;
+    }
+
+    if (fuzzy || line[0] == '#' || line[0] == '\n')
+      continue;
+
+   /*
+    * Strip the trailing quote...
+    */
+
+    if ((ptr = (char *)strrchr(line, '\"')) == NULL)
+    {
+      fprintf(stderr, "DEBUG: Expected quoted string on line %d of %s!\n",
+	      linenum, poname);
+      break;
+    }
+
+    *ptr = '\0';
+
+   /*
+    * Find start of value...
+    */
+
+    if ((ptr = strchr(line, '\"')) == NULL)
+    {
+      fprintf(stderr, "DEBUG: Expected quoted string on line %d of %s!\n",
+	      linenum, poname);
+      break;
+    }
+
+    ptr ++;
+
+   /*
+    * Create or add to a message...
+    */
+
+    if (!strncmp(line, "msgid", 5))
+    {
+      in_id  = 1;
+      in_str = 0;
+
+      if (id[0] && str[0])
+      {
+        stpi_unquote(id);
+
+        if (ic)
+	{
+	 /*
+	  * Convert string to UTF-8...
+	  */
+
+	  inbytes  = strlen(str);
+	  inptr    = str;
+	  outbytes = sizeof(utf8str);
+	  outptr   = utf8str;
+
+          iconv(ic, &inptr, &inbytes, &outptr, &outbytes);
+	  *outptr = '\0';
+
+	 /*
+	  * Add it to the string list...
+	  */
+
+          stpi_unquote(utf8str);
+          stp_string_list_add_string(po, id, utf8str);
+	}
+	else
+	{
+          stpi_unquote(str);
+          stp_string_list_add_string(po, id, str);
+        }
+      }
+      else if (!id[0] && str[0] && !ic)
+      {
+       /*
+        * Look for the character set...
+	*/
+
+	const char	*charset = strstr(str, "charset=");
+					/* Source character set definition */
+	char		fromcode[255],	/* Source character set */
+			*fromptr;	/* Pointer into fromcode */
+
+	if (charset)
+	{
+	 /*
+	  * Extract character set and setup a transcode context...
+	  */
+
+	  strncpy(fromcode, charset + 8, sizeof(fromcode) - 1);
+	  fromcode[sizeof(fromcode) - 1] = '\0';
+          for (fromptr = fromcode; *fromptr; fromptr ++)
+	    if (!isalnum(*fromptr & 255) && *fromptr != '-')
+	      break;
+          *fromptr = '\0';
+
+          if (strcasecmp(fromcode, "utf-8"))
+	  {
+            if ((ic = iconv_open("UTF-8", fromcode)) == (iconv_t)-1)
+	    {
+	      fprintf(stderr,
+	              "DEBUG: Unable to convert character set \"%s\": %s\n",
+	              fromcode, strerror(errno));
+	      ic = 0;
+	    }
+	  }
+        }
+      }
+
+      strncpy(id, ptr, sizeof(id) - 1);
+      id[sizeof(id) - 1] = '\0';
+      str[0] = '\0';
+    }
+    else if (!strncmp(line, "msgstr", 6))
+    {
+      in_id  = 0;
+      in_str = 1;
+
+      strncpy(str, ptr, sizeof(str) - 1);
+      str[sizeof(str) - 1] = '\0';
+    }
+    else if (line[0] == '\"' && in_str)
+    {
+      int	str_len = strlen(str),
+		ptr_len = strlen(ptr);
+
+
+      if ((str_len + ptr_len + 1) > sizeof(str))
+        ptr_len = sizeof(str) - str_len - 1;
+
+      if (ptr_len > 0)
+      {
+        memcpy(str + str_len, ptr, ptr_len);
+	str[str_len + ptr_len] = '\0';
+      }
+    }
+    else if (line[0] == '\"' && in_id)
+    {
+      int	id_len = strlen(id),
+		ptr_len = strlen(ptr);
+
+
+      if ((id_len + ptr_len + 1) > sizeof(id))
+        ptr_len = sizeof(id) - id_len - 1;
+
+      if (ptr_len > 0)
+      {
+        memcpy(id + id_len, ptr, ptr_len);
+	id[id_len + ptr_len] = '\0';
+      }
+    }
+    else
+    {
+      fprintf(stderr, "DEBUG: Unexpected text on line %d of %s!\n",
+	      linenum, poname);
+      break;
+    }
+  }
+
+  if (id[0] && str[0])
+  {
+    stpi_unquote(id);
+
+    if (ic)
+    {
+     /*
+      * Convert string to UTF-8...
+      */
+
+      inbytes  = strlen(str);
+      inptr    = str;
+      outbytes = sizeof(utf8str);
+      outptr   = utf8str;
+
+      iconv(ic, &inptr, &inbytes, &outptr, &outbytes);
+      *outptr = '\0';
+
+     /*
+      * Add it to the string list...
+      */
+
+      stpi_unquote(utf8str);
+      stp_string_list_add_string(po, id, utf8str);
+    }
+    else
+    {
+      stpi_unquote(str);
+      stp_string_list_add_string(po, id, str);
+    }
+  }
+
+  fclose(pofile);
+
+ /*
+  * Add this to the cache...
+  */
+
+  if ((pocache = calloc(1, sizeof(stpi_i18n_t))) != NULL)
+  {
+    strncpy(pocache->locale, locale, sizeof(pocache->locale) - 1);
+    pocache->po   = po;
+    pocache->next = stpi_pocache;
+    stpi_pocache  = pocache;
+  }
+  
+  return (po);
+}
+
+
+/*
+ * 'stp_i18n_lookup()' - Lookup a string in the message catalog...
+ */
+
+const char *				/* O - Localized message */
+stp_i18n_lookup(
+    stp_string_list_t *po,		/* I - Message catalog */
+    const char        *message)		/* I - Message */
+{
+  stp_param_string_t	*param;		/* Matching message */
+
+
+  if (po && (param = stp_string_list_find(po, message)) != NULL && param->text)
+    return (param->text);
+  else
+    return (message);
+}
+
+
+/*
+ * 'stp_i18n_printf()' - Send a formatted string to stderr.
+ */
+
+void
+stp_i18n_printf(
+    stp_string_list_t *po,		/* I - Message catalog */
+    const char        *message,		/* I - Printf-style message */
+    ...)				/* I - Additional arguments as needed */
+{
+  va_list	ap;			/* Argument pointer */
+
+
+  va_start(ap, message);
+  vfprintf(stderr, stp_i18n_lookup(po, message), ap);
+  va_end(ap);
+}
+
+
+/*
+ * 'stpi_unquote()' - Unquote characters in strings.
+ */
+
+static void
+stpi_unquote(char *s)		/* IO - Original string */
+{
+  char	*d = s;			/* Destination pointer */
+
+
+  while (*s)
+  {
+    if (*s == '\\')
+    {
+      s ++;
+      if (isdigit(*s))
+      {
+	*d = 0;
+
+	while (isdigit(*s))
+	{
+	  *d = *d * 8 + *s - '0';
+	  s ++;
+	}
+
+	d ++;
+      }
+      else
+      {
+	if (*s == 'n')
+	  *d ++ = '\n';
+	else if (*s == 'r')
+	  *d ++ = '\r';
+	else if (*s == 't')
+	  *d ++ = '\t';
+	else
+	  *d++ = *s;
+
+	s ++;
+      }
+    }
+    else
+      *d++ = *s++;
+  }
+
+  *d = '\0';
+}
+
+
+/*
+ * End of "$Id: i18n.c,v 1.6 2008/08/16 16:56:06 rlk Exp $".
+ */
diff --git a/src/cups/i18n.h b/src/cups/i18n.h
new file mode 100644
index 0000000..f5ae7af
--- /dev/null
+++ b/src/cups/i18n.h
@@ -0,0 +1,47 @@
+/*
+ * "$Id: i18n.h,v 1.1 2008/08/13 07:35:52 easysw Exp $"
+ *
+ *   Internationalization definitions for CUPS drivers.
+ *
+ *   Copyright 2008 Michael Sweet (mike@easysw.com)
+ *
+ *   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.
+ */
+
+#include <gutenprint/gutenprint.h>
+#include <gutenprint/string-list.h>
+
+
+/*
+ * Macro for localizing driver messages...
+ */
+
+#define _(x) x
+
+
+/*
+ * Prototypes...
+ */
+
+extern stp_string_list_t	*stp_i18n_load(const char *locale);
+extern const char		*stp_i18n_lookup(stp_string_list_t *po,
+				                 const char *message);
+extern void			stp_i18n_printf(stp_string_list_t *po,
+				                const char *message, ...);
+
+
+/*
+ * End of "$Id: i18n.h,v 1.1 2008/08/13 07:35:52 easysw Exp $".
+ */
diff --git a/src/cups/rastertoprinter.c b/src/cups/rastertoprinter.c
index 9c25137..cf7cc38 100644
--- a/src/cups/rastertoprinter.c
+++ b/src/cups/rastertoprinter.c
@@ -1,9 +1,9 @@
 /*
- * "$Id: rastertoprinter.c,v 1.120 2008/01/02 01:39:06 rlk Exp $"
+ * "$Id: rastertoprinter.c,v 1.136 2008/10/04 17:47:50 rlk Exp $"
  *
  *   Gutenprint based raster filter for the Common UNIX Printing System.
  *
- *   Copyright 1993-2007 by Easy Software Products.
+ *   Copyright 1993-2008 by Mike Sweet.
  *
  *   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
@@ -47,11 +47,12 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <fcntl.h>
+#include <errno.h>
 #include <sys/times.h>
 #ifdef HAVE_LIMITS_H
 #include <limits.h>
 #endif
-#include <gutenprint/gutenprint.h>
+#include "i18n.h"
 
 /* Solaris with gcc has problems because gcc's limits.h doesn't #define */
 /* this */
@@ -113,15 +114,16 @@ static volatile stp_image_status_t Image_status = STP_IMAGE_STATUS_OK;
 static double total_bytes_printed = 0;
 static int print_messages_as_errors = 0;
 static int suppress_messages = 0;
+static stp_string_list_t *po = NULL;
 
 static void
 set_string_parameter(stp_vars_t *v, const char *name, const char *val)
 {
   if (! suppress_messages)
-    fprintf(stderr, "DEBUG: Gutenprint   set special string %s to %s\n", name, val);
+    fprintf(stderr, "DEBUG: Gutenprint:   Set special string %s to %s\n", name, val);
   stp_set_string_parameter(v, name, val);
 }
-  
+
 
 static void
 set_special_parameter(stp_vars_t *v, const char *name, int choice)
@@ -134,21 +136,22 @@ set_special_parameter(stp_vars_t *v, const char *name, int choice)
 	{
 	  stp_clear_string_parameter(v, name);
 	  if (! suppress_messages)
-	    fprintf(stderr, "DEBUG: Gutenprint   clear special parameter %s\n",
+	    fprintf(stderr, "DEBUG: Gutenprint:   Clear special parameter %s\n",
 		    name);
 	}
       else if (choice >= stp_string_list_count(desc.bounds.str))
 	{
 	  if (! suppress_messages)
-	    fprintf(stderr, "ERROR: Gutenprint   UNABLE to set %s (%d > %d)!\n",
-		    name, choice, stp_string_list_count(desc.bounds.str));
+	    stp_i18n_printf(po, _("ERROR: Unable to set Gutenprint option %s "
+	                          "(%d > %d)!\n"), name, choice,
+				  stp_string_list_count(desc.bounds.str));
 	}
       else
 	{
 	  stp_set_string_parameter
 	    (v, name, stp_string_list_param(desc.bounds.str, choice)->name);
 	  if (! suppress_messages)
-	    fprintf(stderr, "DEBUG: Gutenprint   set special parameter %s to choice %d (%s)\n",
+	    fprintf(stderr, "DEBUG: Gutenprint:   Set special parameter %s to choice %d (%s)\n",
 		    name, choice,
 		    stp_string_list_param(desc.bounds.str, choice)->name);
 	}
@@ -156,7 +159,7 @@ set_special_parameter(stp_vars_t *v, const char *name, int choice)
   else
     {
       if (! suppress_messages)
-	fprintf(stderr, "DEBUG: Gutenprint   UNABLE to set special %s: not a string\n",
+	fprintf(stderr, "DEBUG: Gutenprint:   Unable to set special %s: not a string\n",
 		name);
     }
   stp_parameter_description_destroy(&desc);
@@ -168,62 +171,62 @@ print_debug_block(const stp_vars_t *v, const cups_image_t *cups)
   stp_parameter_list_t params;
   int nparams;
   int i;
-  fprintf(stderr, "DEBUG: Gutenprint   Page data:\n");
-  fprintf(stderr, "DEBUG: Gutenprint     MediaClass = \"%s\"\n", cups->header.MediaClass);
-  fprintf(stderr, "DEBUG: Gutenprint     MediaColor = \"%s\"\n", cups->header.MediaColor);
-  fprintf(stderr, "DEBUG: Gutenprint     MediaType = \"%s\"\n", cups->header.MediaType);
-  fprintf(stderr, "DEBUG: Gutenprint     OutputType = \"%s\"\n", cups->header.OutputType);
-
-  fprintf(stderr, "DEBUG: Gutenprint     AdvanceDistance = %d\n", cups->header.AdvanceDistance);
-  fprintf(stderr, "DEBUG: Gutenprint     AdvanceMedia = %d\n", cups->header.AdvanceMedia);
-  fprintf(stderr, "DEBUG: Gutenprint     Collate = %d\n", cups->header.Collate);
-  fprintf(stderr, "DEBUG: Gutenprint     CutMedia = %d\n", cups->header.CutMedia);
-  fprintf(stderr, "DEBUG: Gutenprint     Duplex = %d\n", cups->header.Duplex);
-  fprintf(stderr, "DEBUG: Gutenprint     HWResolution = [ %d %d ]\n", cups->header.HWResolution[0],
+  fprintf(stderr, "DEBUG: Gutenprint: Page data:\n");
+  fprintf(stderr, "DEBUG: Gutenprint:   MediaClass = \"%s\"\n", cups->header.MediaClass);
+  fprintf(stderr, "DEBUG: Gutenprint:   MediaColor = \"%s\"\n", cups->header.MediaColor);
+  fprintf(stderr, "DEBUG: Gutenprint:   MediaType = \"%s\"\n", cups->header.MediaType);
+  fprintf(stderr, "DEBUG: Gutenprint:   OutputType = \"%s\"\n", cups->header.OutputType);
+
+  fprintf(stderr, "DEBUG: Gutenprint:   AdvanceDistance = %d\n", cups->header.AdvanceDistance);
+  fprintf(stderr, "DEBUG: Gutenprint:   AdvanceMedia = %d\n", cups->header.AdvanceMedia);
+  fprintf(stderr, "DEBUG: Gutenprint:   Collate = %d\n", cups->header.Collate);
+  fprintf(stderr, "DEBUG: Gutenprint:   CutMedia = %d\n", cups->header.CutMedia);
+  fprintf(stderr, "DEBUG: Gutenprint:   Duplex = %d\n", cups->header.Duplex);
+  fprintf(stderr, "DEBUG: Gutenprint:   HWResolution = [ %d %d ]\n", cups->header.HWResolution[0],
 	  cups->header.HWResolution[1]);
-  fprintf(stderr, "DEBUG: Gutenprint     ImagingBoundingBox = [ %d %d %d %d ]\n",
+  fprintf(stderr, "DEBUG: Gutenprint:   ImagingBoundingBox = [ %d %d %d %d ]\n",
 	  cups->header.ImagingBoundingBox[0], cups->header.ImagingBoundingBox[1],
 	  cups->header.ImagingBoundingBox[2], cups->header.ImagingBoundingBox[3]);
-  fprintf(stderr, "DEBUG: Gutenprint     InsertSheet = %d\n", cups->header.InsertSheet);
-  fprintf(stderr, "DEBUG: Gutenprint     Jog = %d\n", cups->header.Jog);
-  fprintf(stderr, "DEBUG: Gutenprint     LeadingEdge = %d\n", cups->header.LeadingEdge);
-  fprintf(stderr, "DEBUG: Gutenprint     Margins = [ %d %d ]\n", cups->header.Margins[0],
+  fprintf(stderr, "DEBUG: Gutenprint:   InsertSheet = %d\n", cups->header.InsertSheet);
+  fprintf(stderr, "DEBUG: Gutenprint:   Jog = %d\n", cups->header.Jog);
+  fprintf(stderr, "DEBUG: Gutenprint:   LeadingEdge = %d\n", cups->header.LeadingEdge);
+  fprintf(stderr, "DEBUG: Gutenprint:   Margins = [ %d %d ]\n", cups->header.Margins[0],
 	  cups->header.Margins[1]);
-  fprintf(stderr, "DEBUG: Gutenprint     ManualFeed = %d\n", cups->header.ManualFeed);
-  fprintf(stderr, "DEBUG: Gutenprint     MediaPosition = %d\n", cups->header.MediaPosition);
-  fprintf(stderr, "DEBUG: Gutenprint     MediaWeight = %d\n", cups->header.MediaWeight);
-  fprintf(stderr, "DEBUG: Gutenprint     MirrorPrint = %d\n", cups->header.MirrorPrint);
-  fprintf(stderr, "DEBUG: Gutenprint     NegativePrint = %d\n", cups->header.NegativePrint);
-  fprintf(stderr, "DEBUG: Gutenprint     NumCopies = %d\n", cups->header.NumCopies);
-  fprintf(stderr, "DEBUG: Gutenprint     Orientation = %d\n", cups->header.Orientation);
-  fprintf(stderr, "DEBUG: Gutenprint     OutputFaceUp = %d\n", cups->header.OutputFaceUp);
-  fprintf(stderr, "DEBUG: Gutenprint     PageSize = [ %d %d ]\n", cups->header.PageSize[0],
+  fprintf(stderr, "DEBUG: Gutenprint:   ManualFeed = %d\n", cups->header.ManualFeed);
+  fprintf(stderr, "DEBUG: Gutenprint:   MediaPosition = %d\n", cups->header.MediaPosition);
+  fprintf(stderr, "DEBUG: Gutenprint:   MediaWeight = %d\n", cups->header.MediaWeight);
+  fprintf(stderr, "DEBUG: Gutenprint:   MirrorPrint = %d\n", cups->header.MirrorPrint);
+  fprintf(stderr, "DEBUG: Gutenprint:   NegativePrint = %d\n", cups->header.NegativePrint);
+  fprintf(stderr, "DEBUG: Gutenprint:   NumCopies = %d\n", cups->header.NumCopies);
+  fprintf(stderr, "DEBUG: Gutenprint:   Orientation = %d\n", cups->header.Orientation);
+  fprintf(stderr, "DEBUG: Gutenprint:   OutputFaceUp = %d\n", cups->header.OutputFaceUp);
+  fprintf(stderr, "DEBUG: Gutenprint:   PageSize = [ %d %d ]\n", cups->header.PageSize[0],
 	  cups->header.PageSize[1]);
-  fprintf(stderr, "DEBUG: Gutenprint     Separations = %d\n", cups->header.Separations);
-  fprintf(stderr, "DEBUG: Gutenprint     TraySwitch = %d\n", cups->header.TraySwitch);
-  fprintf(stderr, "DEBUG: Gutenprint     Tumble = %d\n", cups->header.Tumble);
-  fprintf(stderr, "DEBUG: Gutenprint     cupsWidth = %d\n", cups->header.cupsWidth);
-  fprintf(stderr, "DEBUG: Gutenprint     cupsHeight = %d\n", cups->header.cupsHeight);
-  fprintf(stderr, "DEBUG: Gutenprint     cups->width = %d\n", cups->width);
-  fprintf(stderr, "DEBUG: Gutenprint     cups->height = %d\n", cups->height);
-  fprintf(stderr, "DEBUG: Gutenprint     cups->adjusted_width = %d\n", cups->adjusted_width);
-  fprintf(stderr, "DEBUG: Gutenprint     cups->adjusted_height = %d\n", cups->adjusted_height);
-  fprintf(stderr, "DEBUG: Gutenprint     cupsMediaType = %d\n", cups->header.cupsMediaType);
-  fprintf(stderr, "DEBUG: Gutenprint     cupsBitsPerColor = %d\n", cups->header.cupsBitsPerColor);
-  fprintf(stderr, "DEBUG: Gutenprint     cupsBitsPerPixel = %d\n", cups->header.cupsBitsPerPixel);
-  fprintf(stderr, "DEBUG: Gutenprint     cupsBytesPerLine = %d\n", cups->header.cupsBytesPerLine);
-  fprintf(stderr, "DEBUG: Gutenprint     cupsColorOrder = %d\n", cups->header.cupsColorOrder);
-  fprintf(stderr, "DEBUG: Gutenprint     cupsColorSpace = %d\n", cups->header.cupsColorSpace);
-  fprintf(stderr, "DEBUG: Gutenprint     cupsCompression = %d\n", cups->header.cupsCompression);
-  fprintf(stderr, "DEBUG: Gutenprint     cupsRowCount = %d\n", cups->header.cupsRowCount);
-  fprintf(stderr, "DEBUG: Gutenprint     cupsRowFeed = %d\n", cups->header.cupsRowFeed);
-  fprintf(stderr, "DEBUG: Gutenprint     cupsRowStep = %d\n", cups->header.cupsRowStep);
-  fprintf(stderr, "DEBUG: Gutenprint     stp_get_driver(v) |%s|\n", stp_get_driver(v));
-  fprintf(stderr, "DEBUG: Gutenprint     stp_get_left(v) %d\n", stp_get_left(v));
-  fprintf(stderr, "DEBUG: Gutenprint     stp_get_top(v) %d\n", stp_get_top(v));
-  fprintf(stderr, "DEBUG: Gutenprint     stp_get_page_width(v) %d\n", stp_get_page_width(v));
-  fprintf(stderr, "DEBUG: Gutenprint     stp_get_page_height(v) %d\n", stp_get_page_height(v));
-  fprintf(stderr, "DEBUG: Gutenprint     shrink page to fit %d\n", cups->shrink_to_fit);
+  fprintf(stderr, "DEBUG: Gutenprint:   Separations = %d\n", cups->header.Separations);
+  fprintf(stderr, "DEBUG: Gutenprint:   TraySwitch = %d\n", cups->header.TraySwitch);
+  fprintf(stderr, "DEBUG: Gutenprint:   Tumble = %d\n", cups->header.Tumble);
+  fprintf(stderr, "DEBUG: Gutenprint:   cupsWidth = %d\n", cups->header.cupsWidth);
+  fprintf(stderr, "DEBUG: Gutenprint:   cupsHeight = %d\n", cups->header.cupsHeight);
+  fprintf(stderr, "DEBUG: Gutenprint:   cups->width = %d\n", cups->width);
+  fprintf(stderr, "DEBUG: Gutenprint:   cups->height = %d\n", cups->height);
+  fprintf(stderr, "DEBUG: Gutenprint:   cups->adjusted_width = %d\n", cups->adjusted_width);
+  fprintf(stderr, "DEBUG: Gutenprint:   cups->adjusted_height = %d\n", cups->adjusted_height);
+  fprintf(stderr, "DEBUG: Gutenprint:   cupsMediaType = %d\n", cups->header.cupsMediaType);
+  fprintf(stderr, "DEBUG: Gutenprint:   cupsBitsPerColor = %d\n", cups->header.cupsBitsPerColor);
+  fprintf(stderr, "DEBUG: Gutenprint:   cupsBitsPerPixel = %d\n", cups->header.cupsBitsPerPixel);
+  fprintf(stderr, "DEBUG: Gutenprint:   cupsBytesPerLine = %d\n", cups->header.cupsBytesPerLine);
+  fprintf(stderr, "DEBUG: Gutenprint:   cupsColorOrder = %d\n", cups->header.cupsColorOrder);
+  fprintf(stderr, "DEBUG: Gutenprint:   cupsColorSpace = %d\n", cups->header.cupsColorSpace);
+  fprintf(stderr, "DEBUG: Gutenprint:   cupsCompression = %d\n", cups->header.cupsCompression);
+  fprintf(stderr, "DEBUG: Gutenprint:   cupsRowCount = %d\n", cups->header.cupsRowCount);
+  fprintf(stderr, "DEBUG: Gutenprint:   cupsRowFeed = %d\n", cups->header.cupsRowFeed);
+  fprintf(stderr, "DEBUG: Gutenprint:   cupsRowStep = %d\n", cups->header.cupsRowStep);
+  fprintf(stderr, "DEBUG: Gutenprint:   stp_get_driver(v) |%s|\n", stp_get_driver(v));
+  fprintf(stderr, "DEBUG: Gutenprint:   stp_get_left(v) %d\n", stp_get_left(v));
+  fprintf(stderr, "DEBUG: Gutenprint:   stp_get_top(v) %d\n", stp_get_top(v));
+  fprintf(stderr, "DEBUG: Gutenprint:   stp_get_page_width(v) %d\n", stp_get_page_width(v));
+  fprintf(stderr, "DEBUG: Gutenprint:   stp_get_page_height(v) %d\n", stp_get_page_height(v));
+  fprintf(stderr, "DEBUG: Gutenprint:   shrink page to fit %d\n", cups->shrink_to_fit);
   params = stp_get_parameter_list(v);
   nparams = stp_parameter_list_count(params);
   for (i = 0; i < nparams; i++)
@@ -232,28 +235,28 @@ print_debug_block(const stp_vars_t *v, const cups_image_t *cups)
       switch (p->p_type)
 	{
 	case STP_PARAMETER_TYPE_STRING_LIST:
-	  fprintf(stderr, "DEBUG: Gutenprint     stp_get_string %s(v) |%s| %d\n",
+	  fprintf(stderr, "DEBUG: Gutenprint:   stp_get_string %s(v) |%s| %d\n",
 		  p->name, stp_get_string_parameter(v, p->name) ?
 		  stp_get_string_parameter(v, p->name) : "NULL",
 		  stp_get_string_parameter_active(v, p->name));
 	  break;
 	case STP_PARAMETER_TYPE_DOUBLE:
-	  fprintf(stderr, "DEBUG: Gutenprint     stp_get_float %s(v) |%.3f| %d\n",
+	  fprintf(stderr, "DEBUG: Gutenprint:   stp_get_float %s(v) |%.3f| %d\n",
 		  p->name, stp_get_float_parameter(v, p->name),
 		  stp_get_float_parameter_active(v, p->name));
 	  break;
 	case STP_PARAMETER_TYPE_DIMENSION:
-	  fprintf(stderr, "DEBUG: Gutenprint     stp_get_dimension %s(v) |%d| %d\n",
+	  fprintf(stderr, "DEBUG: Gutenprint:   stp_get_dimension %s(v) |%d| %d\n",
 		  p->name, stp_get_dimension_parameter(v, p->name),
 		  stp_get_dimension_parameter_active(v, p->name));
 	  break;
 	case STP_PARAMETER_TYPE_INT:
-	  fprintf(stderr, "DEBUG: Gutenprint     stp_get_int %s(v) |%d| %d\n",
+	  fprintf(stderr, "DEBUG: Gutenprint:   stp_get_int %s(v) |%d| %d\n",
 		  p->name, stp_get_int_parameter(v, p->name),
 		  stp_get_int_parameter_active(v, p->name));
 	  break;
 	case STP_PARAMETER_TYPE_BOOLEAN:
-	  fprintf(stderr, "DEBUG: Gutenprint     stp_get_boolean %s(v) |%d| %d\n",
+	  fprintf(stderr, "DEBUG: Gutenprint:   stp_get_boolean %s(v) |%d| %d\n",
 		  p->name, stp_get_boolean_parameter(v, p->name),
 		  stp_get_boolean_parameter_active(v, p->name));
 	  break;
@@ -264,7 +267,7 @@ print_debug_block(const stp_vars_t *v, const cups_image_t *cups)
 	  break;
 	}
     }
-  fprintf(stderr, "DEBUG: Gutenprint   End page data\n");
+  fprintf(stderr, "DEBUG: Gutenprint: End page data\n");
   stp_parameter_list_destroy(params);
 }
 
@@ -287,7 +290,7 @@ validate_options(stp_vars_t *v, cups_image_t *cups)
   int nparams = stp_parameter_list_count(params);
   int i;
   if (! suppress_messages)
-    fprintf(stderr, "DEBUG: Gutenprint   validating options\n");
+    fprintf(stderr, "DEBUG: Gutenprint: Validating options\n");
   for (i = 0; i < nparams; i++)
     {
       const stp_parameter_t *param = stp_parameter_list_param(params, i);
@@ -301,14 +304,14 @@ validate_options(stp_vars_t *v, cups_image_t *cups)
 	      if (! suppress_messages)
 		{
 		  const char *val = stp_get_string_parameter(v, desc.name);
-		  fprintf(stderr, "DEBUG: Gutenprint    clearing string %s (%s)\n",
+		  fprintf(stderr, "DEBUG: Gutenprint:   Clearing string %s (%s)\n",
 			  desc.name, val ? val : "(null)");
 		}
 	      stp_clear_string_parameter(v, desc.name);
 	      if (!desc.read_only && desc.is_mandatory && desc.is_active)
 		{
 		  if (! suppress_messages)
-		    fprintf(stderr, "DEBUG: Gutenprint    setting default string %s to %s\n",
+		    fprintf(stderr, "DEBUG: Gutenprint:   Setting default string %s to %s\n",
 			    desc.name, desc.deflt.str ? desc.deflt.str : "(null)");
 		  stp_set_string_parameter(v, desc.name, desc.deflt.str);
 		  if (strcmp(desc.name, "PageSize") == 0)
@@ -318,7 +321,7 @@ validate_options(stp_vars_t *v, cups_image_t *cups)
 		      if (ps->width > 0)
 			{
 			  if (! suppress_messages)
-			    fprintf(stderr, "DEBUG:    Gutenprint setting page width to %d\n",
+			    fprintf(stderr, "DEBUG: Gutenprint:   Setting page width to %d\n",
 				    ps->width);
 			  if (ps->width < stp_get_page_width(v))
 			    stp_set_page_width(v, ps->width);
@@ -326,7 +329,7 @@ validate_options(stp_vars_t *v, cups_image_t *cups)
 		      if (ps->height > 0)
 			{
 			  if (! suppress_messages)
-			    fprintf(stderr, "DEBUG:    Gutenprint setting page height to %d\n",
+			    fprintf(stderr, "DEBUG: Gutenprint:   Setting page height to %d\n",
 				    ps->height);
 			  if (ps->height < stp_get_page_height(v))
 			    stp_set_page_height(v, ps->height);
@@ -338,22 +341,20 @@ validate_options(stp_vars_t *v, cups_image_t *cups)
       stp_parameter_description_destroy(&desc);
     }
   if (! suppress_messages)
-    fprintf(stderr, "DEBUG: Gutenprint   done validating options\n");
+    fprintf(stderr, "DEBUG: Gutenprint: Done validating options\n");
   stp_parameter_list_destroy(params);
-}  
+}
 
 static stp_vars_t *
-initialize_page(cups_image_t *cups, const stp_vars_t *default_settings)
+initialize_page(cups_image_t *cups, const stp_vars_t *default_settings,
+		const char *page_size_name)
 {
-  const stp_papersize_t	*size;		/* Paper size */
   int tmp_left, tmp_right, tmp_top, tmp_bottom, tmp_width, tmp_height;
   stp_vars_t *v = stp_vars_create_copy(default_settings);
 
   if (! suppress_messages)
-    fprintf(stderr, "DEBUG: Gutenprint  Initialize page\n");
+    fprintf(stderr, "DEBUG: Gutenprint: Initialize page\n");
 
-  stp_set_page_width(v, cups->header.PageSize[0]);
-  stp_set_page_height(v, cups->header.PageSize[1]);
   stp_set_outfunc(v, cups_writefunc);
   stp_set_errfunc(v, cups_errfunc);
   stp_set_outdata(v, stdout);
@@ -394,8 +395,8 @@ initialize_page(cups_image_t *cups, const stp_vars_t *default_settings)
       set_string_parameter(v, "InputImageType", "KCMY");
       break;
     default :
-      fprintf(stderr, "ERROR: Gutenprint Bad colorspace %d!\n",
-	      cups->header.cupsColorSpace);
+      stp_i18n_printf(po, _("ERROR: Gutenprint detected a bad colorspace "
+                            "(%d)!\n"), cups->header.cupsColorSpace);
       break;
     }
 
@@ -410,17 +411,52 @@ initialize_page(cups_image_t *cups, const stp_vars_t *default_settings)
     set_string_parameter(v, "MediaType", cups->header.MediaType);
 
   if (! suppress_messages)
-    fprintf(stderr, "DEBUG: Gutenprint   PageSize = %dx%d\n", cups->header.PageSize[0],
+    fprintf(stderr, "DEBUG: Gutenprint:   PageSize = %dx%d\n", cups->header.PageSize[0],
 	    cups->header.PageSize[1]);
 
-  if ((size = stp_get_papersize_by_size(cups->header.PageSize[1],
-					cups->header.PageSize[0])) != NULL)
-    set_string_parameter(v, "PageSize", size->name);
+  if (page_size_name)
+    {
+      if (strcmp(page_size_name, "Custom") == 0)
+	{
+	  if (!suppress_messages)
+	    fprintf(stderr, "DEBUG: Gutenprint:   Using custom page size for (%d, %d)\n",
+		    cups->header.PageSize[1], cups->header.PageSize[0]);
+	  stp_set_page_width(v, cups->header.PageSize[0]);
+	  stp_set_page_height(v, cups->header.PageSize[1]);
+	}
+      else if (stp_get_papersize_by_name(page_size_name))
+	{
+	  int width, height;
+	  if (!suppress_messages)
+	    fprintf(stderr, "DEBUG: Gutenprint:   Using page size %s with (%d, %d)\n",
+		    page_size_name, cups->header.PageSize[1], cups->header.PageSize[0]);
+	  set_string_parameter(v, "PageSize", page_size_name);
+	  stp_get_media_size(v, &width, &height);
+	  if (width > 0)
+	    stp_set_page_width(v, width);
+	  else
+	    stp_set_page_width(v, cups->header.PageSize[0]);
+	  if (height > 0)
+	    stp_set_page_height(v, height);
+	  else
+	    stp_set_page_height(v, cups->header.PageSize[1]);
+	}
+      else
+	{
+	  if (!suppress_messages)
+	    fprintf(stderr, "DEBUG: Gutenprint:   Can't find page size %s with (%d, %d), using custom page size\n",
+		    page_size_name, cups->header.PageSize[1], cups->header.PageSize[0]);
+	  stp_set_page_width(v, cups->header.PageSize[0]);
+	  stp_set_page_height(v, cups->header.PageSize[1]);
+	}
+    }
   else
     {
       if (! suppress_messages)
-	fprintf(stderr, "DEBUG: Gutenprint   UNABLE to get media size for (%d, %d)\n",
+	fprintf(stderr, "DEBUG: Gutenprint:   No named media size for (%d, %d)\n",
 		cups->header.PageSize[1], cups->header.PageSize[0]);
+      stp_set_page_width(v, cups->header.PageSize[0]);
+      stp_set_page_height(v, cups->header.PageSize[1]);
     }
 
  /*
@@ -447,9 +483,9 @@ initialize_page(cups_image_t *cups, const stp_vars_t *default_settings)
 			 &(cups->bottom), &(cups->top));
   if (! suppress_messages)
     {
-      fprintf(stderr, "DEBUG: Gutenprint   limits w %d l %d r %d  h %d t %d b %d\n",
+      fprintf(stderr, "DEBUG:   Gutenprint: limits w %d l %d r %d  h %d t %d b %d\n",
 	      cups->width, cups->left, cups->right, cups->height, cups->top, cups->bottom);
-      fprintf(stderr, "DEBUG: Gutenprint   max limits l %d r %d t %d b %d\n",
+      fprintf(stderr, "DEBUG:   Gutenprint: max limits l %d r %d t %d b %d\n",
 	      tmp_left, tmp_right, tmp_top, tmp_bottom);
     }
 
@@ -473,13 +509,13 @@ initialize_page(cups_image_t *cups, const stp_vars_t *default_settings)
       else
 	cups->left_trim = 0;
       if (! suppress_messages)
-	fprintf(stderr, "DEBUG: Gutenprint   left margin %d\n", cups->left_trim);
+	fprintf(stderr, "DEBUG:   Gutenprint: left margin %d\n", cups->left_trim);
     }
   else
     {
       cups->left_trim = 0;
       if (! suppress_messages)
-	fprintf(stderr, "DEBUG: Gutenprint   adjusting left margin from %d to %d\n",
+	fprintf(stderr, "DEBUG: Gutenprint:   Adjusting left margin from %d to %d\n",
 		cups->left, tmp_left);
       cups->left = tmp_left;
     }
@@ -493,13 +529,13 @@ initialize_page(cups_image_t *cups, const stp_vars_t *default_settings)
       else
 	cups->right_trim = 0;
       if (! suppress_messages)
-	fprintf(stderr, "DEBUG: Gutenprint   right margin %d\n", cups->right_trim);
+	fprintf(stderr, "DEBUG: Gutenprint:   right margin %d\n", cups->right_trim);
     }
   else
     {
       cups->right_trim = 0;
       if (! suppress_messages)
-	fprintf(stderr, "DEBUG: Gutenprint   adjusting right margin from %d to %d\n",
+	fprintf(stderr, "DEBUG: Gutenprint:   Adjusting right margin from %d to %d\n",
 		cups->right, tmp_right);
       cups->right = tmp_right;
     }
@@ -513,13 +549,13 @@ initialize_page(cups_image_t *cups, const stp_vars_t *default_settings)
       else
 	cups->top_trim = 0;
       if (! suppress_messages)
-	fprintf(stderr, "DEBUG: Gutenprint   top margin %d\n", cups->top_trim);
+	fprintf(stderr, "DEBUG: Gutenprint:   top margin %d\n", cups->top_trim);
     }
   else
     {
       cups->top_trim = 0;
       if (! suppress_messages)
-	fprintf(stderr, "DEBUG: Gutenprint   adjusting top margin from %d to %d\n",
+	fprintf(stderr, "DEBUG: Gutenprint:   Adjusting top margin from %d to %d\n",
 		cups->top, tmp_top);
       cups->top = tmp_top;
     }
@@ -533,13 +569,13 @@ initialize_page(cups_image_t *cups, const stp_vars_t *default_settings)
       else
 	cups->bottom_trim = 0;
       if (! suppress_messages)
-	fprintf(stderr, "DEBUG: Gutenprint   bottom margin %d\n", cups->bottom_trim);
+	fprintf(stderr, "DEBUG: Gutenprint:   bottom margin %d\n", cups->bottom_trim);
     }
   else
     {
       cups->bottom_trim = 0;
       if (! suppress_messages)
-	fprintf(stderr, "DEBUG: Gutenprint   adjusting bottom margin from %d to %d\n",
+	fprintf(stderr, "DEBUG: Gutenprint:   Adjusting bottom margin from %d to %d\n",
 		cups->bottom, tmp_bottom);
       cups->bottom = tmp_bottom;
     }
@@ -589,12 +625,12 @@ initialize_page(cups_image_t *cups, const stp_vars_t *default_settings)
   if (cups->adjusted_height > cups->header.cupsHeight)
     cups->adjusted_height = cups->header.cupsHeight;
   if (! suppress_messages)
-    fprintf(stderr, "DEBUG: Gutenprint   CUPS settings w %d (%d) l %d r %d  h %d (%d) t %d b %d\n",
+    fprintf(stderr, "DEBUG: Gutenprint:   CUPS settings w %d (%d) l %d r %d  h %d (%d) t %d b %d\n",
 	    cups->width, cups->adjusted_width, cups->left, cups->right,
 	    cups->height, cups->adjusted_height, cups->top, cups->bottom);
 
   if (! suppress_messages)
-    fprintf(stderr, "DEBUG: Gutenprint  End initialize page\n");
+    fprintf(stderr, "DEBUG: Gutenprint: End initialize page\n");
   return v;
 }
 
@@ -605,7 +641,7 @@ purge_excess_data(cups_image_t *cups)
   if (buffer)
     {
       if (! suppress_messages)
-	fprintf(stderr, "DEBUG: Gutenprint purging %d rows\n",
+	fprintf(stderr, "DEBUG: Gutenprint: Purging %d rows\n",
 		cups->header.cupsHeight - cups->row);
       while (cups->row < cups->header.cupsHeight)
 	{
@@ -627,7 +663,7 @@ set_all_options(stp_vars_t *v, cups_option_t *options, int num_options,
   const char *val;		/* CUPS option value */
   ppd_option_t *ppd_option;
   if (! suppress_messages)
-    fprintf(stderr, "DEBUG: Gutenprint set options:\n");
+    fprintf(stderr, "DEBUG: Gutenprint: Set options:\n");
   val = cupsGetOption("StpiShrinkOutput", num_options, options);
   if (!val)
     {
@@ -668,7 +704,7 @@ set_all_options(stp_vars_t *v, cups_option_t *options, int num_options,
 	      double dval = atof(val + 7);
 
 	      if (! suppress_messages)
-		fprintf(stderr, "DEBUG: Gutenprint   set float %s to %f\n",
+		fprintf(stderr, "DEBUG: Gutenprint:   Set float %s to %f\n",
 			desc.name, dval);
 	      if (dval > desc.bounds.dbl.upper)
 		dval = desc.bounds.dbl.upper;
@@ -681,7 +717,7 @@ set_all_options(stp_vars_t *v, cups_option_t *options, int num_options,
 		{
 		  fine_val = atof(val);
 		  if (! suppress_messages)
-		    fprintf(stderr, "DEBUG: Gutenprint   set float %s to %f (%s)\n",
+		    fprintf(stderr, "DEBUG: Gutenprint:   Set float %s to %f (%s)\n",
 			    desc.name, fine_val, val);
 		}
 	      else
@@ -698,7 +734,7 @@ set_all_options(stp_vars_t *v, cups_option_t *options, int num_options,
 		  if (val && strlen(val) > 0 && strcmp(val, "None") != 0)
 		    fine_val = atof(val) * 0.001;
 		  if (! suppress_messages)
-		    fprintf(stderr, "DEBUG: Gutenprint   set float %s to %f + %f\n",
+		    fprintf(stderr, "DEBUG: Gutenprint:   Set float %s to %f + %f\n",
 			    desc.name, coarse_val, fine_val);
 		  fine_val += coarse_val;
 		}
@@ -726,7 +762,7 @@ set_all_options(stp_vars_t *v, cups_option_t *options, int num_options,
 		{
 		case STP_PARAMETER_TYPE_STRING_LIST:
 		  if (! suppress_messages)
-		    fprintf(stderr, "DEBUG: Gutenprint   set string %s to %s\n",
+		    fprintf(stderr, "DEBUG: Gutenprint:   Set string %s to %s\n",
 			    desc.name, val);
 		  set_string_parameter(v, desc.name, val);
 		  break;
@@ -735,7 +771,7 @@ set_all_options(stp_vars_t *v, cups_option_t *options, int num_options,
 		    val += 7;
 
 		  if (! suppress_messages)
-		    fprintf(stderr, "DEBUG: Gutenprint   set int %s to %s (%d)\n",
+		    fprintf(stderr, "DEBUG: Gutenprint:   Set int %s to %s (%d)\n",
 			    desc.name, val, atoi(val));
 		  stp_set_int_parameter(v, desc.name, atoi(val));
 		  break;
@@ -744,14 +780,14 @@ set_all_options(stp_vars_t *v, cups_option_t *options, int num_options,
 		    val += 7;
 
 		  if (! suppress_messages)
-		    fprintf(stderr, "DEBUG: Gutenprint   set dimension %s to %s (%d)\n",
+		    fprintf(stderr, "DEBUG: Gutenprint:   Set dimension %s to %s (%d)\n",
 			    desc.name, val, atoi(val));
 
 		  stp_set_dimension_parameter(v, desc.name, atoi(val));
 		  break;
 		case STP_PARAMETER_TYPE_BOOLEAN:
 		  if (! suppress_messages)
-		    fprintf(stderr, "DEBUG: Gutenprint   set bool %s to %s (%d)\n",
+		    fprintf(stderr, "DEBUG: Gutenprint:   Set bool %s to %s (%d)\n",
 			    desc.name, val, strcasecmp(val, "true") == 0 ? 1 : 0);
 		  stp_set_boolean_parameter
 		    (v, desc.name, strcasecmp(val, "true") == 0 ? 1 : 0);
@@ -760,7 +796,7 @@ set_all_options(stp_vars_t *v, cups_option_t *options, int num_options,
 		case STP_PARAMETER_TYPE_FILE: /* Probably not, security hole */
 		case STP_PARAMETER_TYPE_RAW: /* figure this out later, too */
 		  if (! suppress_messages)
-		    fprintf(stderr, "DEBUG: Gutenprint   ignoring option %s %s type %d\n",
+		    fprintf(stderr, "DEBUG: Gutenprint:   Ignoring option %s %s type %d\n",
 			    desc.name, val, desc.p_type);
 		  break;
 		default:
@@ -770,13 +806,13 @@ set_all_options(stp_vars_t *v, cups_option_t *options, int num_options,
 	  else if (val)
 	    {
 	      if (! suppress_messages)
-		fprintf(stderr, "DEBUG: Gutenprint   NOT setting %s to '%s'\n",
+		fprintf(stderr, "DEBUG: Gutenprint:   Not setting %s to '%s'\n",
 			desc.name, val);
 	    }
 	  else
 	    {
 	      if (! suppress_messages)
-		fprintf(stderr, "DEBUG: Gutenprint   NOT setting %s to (null)\n",
+		fprintf(stderr, "DEBUG: Gutenprint:   Not setting %s to (null)\n",
 			desc.name);
 	    }
 	}
@@ -784,7 +820,7 @@ set_all_options(stp_vars_t *v, cups_option_t *options, int num_options,
       stp_free(ppd_option_name);
     }
   if (! suppress_messages)
-    fprintf(stderr, "DEBUG: Gutenprint end options\n");
+    fprintf(stderr, "DEBUG: Gutenprint: End options\n");
   stp_parameter_list_destroy(params);
 }
 
@@ -800,6 +836,7 @@ main(int  argc,				/* I - Number of command-line arguments */
   cups_image_t		cups;		/* CUPS image */
   const char		*ppdfile;	/* PPD environment variable */
   ppd_file_t		*ppd;		/* PPD file */
+  ppd_size_t		*size;
   const stp_printer_t	*printer;	/* Printer driver */
   int			num_options;	/* Number of CUPS options */
   cups_option_t		*options;	/* CUPS options */
@@ -813,14 +850,24 @@ main(int  argc,				/* I - Number of command-line arguments */
   long			clocks_per_sec;
   struct timeval	t1, t2;
   struct timezone	tz;
+  char			*page_size_name = NULL;
+
+
+ /*
+  * Don't buffer error/status messages...
+  */
+
+  setbuf(stderr, NULL);
 
   if (getenv("STP_SUPPRESS_MESSAGES"))
     suppress_messages = 1;
 
  /*
-  * Initialise libgutenprint
+  * Initialize libgutenprint
   */
 
+  po = stp_i18n_load(getenv("LANG"));
+
   theImage.rep = &cups;
 
   (void) gettimeofday(&t1, &tz);
@@ -828,12 +875,10 @@ main(int  argc,				/* I - Number of command-line arguments */
   version_id = stp_get_version();
   release_version_id = stp_get_release_version();
   default_settings = stp_vars_create();
+
  /*
   * Check for valid arguments...
   */
-  if (! suppress_messages)
-    fprintf(stderr, "DEBUG: Gutenprint %s Starting\n", version_id);
-
   if (argc < 6 || argc > 7)
   {
    /*
@@ -841,7 +886,8 @@ main(int  argc,				/* I - Number of command-line arguments */
     * and return.
     */
 
-    fputs("ERROR: Gutenprint rastertoprinter job-id user title copies options [file]\n", stderr);
+    stp_i18n_printf(po, _("Usage: rastertoprinter job-id user title copies "
+                          "options [file]\n"));
     return (1);
   }
 
@@ -861,7 +907,7 @@ main(int  argc,				/* I - Number of command-line arguments */
 
   if ((ppdfile = getenv("PPD")) == NULL)
   {
-    fputs("ERROR: Gutenprint Fatal error: PPD environment variable not set!\n", stderr);
+    stp_i18n_printf(po, _("ERROR: No PPD file, unable to continue!\n"));
     return (1);
   }
   if (! suppress_messages)
@@ -869,31 +915,31 @@ main(int  argc,				/* I - Number of command-line arguments */
 
   if ((ppd = ppdOpenFile(ppdfile)) == NULL)
   {
-    fprintf(stderr, "ERROR: Gutenprint Fatal error: Unable to load PPD file \"%s\"!\n",
-            ppdfile);
+    stp_i18n_printf(po, _("ERROR: Gutenprint was unable to load PPD file "
+                          "\"%s\"!\n"), ppdfile);
     return (1);
   }
 
   if (ppd->modelname == NULL)
   {
-    fprintf(stderr, "ERROR: Gutenprint Fatal error: No ModelName attribute in PPD file \"%s\"!\n",
-            ppdfile);
+    stp_i18n_printf(po, _("ERROR: Gutenprint did not find a ModelName "
+                          "attribute in PPD file \"%s\"!\n"), ppdfile);
     ppdClose(ppd);
     return (1);
   }
 
   if (ppd->nickname == NULL)
   {
-    fprintf(stderr, "ERROR: Gutenprint Fatal error: No NickName attribute in PPD file \"%s\"!\n",
-            ppdfile);
+    stp_i18n_printf(po, _("ERROR: Gutenprint did not find a NickName attribute "
+                          "in PPD file \"%s\"!\n"), ppdfile);
     ppdClose(ppd);
     return (1);
   }
   else if (strlen(ppd->nickname) <
 	   strlen(ppd->modelname) + strlen(CUPS_PPD_NICKNAME_STRING) + 3)
   {
-    fprintf(stderr, "ERROR: Gutenprint Fatal error: Corrupted NickName attribute in PPD file \"%s\"!\n",
-            ppdfile);
+    stp_i18n_printf(po, _("ERROR: Gutenprint found a corrupted NickName "
+                          "attribute in PPD file \"%s\"!\n"), ppdfile);
     ppdClose(ppd);
     return (1);
   }
@@ -907,22 +953,17 @@ main(int  argc,				/* I - Number of command-line arguments */
 	      *(ppd->nickname + strlen(ppd->modelname) +
 		strlen(CUPS_PPD_NICKNAME_STRING)) != ' ')))
   {
-    fprintf(stderr, "ERROR: Gutenprint: The version of Gutenprint software installed (%s) does not match the PPD file (%s).\n",
-	    version_id,
-	    ppd->nickname+strlen(ppd->modelname)+strlen(CUPS_PPD_NICKNAME_STRING));
-    fprintf(stderr, "ERROR: Gutenprint: If you have upgraded your version of Gutenprint\n");
-    fprintf(stderr, "ERROR: Gutenprint: recently, you must reinstall all printer queues.\n");
-    fprintf(stderr, "ERROR: Gutenprint: If the previous installed version of Gutenprint\n");
-    fprintf(stderr, "ERROR: Gutenprint: was 4.3.19 or higher, you can use the `cups-genppdupdate.%s'\n", release_version_id);
-    fprintf(stderr, "ERROR: Gutenprint: program to do this; if the previous installed version\n");
-    fprintf(stderr, "ERROR: Gutenprint: was older, you can use the Modify Printer command via\n");
-    fprintf(stderr, "ERROR: Gutenprint: the CUPS web interface: http://localhost:631/printers.\n");
-    /*
-     * Repeat the first line of the message so that CUPS will display it
-     */
-    fprintf(stderr, "ERROR: Gutenprint: The version of Gutenprint software installed (%s) does not match the PPD file (%s).\n",
-	    version_id,
-	    ppd->nickname+strlen(ppd->modelname)+strlen(CUPS_PPD_NICKNAME_STRING));
+    stp_i18n_printf(po, _("ERROR: The PPD version (%d) is not compatible with "
+                          "Gutenprint %s.\n"),
+	            ppd->nickname+strlen(ppd->modelname)+strlen(CUPS_PPD_NICKNAME_STRING),
+	            version_id);
+    fprintf(stderr, "DEBUG: Gutenprint: If you have upgraded your version of Gutenprint\n");
+    fprintf(stderr, "DEBUG: Gutenprint: recently, you must reinstall all printer queues.\n");
+    fprintf(stderr, "DEBUG: Gutenprint: If the previous installed version of Gutenprint\n");
+    fprintf(stderr, "DEBUG: Gutenprint: was 4.3.19 or higher, you can use the `cups-genppdupdate.%s'\n", release_version_id);
+    fprintf(stderr, "DEBUG: Gutenprint: program to do this; if the previous installed version\n");
+    fprintf(stderr, "DEBUG: Gutenprint: was older, you can use the Modify Printer command via\n");
+    fprintf(stderr, "DEBUG: Gutenprint: the CUPS web interface: http://localhost:631/printers.\n");
     ppdClose(ppd);
     return 1;
   }
@@ -932,17 +973,23 @@ main(int  argc,				/* I - Number of command-line arguments */
   */
 
   num_options = cupsParseOptions(argv[5], 0, &options);
+  ppdMarkDefaults(ppd);
+  cupsMarkOptions(ppd, num_options, options);
+  size = ppdPageSize(ppd, NULL);
+
+  if (size->name)
+    page_size_name = stp_strdup(size->name);
 
   if (! suppress_messages)
-    fprintf(stderr, "DEBUG: Gutenprint CUPS option count is %d (%d bytes)\n",
-	    num_options, strlen(argv[5]));
+    fprintf(stderr, "DEBUG: Gutenprint: CUPS option count is %d (%d bytes)\n",
+	    num_options, (int)strlen(argv[5]));
 
   if (num_options > 0)
     {
       int i;
       for (i = 0; i < num_options; i++)
 	if (! suppress_messages)
-	  fprintf(stderr, "DEBUG: Gutenprint    CUPS option %d %s = %s\n",
+	  fprintf(stderr, "DEBUG: Gutenprint: CUPS option %d %s = %s\n",
 		  i, options[i].name, options[i].value);
     }
 
@@ -956,13 +1003,13 @@ main(int  argc,				/* I - Number of command-line arguments */
 
   if (printer == NULL)
     {
-      fprintf(stderr, "ERROR: Gutenprint Fatal error: Unable to find driver named \"%s\"!\n",
-              ppd->modelname);
+      stp_i18n_printf(po, _("ERROR: Unable to find Gutenprint driver named "
+                            "\"%s\"!\n"), ppd->modelname);
       ppdClose(ppd);
       return (1);
     }
   if (! suppress_messages)
-    fprintf(stderr, "DEBUG: Gutenprint driver %s\n", ppd->modelname);
+    fprintf(stderr, "DEBUG: Gutenprint: Driver %s\n", ppd->modelname);
 
  /*
   * Open the page stream...
@@ -972,7 +1019,8 @@ main(int  argc,				/* I - Number of command-line arguments */
   {
     if ((fd = open(argv[6], O_RDONLY)) == -1)
     {
-      perror("ERROR: Gutenprint Unable to open raster file - ");
+      stp_i18n_printf(po, _("ERROR: Gutenprint was unable to open raster file "
+                            "\"%s\" - %s"), argv[6], strerror(errno));
       sleep(1);
       return (1);
     }
@@ -980,7 +1028,7 @@ main(int  argc,				/* I - Number of command-line arguments */
   else
     fd = 0;
   if (! suppress_messages)
-    fprintf(stderr, "DEBUG: Gutenprint using fd %d\n", fd);
+    fprintf(stderr, "DEBUG: Gutenprint: Using fd %d\n", fd);
 
   stp_set_printer_defaults(default_settings, printer);
   stp_set_float_parameter(default_settings, "AppGamma", 1.0);
@@ -997,7 +1045,7 @@ main(int  argc,				/* I - Number of command-line arguments */
   cups.page = 0;
 
   if (! suppress_messages)
-    fprintf(stderr, "DEBUG: Gutenprint about to start printing loop.\n");
+    fprintf(stderr, "DEBUG: Gutenprint: About to start printing loop.\n");
 
   /*
    * Read the first page header, which we need in order to set up
@@ -1022,10 +1070,10 @@ main(int  argc,				/* I - Number of command-line arguments */
        */
       if (! suppress_messages)
 	{
-	  fprintf(stderr, "DEBUG: Gutenprint printing page %d\n", cups.page + 1);
+	  fprintf(stderr, "DEBUG: Gutenprint: Printing page %d\n", cups.page + 1);
 	  fprintf(stderr, "PAGE: %d 1\n", cups.page + 1);
 	}
-      v = initialize_page(&cups, default_settings);
+      v = initialize_page(&cups, default_settings, page_size_name);
       stp_set_int_parameter(v, "PageNumber", cups.page);
       cups.row = 0;
       if (! suppress_messages)
@@ -1033,10 +1081,10 @@ main(int  argc,				/* I - Number of command-line arguments */
       print_messages_as_errors = 1;
       if (!stp_verify(v))
 	{
-	  fprintf(stderr, "ERROR: Gutenprint: options failed to verify.\n");
-	  fprintf(stderr, "ERROR: Gutenprint: Make sure that you are using ESP Ghostscript rather\n");
-	  fprintf(stderr, "ERROR: Gutenprint: than GNU or AFPL Ghostscript with CUPS.\n");
-	  fprintf(stderr, "ERROR: Gutenprint: If this is not the cause, set LogLevel to debug2 to identify the problem.\n");
+	  fprintf(stderr, "DEBUG: Gutenprint: Options failed to verify.\n");
+	  fprintf(stderr, "DEBUG: Gutenprint: Make sure that you are using ESP Ghostscript rather\n");
+	  fprintf(stderr, "DEBUG: Gutenprint: than GNU or AFPL Ghostscript with CUPS.\n");
+	  fprintf(stderr, "DEBUG: Gutenprint: If this is not the cause, set LogLevel to debug to identify the problem.\n");
 	  goto cups_abort;
 	}
 
@@ -1047,10 +1095,7 @@ main(int  argc,				/* I - Number of command-line arguments */
 	}
 
       if (!stp_print(v, &theImage))
-	{
-	  fprintf(stderr, "ERROR: Gutenprint failed to print, set LogLevel to debug2 to identify why\n");
 	  goto cups_abort;
-	}
       print_messages_as_errors = 0;
 
       fflush(stdout);
@@ -1061,13 +1106,13 @@ main(int  argc,				/* I - Number of command-line arguments */
       if (cups.row < cups.header.cupsHeight)
 	purge_excess_data(&cups);
       if (! suppress_messages)
-	fprintf(stderr, "DEBUG: Gutenprint done printing page %d\n", cups.page + 1);
+	fprintf(stderr, "DEBUG: Gutenprint: Done printing page %d\n", cups.page + 1);
       cups.page ++;
     }
   if (v)
     {
       if (! suppress_messages)
-	fprintf(stderr, "DEBUG: Gutenprint ending job\n");
+	fprintf(stderr, "DEBUG: Gutenprint: Ending job\n");
       stp_end_job(v, &theImage);
       fflush(stdout);
       stp_vars_destroy(v);
@@ -1076,18 +1121,18 @@ main(int  argc,				/* I - Number of command-line arguments */
   clk = times(&tms);
   (void) gettimeofday(&t2, &tz);
   clocks_per_sec = sysconf(_SC_CLK_TCK);
-  fprintf(stderr, "DEBUG: Gutenprint printed total %.0f bytes\n",
+  fprintf(stderr, "DEBUG: Gutenprint: Printed total %.0f bytes\n",
 	  total_bytes_printed);
-  fprintf(stderr, "DEBUG: Gutenprint used %.3f seconds user, %.3f seconds system, %.3f seconds elapsed\n",
+  fprintf(stderr, "DEBUG: Gutenprint: Used %.3f seconds user, %.3f seconds system, %.3f seconds elapsed\n",
 	  (double) tms.tms_utime / clocks_per_sec,
 	  (double) tms.tms_stime / clocks_per_sec,
 	  (double) (t2.tv_sec - t1.tv_sec) +
 	  ((double) (t2.tv_usec - t1.tv_usec)) / 1000000.0);
-  if (! suppress_messages)
-    fputs("INFO: Gutenprint Ready to print.\n", stderr);
+  stp_vars_destroy(default_settings);
+  if (page_size_name)
+    stp_free(page_size_name);
   if (fd != 0)
     close(fd);
-  stp_vars_destroy(default_settings);
   return 0;
 
 cups_abort:
@@ -1101,16 +1146,17 @@ cups_abort:
   clk = times(&tms);
   (void) gettimeofday(&t2, &tz);
   clocks_per_sec = sysconf(_SC_CLK_TCK);
-  fprintf(stderr, "DEBUG: Gutenprint printed total %.0f bytes\n",
+  fprintf(stderr, "DEBUG: Gutenprint: Printed total %.0f bytes\n",
 	  total_bytes_printed);
-  fprintf(stderr, "DEBUG: Gutenprint used %.3f seconds user, %.3f seconds system, %.3f seconds elapsed\n",
+  fprintf(stderr, "DEBUG: Gutenprint: Used %.3f seconds user, %.3f seconds system, %.3f seconds elapsed\n",
 	  (double) tms.tms_utime / clocks_per_sec,
 	  (double) tms.tms_stime / clocks_per_sec,
 	  (double) (t2.tv_sec - t1.tv_sec) +
 	  ((double) (t2.tv_usec - t1.tv_usec)) / 1000000.0);
-  fputs("ERROR: Gutenprint No pages found!\n", stderr);
-  fputs("ERROR: Gutenprint Invalid printer settings!\n", stderr);
+  stp_i18n_printf(po, _("ERROR: Invalid Gutenprint driver settings!\n"));
   stp_vars_destroy(default_settings);
+  if (page_size_name)
+    stp_free(page_size_name);
   if (fd != 0)
     close(fd);
   return 1;
@@ -1137,8 +1183,13 @@ cups_errfunc(void *file, const char *buf, size_t bytes)
   FILE *prn = (FILE *)file;
   while (where < bytes)
     {
-      if (print_messages_as_errors)
-	fputs("ERROR: Gutenprint: ", prn);
+      if (bytes - where > 6 && strncmp(buf, "ERROR:", 6) == 0)
+	{
+	  fputs("ERROR: Gutenprint error:", prn);
+	  buf += 6;
+	}
+      else if (print_messages_as_errors)
+	fputs("ERROR: Gutenprint error: ", prn);
       else
 	fputs("DEBUG: Gutenprint internal: ", prn);
       while (next_nl < bytes)
@@ -1172,7 +1223,7 @@ Image_get_appname(stp_image_t *image)		/* I - Image */
 {
   (void)image;
 
-  return ("CUPS 1.1.x driver based on Gutenprint");
+  return ("CUPS driver based on Gutenprint");
 }
 
 
@@ -1213,7 +1264,9 @@ Image_get_row(stp_image_t   *image,	/* I - Image */
 
   if ((cups = (cups_image_t *)(image->rep)) == NULL)
     {
-      fprintf(stderr, "ERROR: Gutenprint image is null!  Please report this bug to gimp-print-devel@lists.sourceforge.net\n");
+      stp_i18n_printf(po, _("ERROR: Gutenprint image is not initialized!  "
+                            "Please report this bug to "
+			    "gimp-print-devel@lists.sourceforge.net\n"));
       return STP_IMAGE_STATUS_ABORT;
     }
   bytes_per_line =
@@ -1221,23 +1274,23 @@ Image_get_row(stp_image_t   *image,	/* I - Image */
     CHAR_BIT;
 
   left_margin = ((cups->left_trim * cups->header.cupsBitsPerPixel) + CHAR_BIT - 1) /
-    CHAR_BIT; 
+    CHAR_BIT;
   right_margin = ((cups->right_trim * cups->header.cupsBitsPerPixel) + CHAR_BIT - 1) /
-    CHAR_BIT; 
+    CHAR_BIT;
   margin = cups->header.cupsBytesPerLine - left_margin - bytes_per_line -
     right_margin;
 
   if (cups->row < cups->header.cupsHeight)
   {
     if (! suppress_messages)
-      fprintf(stderr, "DEBUG2: Gutenprint reading %d %d\n",
+      fprintf(stderr, "DEBUG2: Gutenprint: Reading %d %d\n",
 	      bytes_per_line, cups->row);
     while (cups->row <= row && cups->row < cups->header.cupsHeight)
       {
 	if (left_margin > 0)
 	  {
 	    if (! suppress_messages)
-	      fprintf(stderr, "DEBUG2: Gutenprint tossing left %d (%d)\n",
+	      fprintf(stderr, "DEBUG2: Gutenprint: Tossing left %d (%d)\n",
 		      left_margin, cups->left_trim);
 	    throwaway_data(left_margin, cups);
 	  }
@@ -1246,7 +1299,7 @@ Image_get_row(stp_image_t   *image,	/* I - Image */
 	if (margin + right_margin > 0)
 	  {
 	    if (!suppress_messages)
-	      fprintf(stderr, "DEBUG2: Gutenprint tossing right %d (%d) + %d\n",
+	      fprintf(stderr, "DEBUG2: Gutenprint: Tossing right %d (%d) + %d\n",
 		      right_margin, cups->right_trim, margin);
 	    throwaway_data(margin + right_margin, cups);
 	  }
@@ -1267,8 +1320,8 @@ Image_get_row(stp_image_t   *image,	/* I - Image */
 	  memset(data, ((1 << CHAR_BIT) - 1), bytes_per_line);
 	  break;
 	default:
-	  fprintf(stderr, "ERROR: Gutenprint Unknown colorspace %d!\n",
-		  cups->header.cupsColorSpace);
+	  stp_i18n_printf(po, _("ERROR: Gutenprint detected a bad colorspace "
+	                        "(%d)!\n"), cups->header.cupsColorSpace);
 	  return STP_IMAGE_STATUS_ABORT;
 	}
     }
@@ -1283,9 +1336,9 @@ Image_get_row(stp_image_t   *image,	/* I - Image */
     {
       if (warned == 0)
 	{
-	  fprintf(stderr,
-		  "WARNING: Gutenprint detected bad CUPS bit depth (1).  "
-		  "Output quality is degraded.  Are you using psnup or non-ADSC PostScript?\n");
+	  fputs(_("WARNING: Gutenprint detected a bad color depth (1).  "
+		  "Output quality is degraded.  Are you using psnup or "
+		  "non-ADSC PostScript?\n"), stderr);
 	  warned = 1;
 	}
       for (i = cups->adjusted_width - 1; i >= 0; i--)
@@ -1301,15 +1354,18 @@ Image_get_row(stp_image_t   *image,	/* I - Image */
   if (new_percent > cups->last_percent)
     {
       if (! suppress_messages)
-	fprintf(stderr, "INFO: Gutenprint Printing page %d, %d%%\n",
-		cups->page + 1, new_percent);
+	{
+	  stp_i18n_printf(po, _("INFO: Printing page %d, %d%%\n"),
+			  cups->page + 1, new_percent);
+	  fprintf(stderr, "ATTR: job-media-progress=%d\n", new_percent);
+	}
       cups->last_percent = new_percent;
     }
 
   if (tmp_image_status != STP_IMAGE_STATUS_OK)
     {
       if (! suppress_messages)
-	fprintf(stderr, "DEBUG: Gutenprint image status %d\n", tmp_image_status);
+	fprintf(stderr, "DEBUG: Gutenprint: Image status %d\n", tmp_image_status);
     }
   return tmp_image_status;
 }
@@ -1348,7 +1404,7 @@ Image_init(stp_image_t *image)		/* I - Image */
   cups->last_percent = 0;
 
   if (! suppress_messages)
-    fprintf(stderr, "INFO: Starting page %d...\n", cups->page + 1);
+    stp_i18n_printf(po, _("INFO: Starting page %d...\n"), cups->page + 1);
   /* cups->page + 1 because users expect 1-based counting */
 }
 
@@ -1366,7 +1422,7 @@ Image_conclude(stp_image_t *image)	/* I - Image */
     return;
 
   if (! suppress_messages)
-    fprintf(stderr, "INFO: Gutenprint Finished page %d...\n", cups->page + 1);
+    stp_i18n_printf(po, _("INFO: Finished page %d...\n"), cups->page + 1);
 }
 
 /*
@@ -1389,5 +1445,5 @@ Image_width(stp_image_t *image)	/* I - Image */
 
 
 /*
- * End of "$Id: rastertoprinter.c,v 1.120 2008/01/02 01:39:06 rlk Exp $".
+ * End of "$Id: rastertoprinter.c,v 1.136 2008/10/04 17:47:50 rlk Exp $".
  */
diff --git a/src/cups/test-ppds b/src/cups/test-ppds
index 868b072..a5fa5a7 100755
--- a/src/cups/test-ppds
+++ b/src/cups/test-ppds
@@ -1,8 +1,11 @@
 #!/bin/sh
 
-rm -rf ppd ppd-stamp
-
-make ppd
+if [ "$#" = 0 ] ; then
+    echo "Bypassing test-ppds for now due to bugs in cupstestppd!"
+    exit 0
+    rm -rf ppd ppd-stamp
+    make ppd
+fi
 
 ppd_count=`find ppd \( -name '*.ppd.gz' -o -name '*.ppd' \) -print | wc -l`
 
@@ -13,7 +16,13 @@ if [ -z "$failures" ] ; then
     exit 0
 fi
 
-echo $failures | xargs cupstestppd
+# Use this with "normal" PPD files without translated numbers.
+echo $failures | xargs cupstestppd 2>&1 | egrep -v 'Missing "[a-z][a-z](_[A-Z][A-Z])?" translation string for option Stp((Brightness|Contrast|Saturation), choice None|([a-zA-Z0-9]+, choice (-?[0-9]+)))!$' |egrep -v 'Missing cupsICCProfile file'
+
+# Use this with PPD files with translated numbers (genppd -N)
+# With normal globalized PPD files this will yield hundreds of megabytes
+# of errors.
+#echo $failures | xargs cupstestppd 2>&1 |egrep -v 'Missing cupsICCProfile file'
 
 fail_count=`echo "$failures" | wc -l`
 echo "$fail_count/$ppd_count fail"
diff --git a/src/cups/test-rastertogutenprint.in b/src/cups/test-rastertogutenprint.in
index afa38d7..8582037 100755
--- a/src/cups/test-rastertogutenprint.in
+++ b/src/cups/test-rastertogutenprint.in
@@ -1,9 +1,9 @@
-#!/bin/sh
+#!@SHELL@
 
 retval=0
 
 if [ -z "$STP_DATA_PATH" ] ; then
-    STP_DATA_PATH=`pwd`/../main
+    STP_DATA_PATH=`pwd`/../xml
     export STP_DATA_PATH
 fi
 
@@ -14,6 +14,11 @@ fi
 
 single=''
 all_models=''
+verbose=''
+make_ppds=1
+md5dir=''
+outdir=''
+cupsargs=''
 
 usage() {
     echo "Usage: test-rastertogutenprint [-s] [-v|--valgrind]"
@@ -28,6 +33,11 @@ set_args() {
 	    -v|--valgrind) valopts='--tool=memcheck' ; valgrind=`expr $valgrind + 1` ;;
 	    -c|--cachegrind) valopts='--tool=cachegrind'; valgrind=4 ;;
 	    -g|--gdb-attach) valopts='--gdb-attach=yes' ;;
+	    -V|--verbose) verbose=1 ;;
+	    -n|--no-make-ppds) make_ppds='' ;;
+	    -O|--output) shift; outdir="$1" ;;
+	    -o|--option) shift; cupsargs="$cupsargs $1" ;;
+	    -m|--md5dir) shift; md5dir="$1" ;;
 	    --) shift; args="$@"; return ;;
 	    *) return ;;
 	esac
@@ -35,20 +45,47 @@ set_args() {
     done
 }
 
+set_args `getopt vcgsVnO:m:o: "$@"`
 
-set_args `getopt vcgs "$@"`
+if [ -n "$outdir" -a ! -d "$outdir" ] ; then
+    mkdir -p "$outdir"
+fi
+if [ -n "$md5dir" -a ! -d "$md5dir" ] ; then
+    mkdir -p "$md5dir"
+fi
 
 version="@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@";
 cupsdir="@cups_conf_serverbin@/filter"
-pages='24-26'
+if [ -x "$cupsdir/pstoraster" ] ; then
+    pages='page-ranges=24-26 '
+else
+    pages=''
+fi
 
 if [ ! -x "$cupsdir/cgpdftoraster" -a ! -x "$cupsdir/pdftops" ] ; then
     echo 'CUPS does not appear to be installed, skipping test'
     exit 0
 fi
 
-STP_SUPPRESS_MESSAGES=1
-export STP_SUPPRESS_MESSAGES
+cleanup() {
+    if [ -f "$tfile" ] ; then
+	rm -f $tfile
+    fi
+    exit 1
+}
+
+pdftops="`type -p pdftops`"
+
+if [ -n "$pdftops" -a ! -x "$cupsdir/cgpdftoraster" ] ; then
+    tfile=`mktemp`
+    trap cleanup 1 2 3 6 14 15 30
+    $pdftops -f 24 -l 26 ../../doc/gutenprint-users-manual.pdf $tfile
+fi
+
+if [ -z "$verbose" ] ; then
+    STP_SUPPRESS_MESSAGES=1
+    export STP_SUPPRESS_MESSAGES
+fi
 
 is_duplicate() {
     model=`gunzip -c "$1" | grep '^.StpDriverModelFamily' | awk '{print $2}'`
@@ -60,13 +97,20 @@ is_duplicate() {
     all_models="$model $all_models"
 }
 
+# Note that using CUPS arguments may trigger valgrind memory leaks in
+# CUPS.
+#cupsargs='PageSize=Custom.400.00x500.00'
+#cupsargs='PageSize=Custom.324x495 Resolution=180dpi'
+#cupsargs='PageSize=w324h495 Resolution=180dpi'
+#cupsargs='PageSize=A8'
+
 run_rastertogp() {
     case "$valgrind" in
-	1) valgrind $valopts -q --num-callers=100 --leak-check=yes --error-limit=no ./rastertogutenprint.$version 1 1 1 1 '' ;;
-	2) valgrind $valopts --num-callers=100 --leak-resolution=high --leak-check=yes --error-limit=no ./rastertogutenprint.$version 1 1 1 1 '' ;;
-	3) valgrind $valopts --error-limit=no --num-callers=100 --show-reachable=yes --leak-resolution=high --leak-check=yes ./rastertogutenprint.$version 1 1 1 1 '' ;;
-	4) valgrind $valopts ./rastertogutenprint.$version 1 1 1 1 '' ;;
-	*) ./rastertogutenprint.$version 1 1 1 1 '' ;;
+	1) valgrind $valopts -q --num-callers=100 --leak-check=yes --error-limit=no ./rastertogutenprint.$version 1 1 1 1 "$cupsargs" ;;
+	2) valgrind $valopts --num-callers=100 --leak-resolution=high --leak-check=yes --error-limit=no ./rastertogutenprint.$version 1 1 1 1 "$cupsargs" ;;
+	3) valgrind $valopts --error-limit=no --num-callers=100 --show-reachable=yes --leak-resolution=high --leak-check=yes ./rastertogutenprint.$version 1 1 1 1 "$cupsargs" ;;
+	4) valgrind $valopts ./rastertogutenprint.$version 1 1 1 1 "$cupsargs" ;;
+	*) ./rastertogutenprint.$version 1 1 1 1 "$cupsargs" ;;
     esac
     if [ $? -ne 0 ] ; then
 	retval=1
@@ -74,8 +118,87 @@ run_rastertogp() {
     exit $retval
 }
 
+get_ppds() {
+    args="$@"
+    if [ -n "$args" ] ; then
+	for f in "$@" ; do
+	    if [ -r "$f" ] ; then
+		echo $f
+	    elif [ -r "ppd/C/$f" ] ; then
+		echo "ppd/C/$f"
+	    elif [ -f "ppd/C/${f}.ppd" ] ; then
+		echo "ppd/C/${f}.ppd"
+	    elif [ -f "ppd/C/${f}.ppd.gz" ] ; then
+		echo "ppd/C/${f}.ppd.gz"
+	    elif [ -f "ppd/C/${f}.ppd.GZ" ] ; then
+		echo "ppd/C/${f}.ppd.GZ"
+	    elif [ -f "ppd/C/${f}.ppd.bz2" ] ; then
+		echo "ppd/C/${f}.ppd.bz2"
+	    elif [ -f "ppd/C/${f}.ppd.BZ2" ] ; then
+		echo "ppd/C/${f}.ppd.BZ2"
+	    elif [ -f "ppd/C/${f}.ppd.z" ] ; then
+		echo "ppd/C/${f}.ppd.z"
+	    elif [ -f "ppd/C/${f}.ppd.Z" ] ; then
+		echo "ppd/C/${f}.ppd.Z"
+	    elif [ -f "ppd/C/stp-${f}.ppd" ] ; then
+		echo "ppd/C/stp-${f}.ppd"
+	    elif [ -f "ppd/C/stp-${f}.ppd.gz" ] ; then
+		echo "ppd/C/stp-${f}.ppd.gz"
+	    elif [ -f "ppd/C/stp-${f}.ppd.GZ" ] ; then
+		echo "ppd/C/stp-${f}.ppd.GZ"
+	    elif [ -f "ppd/C/stp-${f}.ppd.bz2" ] ; then
+		echo "ppd/C/stp-${f}.ppd.bz2"
+	    elif [ -f "ppd/C/stp-${f}.ppd.BZ2" ] ; then
+		echo "ppd/C/stp-${f}.ppd.BZ2"
+	    elif [ -f "ppd/C/stp-${f}.ppd.z" ] ; then
+		echo "ppd/C/stp-${f}.ppd.z"
+	    elif [ -f "ppd/C/stp-${f}.ppd.Z" ] ; then
+		echo "ppd/C/stp-${f}.ppd.Z"
+	    elif [ -f "ppd/C/stp-${f}.${version}.ppd" ] ; then
+		echo "ppd/C/stp-${f}.${version}.ppd"
+	    elif [ -f "ppd/C/stp-${f}.${version}.ppd.gz" ] ; then
+		echo "ppd/C/stp-${f}.${version}.ppd.gz"
+	    elif [ -f "ppd/C/stp-${f}.${version}.ppd.GZ" ] ; then
+		echo "ppd/C/stp-${f}.${version}.ppd.GZ"
+	    elif [ -f "ppd/C/stp-${f}.${version}.ppd.bz2" ] ; then
+		echo "ppd/C/stp-${f}.${version}.ppd.bz2"
+	    elif [ -f "ppd/C/stp-${f}.${version}.ppd.BZ2" ] ; then
+		echo "ppd/C/stp-${f}.${version}.ppd.BZ2"
+	    elif [ -f "ppd/C/stp-${f}.${version}.ppd.z" ] ; then
+		echo "ppd/C/stp-${f}.${version}.ppd.z"
+	    elif [ -f "ppd/C/stp-${f}.${version}.ppd.Z" ] ; then
+		echo "ppd/C/stp-${f}.${version}.ppd.Z"
+	    fi
+	done
+    else
+	echo ppd/C/*.ppd*
+    fi
+}
+
+if [ -n "$make_ppds" -o ! -d ppd/C ] ; then
+    make ppd-nonls
+fi
+
+do_output() {
+    if [ -n "`echo "$PPD" |grep '\.gz$'`" ] ; then
+	driver=`gunzip -c "$PPD" | grep '^\*StpDriverName:' |awk '{print $2}' | sed 's/"//g'`
+    else
+	driver=`grep '^\*StpDriverName:' "$PPD" |awk '{print $2}' | sed 's/"//g'`
+    fi
+    if [ -n "$outdir" ] ; then
+	cat > "$outdir/$driver.prn"
+	if [ -n "$md5dir" ] ; then
+	    (cd "$outdir"; cat "$driver.prn") | md5sum | sed "s/-/\*$driver/" > "$md5dir/$driver.md5"
+	fi
+    elif [ -n "$md5dir" ] ; then
+	cat | md5sum | sed "s/-/\*$driver/" > "$md5dir/$driver.md5"
+    else
+	cat > /dev/null
+    fi
+}
+
 if [ -d ppd/C ] ; then
-    for f in ppd/C/*.ppd* ; do
+    for f in `get_ppds $args` ; do
 	skip=''
 	if [ -n "$single" ] ; then
 	    is_duplicate $f
@@ -85,9 +208,13 @@ if [ -d ppd/C ] ; then
 	    PPD=$f
 	    export PPD
 	    if [ -x "$cupsdir/cgpdftoraster" ] ; then
-		output="`($cupsdir/cgpdftoraster 1 1 1 1 page-ranges=$pages < ../../doc/gutenprint-users-manual.pdf 2>/dev/null | run_rastertogp > /dev/null) 2>&1`"
+		output="`($cupsdir/cgpdftoraster 1 1 1 1 $pages < ../../doc/gutenprint-users-manual.pdf 2>/dev/null | run_rastertogp | do_output) 2>&1`"
+	    elif [ -f "$tfile" ] ; then
+		output="`($cupsdir/pstops 1 1 1 1 \"$cupsargs\" < $tfile 2>/dev/null | $cupsdir/pstoraster 2>/dev/null | run_rastertogp | do_output) 2>&1`"
+	    elif [ -x "$cupsdir/pstoraster" ] ; then
+		output="`($cupsdir/pdftops 1 1 1 1 \"$pages$cupsargs\" < ../../doc/gutenprint-users-manual.pdf 2>/dev/null | $cupsdir/pstops 1 1 1 1 \"$pages$cupsargs\" 2>/dev/null | $cupsdir/pstoraster 2>/dev/null | run_rastertogp | do_output) 2>&1`"
 	    else
-		output="`($cupsdir/pdftops 1 1 1 1 page-ranges=$pages < ../../doc/gutenprint-users-manual.pdf 2>/dev/null | $cupsdir/pstops 1 1 1 1 page-ranges=$pages 2>/dev/null | $cupsdir/pstoraster 2>/dev/null | run_rastertogp > /dev/null) 2>&1`"
+		output="`($cupsdir/imagetoraster 1 1 1 1 \"$pages$cupsargs\" < calibrate.ppm 2>/dev/null | run_rastertogp | do_output) 2>&1`"
 	    fi
 	    if [ $? -ne 0 ] ; then
 		retval=1
@@ -100,4 +227,7 @@ if [ -d ppd/C ] ; then
 	fi
     done
 fi
+if [ -f "$tfile" ] ; then
+    rm -f $tfile
+fi
 exit $retval
diff --git a/src/escputil/Makefile.in b/src/escputil/Makefile.in
index 0aeaade..d441e3c 100644
--- a/src/escputil/Makefile.in
+++ b/src/escputil/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,7 +17,7 @@
 # Variables
 
 #export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
-#export STP_DATA_PATH = $(top_srcdir)/src/main
+#export STP_DATA_PATH = $(top_srcdir)/src/xml
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
@@ -45,7 +45,8 @@ 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/progtest.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
@@ -61,7 +62,7 @@ am_escputil_OBJECTS = d4lib.$(OBJEXT) escputil.$(OBJEXT)
 escputil_OBJECTS = $(am_escputil_OBJECTS)
 am__DEPENDENCIES_1 =
 escputil_DEPENDENCIES = $(GUTENPRINT_LIBS) $(am__DEPENDENCIES_1)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -109,6 +110,7 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
+DSYMUTIL = @DSYMUTIL@
 DVIPDF = @DVIPDF@
 DVIPS = @DVIPS@
 ECHO = @ECHO@
@@ -129,6 +131,7 @@ GIMP2_LIBS = @GIMP2_LIBS@
 GIMPTOOL2_CHECK = @GIMPTOOL2_CHECK@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
 GNUCFLAGS = @GNUCFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
@@ -161,6 +164,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
@@ -181,9 +185,10 @@ MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -210,6 +215,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WHICH_PPDS = @WHICH_PPDS@
 XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
 abs_builddir = @abs_builddir@
@@ -324,8 +330,8 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	     || test -f $$p1 \
 	  ; then \
 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -388,8 +394,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -401,8 +407,8 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -412,13 +418,12 @@ ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff --git a/src/escputil/d4lib.c b/src/escputil/d4lib.c
index 46e508a..17cd4ae 100644
--- a/src/escputil/d4lib.c
+++ b/src/escputil/d4lib.c
@@ -312,7 +312,6 @@ static int printError(unsigned char errorNb)
    }
    fprintf(stderr,"Unknown IEEE 1284.4 error number %d\n",errorNb);
    return 0;
-   return 1; /* non recoverable error */
 }
 
 
diff --git a/src/escputil/escputil.c b/src/escputil/escputil.c
index 4ebdab3..f4fa3c0 100644
--- a/src/escputil/escputil.c
+++ b/src/escputil/escputil.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: escputil.c,v 1.92 2007/12/26 18:13:02 rlk Exp $"
+ * "$Id: escputil.c,v 1.96 2008/07/05 01:43:26 rlk Exp $"
  *
  *   Printer maintenance utility for EPSON Stylus (R) printers
  *
@@ -972,22 +972,23 @@ get_printer(int quiet, int fail_if_not_found)
 
 static const char *colors_new[] =
   {
-    N_("Black"),		/* 0 */
-    N_("Photo Black"),		/* 1 */
-    N_("Unknown"),		/* 2 */
-    N_("Cyan"),			/* 3 */
-    N_("Magenta"),		/* 4 */
-    N_("Yellow"),		/* 5 */
-    N_("Light Cyan"),		/* 6 */
-    N_("Light Magenta"),	/* 7 */
-    N_("Unknown"),		/* 8 */
-    N_("Unknown"),		/* 9 */
-    N_("Light Black"),		/* a */
-    N_("Matte Black"),		/* b */
-    N_("Red"),			/* c */
-    N_("Blue"),			/* d */
-    N_("Gloss Optimizer"),	/* e */
-    N_("Light Light Black"),	/* f */
+    N_("Black"),		/* 00 */
+    N_("Photo Black"),		/* 01 */
+    N_("Unknown"),		/* 02 */
+    N_("Cyan"),			/* 03 */
+    N_("Magenta"),		/* 04 */
+    N_("Yellow"),		/* 05 */
+    N_("Light Cyan"),		/* 06 */
+    N_("Light Magenta"),	/* 07 */
+    N_("Unknown"),		/* 08 */
+    N_("Unknown"),		/* 09 */
+    N_("Light Black"),		/* 0a */
+    N_("Matte Black"),		/* 0b */
+    N_("Red"),			/* 0c */
+    N_("Blue"),			/* 0d */
+    N_("Gloss Optimizer"),	/* 0e */
+    N_("Light Light Black"),	/* 0f */
+    N_("Orange"),		/* 10 */
   };
 static int color_count = sizeof(colors_new) / sizeof(const char *);
 
@@ -1006,7 +1007,7 @@ static const char *aux_colors[] =
     N_("Blue"),			/* a */
     NULL,			/* b */
     NULL,			/* c */
-    NULL,			/* d */
+    N_("Orange"),		/* d */
     NULL,			/* e */
     NULL,			/* f */
   };
@@ -1073,18 +1074,33 @@ print_error(int param)
     case 6:
       printf(_("Error: Paper out\n"));
       break;
+    case 0xc:
+      printf(_("Error: Miscellaneous paper error\n"));
+      break;
+    case 0x10:
+      printf(_("Error: Maintenance cartridge overflow\n"));
+      break;
     case 0x11:
       printf(_("Error: Wait return from the tear-off position\n"));
       break;
     case 0x12:
       printf(_("Error: Double feed error\n"));
       break;
+    case 0x1a:
+      printf(_("Error: Ink cartridge lever released\n\n"));
+      break;
     case 0x1c:
       printf(_("Error: Unrecoverable cutter error\n"));
       break;
     case 0x1d:
       printf(_("Error: Recoverable cutter jam\n"));
       break;
+    case 0x22:
+      printf(_("Error: No maintenance cartridge present\n"));
+      break;
+    case 0x25:
+      printf(_("Error: Rear cover open\n"));
+      break;
     case 0x29:
       printf(_("Error: CD Tray Out\n"));
       break;
@@ -1094,6 +1110,15 @@ print_error(int param)
     case 0x2b:
       printf(_("Error: Tray cover open\n"));
       break;
+    case 0x36:
+      printf(_("Error: Maintenance cartridge cover open\n"));
+      break;
+    case 0x37:
+      printf(_("Error: Front cover open\n"));
+      break;
+    case 0x41:
+      printf(_("Error: Maintenance request\n"));
+      break;
     default:
       printf(_("Error: Unknown (%d)\n"), param);
       break;
@@ -1101,6 +1126,44 @@ print_error(int param)
 }
 
 static void
+print_warning(int param, const stp_string_list_t *color_list)
+{
+  if (param >= 0x10 && param < 0x20)
+    {
+      param &= 0xf;
+      if (color_list && param < stp_string_list_count(color_list))
+	printf(_("Warning: %s Ink Low\n"),
+	       gettext(stp_string_list_param(color_list, param)->text));
+      else
+	printf(_("Warning: Channel %d Ink Low\n"), param);
+    }
+  else if (param >= 0x50 && param < 0x60)
+    {
+      param &= 0xf;
+      if (color_list && param < stp_string_list_count(color_list))
+	printf(_("Warning: %s Cleaning Disabled\n"),
+	       gettext(stp_string_list_param(color_list, param)->text));
+      else
+	printf(_("Warning: Channel %d Cleaning \n"), param);
+    }
+  else
+    {
+      switch (param)
+	{
+	case 0x20:
+	  printf(_("Warning: Maintenance cartridge near full\n"));
+	  break;
+	case 0x21:
+	  printf(_("Warning: Maintenance request pending\n"));
+	  break;
+	default:
+	  printf(_("Warning: Unknown (%d)\n"), param);
+	  break;
+	}
+    }
+}
+
+static void
 print_self_printing_state(int param)
 {
   switch (param)
@@ -1224,7 +1287,16 @@ do_new_status(status_cmd_t cmd, char *buf, int bytes,
   int i = 0;
   int j;
   const char *ind;
+  const stp_string_list_t *color_list = NULL;
+  stp_parameter_t desc;
+  const stp_vars_t *printvars = stp_printer_get_defaults(printer);
+  stp_describe_parameter(printvars, "ChannelNames", &desc);
+  if (desc.p_type == STP_PARAMETER_TYPE_STRING_LIST)
+    color_list = desc.bounds.str;
   STP_DEBUG(fprintf(stderr, "New format bytes: %d bytes\n", bytes));
+  if (cmd == CMD_STATUS)
+    printf(_("Printer Name: %s\n"),
+	    printer ? stp_printer_get_long_name(printer) : _("Unknown"));
   while (i < bytes)
     {
       unsigned hdr = buf[i];
@@ -1249,7 +1321,7 @@ do_new_status(status_cmd_t cmd, char *buf, int bytes,
 		printf("%18s    %20d\n",
 		       gettext(aux_colors[(int) ind[1]]), ind[2]);
 	      else
-		printf("%8s 0x%2x 0x%2x    %20d\n",
+		printf("%8s 0x%02x 0x%02x    %20d\n",
 		       _("Unknown"), (unsigned char) ind[0],
 		       (unsigned char) ind[1], ind[2]);
 	      ind += param;
@@ -1271,42 +1343,11 @@ do_new_status(status_cmd_t cmd, char *buf, int bytes,
 	      print_self_printing_state(param);
 	      break; 
 	    case 0x4:	/* Warning */
-#if 0
-	      /*
-	       * Bits mean different things on different printers
-	       * Need to figure out how to do this...
-	       * Maybe we don't really need to, since we're also
-	       * printing out ink levels
-	       */
-	      for (j = 0; j < total_param_count; i++)
+	      for (j = 0; j < total_param_count; j++)
 		{
 		  param = (unsigned) buf[i + j + 2];
-		  switch (param)
-		    {
-		    case 0x10:
-		      printf(_("Warning: Black Ink Low\n"));
-		      break;
-		    case 0x11:
-		      printf(_("Warning: Black Ink Low\n"));
-		      break;
-		    case 0x12:
-		      printf(_("Warning: Black Ink Low\n"));
-		      break;
-		    case 0x13:
-		      printf(_("Warning: Black Ink Low\n"));
-		      break;
-		    case 0x14:
-		      printf(_("Warning: Black Ink Low\n"));
-		      break;
-		    case 0x15:
-		      printf(_("Warning: Black Ink Low\n"));
-		      break;
-		    default:
-		      printf(_("Warning: Unknown (%d)\n"), param);
-		      break;
-		    }
+		  print_warning(param, color_list);
 		}
-#endif
 	      break;
 	    case 0x19:	/* Job name */
 	      if (total_param_count > 5)
@@ -1324,6 +1365,7 @@ do_new_status(status_cmd_t cmd, char *buf, int bytes,
 	}
       i += total_param_count + 2;
     }
+  stp_parameter_description_destroy(&desc);
   exit(0);
 }
 
diff --git a/src/foomatic/Makefile.am b/src/foomatic/Makefile.am
index f90f9d9..0f8937c 100644
--- a/src/foomatic/Makefile.am
+++ b/src/foomatic/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.50 2006/07/08 17:40:22 rlk Exp $
+## $Id: Makefile.am,v 1.51 2008/06/01 14:41:08 rlk Exp $
 ## Copyright (C) 2000 Roger Leigh
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -31,7 +31,7 @@ if BUILD_FOOMATIC_3
 BUILD_FOOMATIC = 1
 endif
 
-STP_ENV= STP_MODULE_PATH=$(top_builddir)/src/main/.libs:$(top_builddir)/src/main STP_DATA_PATH=$(top_srcdir)/src/main
+STP_ENV= STP_MODULE_PATH=$(top_builddir)/src/main/.libs:$(top_builddir)/src/main STP_DATA_PATH=$(top_srcdir)/src/xml
 
 LC_C_ENV= LC_ALL=C LANG=C LANGUAGE=C
 
@@ -95,7 +95,7 @@ clean-local:
 
 foomatic-data: foomatic-stamp
 
-foomatic-stamp: foomatic-generator foomatic-printermap $(noinst_PROGRAMS) mk_printerlist $(top_srcdir)/src/main/printers.xml $(top_srcdir)/src/main/papers.xml
+foomatic-stamp: foomatic-generator foomatic-printermap $(noinst_PROGRAMS) mk_printerlist $(top_srcdir)/src/xml/xml-stamp
 	-$(RM) -r foomatic-db
 	$(FOOMATIC_GENERATOR) -m $(srcdir)/foomatic-printermap -t $(srcdir)/foomatic-templates $(FOOMATIC_GENERATOR_EXTRA_OPTS) $(FOOMATIC_GENERATOR_FOOMATIC_3_OPTS)
 	$(FOOMATIC_GENERATOR) -s -m $(srcdir)/foomatic-printermap -t $(srcdir)/foomatic-templates $(FOOMATIC_GENERATOR_EXTRA_OPTS) $(FOOMATIC_GENERATOR_FOOMATIC_3_OPTS)
diff --git a/src/foomatic/Makefile.in b/src/foomatic/Makefile.in
index d854d6a..a192418 100644
--- a/src/foomatic/Makefile.in
+++ b/src/foomatic/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,7 +17,7 @@
 # Variables
 
 #export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
-#export STP_DATA_PATH = $(top_srcdir)/src/main
+#export STP_DATA_PATH = $(top_srcdir)/src/xml
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
@@ -50,7 +50,8 @@ 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/progtest.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
@@ -75,7 +76,7 @@ printer_options_DEPENDENCIES = $(GUTENPRINT_LIBS)
 am_printers_OBJECTS = printers.$(OBJEXT)
 printers_OBJECTS = $(am_printers_OBJECTS)
 printers_DEPENDENCIES = $(GUTENPRINT_LIBS)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -127,6 +128,7 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
+DSYMUTIL = @DSYMUTIL@
 DVIPDF = @DVIPDF@
 DVIPS = @DVIPS@
 ECHO = @ECHO@
@@ -147,6 +149,7 @@ GIMP2_LIBS = @GIMP2_LIBS@
 GIMPTOOL2_CHECK = @GIMPTOOL2_CHECK@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
 GNUCFLAGS = @GNUCFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
@@ -179,6 +182,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
@@ -199,9 +203,10 @@ MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -228,6 +233,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WHICH_PPDS = @WHICH_PPDS@
 XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
 abs_builddir = @abs_builddir@
@@ -300,7 +306,7 @@ GUTENPRINTUI_LIBS = $(top_builddir)/src/gutenprintui/libgutenprintui.la
 DISTDIRS = foomatic-templates-ijs
 LOCAL_CPPFLAGS = $(GUTENPRINT_CFLAGS)
 @BUILD_FOOMATIC_3_TRUE@BUILD_FOOMATIC = 1
-STP_ENV = STP_MODULE_PATH=$(top_builddir)/src/main/.libs:$(top_builddir)/src/main STP_DATA_PATH=$(top_srcdir)/src/main
+STP_ENV = STP_MODULE_PATH=$(top_builddir)/src/main/.libs:$(top_builddir)/src/main STP_DATA_PATH=$(top_srcdir)/src/xml
 LC_C_ENV = LC_ALL=C LANG=C LANGUAGE=C
 FOOMATIC_GENERATOR = $(STP_ENV) $(LC_C_ENV) ./foomatic-generator
 printer_options_SOURCES = printer_options.c
@@ -424,8 +430,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -437,8 +443,8 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -448,13 +454,12 @@ ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
@@ -639,7 +644,7 @@ clean-local:
 
 foomatic-data: foomatic-stamp
 
-foomatic-stamp: foomatic-generator foomatic-printermap $(noinst_PROGRAMS) mk_printerlist $(top_srcdir)/src/main/printers.xml $(top_srcdir)/src/main/papers.xml
+foomatic-stamp: foomatic-generator foomatic-printermap $(noinst_PROGRAMS) mk_printerlist $(top_srcdir)/src/xml/xml-stamp
 	-$(RM) -r foomatic-db
 	$(FOOMATIC_GENERATOR) -m $(srcdir)/foomatic-printermap -t $(srcdir)/foomatic-templates $(FOOMATIC_GENERATOR_EXTRA_OPTS) $(FOOMATIC_GENERATOR_FOOMATIC_3_OPTS)
 	$(FOOMATIC_GENERATOR) -s -m $(srcdir)/foomatic-printermap -t $(srcdir)/foomatic-templates $(FOOMATIC_GENERATOR_EXTRA_OPTS) $(FOOMATIC_GENERATOR_FOOMATIC_3_OPTS)
diff --git a/src/foomatic/foomatic-generator.in b/src/foomatic/foomatic-generator.in
index c72679d..57952a8 100644
--- a/src/foomatic/foomatic-generator.in
+++ b/src/foomatic/foomatic-generator.in
@@ -8,7 +8,8 @@ GetOptions("m=s" => \$opt_m,         # Map file
            "t=s" => \$opt_t,         # Template directory
 	   "f=s" => \$opt_f,         # Foomatic version
            "d=s" => \@opt_d,         # which Drivers?
-	   "s"   => \$opt_s);        # Generate simplified data
+	   "s"   => \$opt_s,         # Generate simplified data
+	   "x"   => \$opt_x);	     # Generate printer list
 
 
 # Wherever we put it...
@@ -97,26 +98,28 @@ my $opt_index = 0;
 
 use Data::Dumper;
 
-open PIPE, "./printer_options $simplified_subopt|" or die "Cannot run printer_options: $!\n";
-print STDERR "Loading options from ./printer_options $simplified_subopt...";
-while(<PIPE>) {
-    #print $_;
-    next if m!^#!;
-    eval $_;
-}
-close PIPE or die "Cannot run printer_options: $!\n";
-print STDERR "done.\n";
-
-if ($foomatic3) {
-    open PIPE, "./printer_margins $simplified_subopt|" or die "Cannot run printer_margins: $!\n";
-    print STDERR "Loading margins from ./printer_margins $simplified_subopt...";
+if (! $opt_x) {
+    open PIPE, "./printer_options $simplified_subopt|" or die "Cannot run printer_options: $!\n";
+    print STDERR "Loading options from ./printer_options $simplified_subopt...";
     while(<PIPE>) {
 	#print $_;
 	next if m!^#!;
 	eval $_;
     }
-    close PIPE or die "Cannot run printer_margins: $!\n";
+    close PIPE or die "Cannot run printer_options: $!\n";
     print STDERR "done.\n";
+
+    if ($foomatic3) {
+	open PIPE, "./printer_margins $simplified_subopt|" or die "Cannot run printer_margins: $!\n";
+	print STDERR "Loading margins from ./printer_margins $simplified_subopt...";
+	while(<PIPE>) {
+	    #print $_;
+	    next if m!^#!;
+	    eval $_;
+	}
+	close PIPE or die "Cannot run printer_margins: $!\n";
+	print STDERR "done.\n";
+    }
 }
 
 open PIPE, "./printers|" or die "Cannot run printers: $!\n";
@@ -138,22 +141,27 @@ $missing_drivers = 0;
 
 %driverlist = ();
 %foolist = ();
+%foomap = ();
 
 open PRINTERS, $mapfile or die "Cannot open mapfile $mapfile: $!\n";
 for (<PRINTERS>) {
     if (m!^#\s*gptofoo\s+([^\s]+)\s+([^\s]+)!) {
-	if ($driverlist{$1}) {
+	my $pname = $1;
+	my $fname = $2;
+	if ($driverlist{$pname}) {
 	    $missing_drivers = 1;
-	    warn "Duplicate driver $1\n";
+	    warn "Duplicate driver $pname\n";
 	}
-	$driverlist{$1} = 1;
-	if ($foolist{$2}) {
+	$driverlist{$pname} = $fname;
+	if ($foolist{$fname}) {
 	    $missing_drivers = 1;
-	    warn "Duplicate Foomatic ID $2\n";
+	    warn "Duplicate Foomatic ID $fname\n";
 	}
-	$foolist{$2} = 1;
-	push (@{$mapstp{$1}}, $2);
-	$mapfoo{$2} = $1;	# do we need?
+	$foolist{$fname} = 1;
+	push (@{$mapstp{$pname}}, $fname);
+	$mapfoo{$fname} = $pname;	# do we need?
+	$fname =~ s,printer/,,;
+	$foomap{$pname} = $fname;
     }
 }
 
@@ -166,7 +174,7 @@ for (keys(%stpdata)) {
 }
 
 for (keys(%mapstp)) {
-    if (!defined($stpdata{$_})) {
+    if (!defined($printer_name{$_})) {
 	$missing_drivers = 1;
 	warn "No gutenprint printer for foomatic ID $_.\n";
     }
@@ -176,6 +184,16 @@ if ($missing_drivers) {
    die "Cannot continue\n";
 }
 
+if ($opt_x) {
+    my (%printer_long_name) = reverse %printer_name;
+    for (sort keys %printer_long_name) {
+	my ($pn) = $printer_long_name{$_};
+	next if $printer_family{$pn} eq "ps" || $printer_family{$pn} eq "raw";
+	printf("%s	%s	%s\n", $_, $pn, $foomap{$pn});
+    }
+    exit;
+}
+
 # OK, now %stpdata is a big honking thing, and %defaults is in there, too.
 
 # Invert, to build %bar{$optionname} = [ choice1, choice2 ];
@@ -1653,10 +1671,9 @@ sub getprintoutmode {
 		(($respersquareinch == $veryhighmaxres) &&
 		 ($symmetry == $veryhighbestsymmetry) &&
 		 (qualityorder($qualstr, $veryhighbestqualstr) > 0))) {
-		unless (($stpprn =~ /^escp2/) && # Epson
-			(($xres > 1440) || # Resolution not higher than
-			 ($yres > 720) ||  # 1440x720
-			 ($qualstr eq "hq2"))) {  # Not "hq2"
+		unless (($xres > 1440) || # Resolution not higher than
+			($yres > 720) ||  # 1440x720
+			($qualstr eq "hq2")) { # Not "hq2"
 		    $veryhighbestsymmetry = $symmetry;
 		    $veryhighmaxres = $respersquareinch;
 		    $veryhighbestqualstr = $qualstr;
diff --git a/src/foomatic/foomatic-printermap b/src/foomatic/foomatic-printermap
index cbe6867..9778804 100644
--- a/src/foomatic/foomatic-printermap
+++ b/src/foomatic/foomatic-printermap
@@ -111,6 +111,7 @@
 #gptofoo bjc-PIXMA-iX5000 printer/Canon-PIXMA-iX5000
 #gptofoo bjc-PIXMA-Pro9500 printer/Canon-PIXMA-Pro9500
 #gptofoo bjc-MULTIPASS-MP150 printer/Canon-MULTIPASS-MP150
+#gptofoo bjc-MULTIPASS-MP160 printer/Canon-MULTIPASS-MP160
 #gptofoo bjc-MULTIPASS-MP170 printer/Canon-MULTIPASS-MP170
 #gptofoo bjc-MULTIPASS-MP180 printer/Canon-MULTIPASS-MP180
 #gptofoo bjc-MULTIPASS-MP500 printer/Canon-MULTIPASS-MP500
@@ -146,6 +147,12 @@
 #gptofoo epson-acl_c8500ps printer/Epson-AcuLaser_C8500PS
 #gptofoo epson-acl_c8600 printer/Epson-AcuLaser_C8600
 #gptofoo epson-acl_c8600ps printer/Epson-AcuLaser_C8600PS
+#gptofoo escp2-artisan700 printer/Epson-Artisan_700
+#gptofoo escp2-artisan800 printer/Epson-Artisan_800
+#gptofoo escp2-b300 printer/Epson-B300
+#gptofoo escp2-b308 printer/Epson-B308
+#gptofoo escp2-b500dn printer/Epson-B500DN
+#gptofoo escp2-b508dn printer/Epson-B508DN
 #gptofoo escp2-cl700 printer/Epson-CL_700
 #gptofoo escp2-cl750 printer/Epson-CL_750
 #gptofoo escp2-cl760 printer/Epson-CL_760
@@ -231,7 +238,10 @@
 #gptofoo escp2-px7000 printer/Epson-PX_7000
 #gptofoo escp2-px9000 printer/Epson-PX_9000
 #gptofoo escp2-pxa650 printer/Epson-PX_A650
+#gptofoo escp2-pxb300 printer/Epson-Offirio-PX_B300
+#gptofoo escp2-pxb500 printer/Epson-Offirio-PX_B500
 #gptofoo escp2-pxg5000 printer/Epson-PX_G5000
+#gptofoo escp2-pxg5300 printer/Epson-PX_G5300
 #gptofoo escp2-pxg900 printer/Epson-PX_G900
 #gptofoo escp2-pxg920 printer/Epson-PX_G920
 #gptofoo escp2-pxv500 printer/Epson-PX_V500
@@ -247,6 +257,7 @@
 #gptofoo escp2-picmate100 printer/Epson-PictureMate_100
 #gptofoo escp2-picmate200 printer/Epson-PictureMate_200
 #gptofoo escp2-picmate210 printer/Epson-PictureMate_210
+#gptofoo escp2-picmate215 printer/Epson-PictureMate_215
 #gptofoo escp2-picmate240 printer/Epson-PictureMate_240
 #gptofoo escp2-picmate250 printer/Epson-PictureMate_250
 #gptofoo escp2-picmate260 printer/Epson-PictureMate_260
@@ -321,6 +332,7 @@
 #gptofoo escp2-cx5200 printer/Epson-Stylus_CX5200
 #gptofoo escp2-cx5300 printer/Epson-Stylus_CX5300
 #gptofoo escp2-cx5400 printer/Epson-Stylus_CX5400
+#gptofoo escp2-cx5500 printer/Epson-Stylus_CX5500
 #gptofoo escp2-cx5600 printer/Epson-Stylus_CX5600
 #gptofoo escp2-cx5700 printer/Epson-Stylus_CX5700
 #gptofoo escp2-cx5800 printer/Epson-Stylus_CX5800
@@ -335,7 +347,10 @@
 #gptofoo escp2-cx7800 printer/Epson-Stylus_CX7800
 #gptofoo escp2-cx8300 printer/Epson-Stylus_CX8300
 #gptofoo escp2-cx8400 printer/Epson-Stylus_CX8400
+#gptofoo escp2-cx9300f printer/Epson-Stylus_CX9300F
 #gptofoo escp2-cx9400 printer/Epson-Stylus_CX9400
+#gptofoo escp2-cx9400f printer/Epson-Stylus_CX9400F
+#gptofoo escp2-cx9475f printer/Epson-Stylus_CX9475F
 #gptofoo escp2 printer/Epson-Stylus_Color
 #gptofoo escp2-1160 printer/Epson-Stylus_Color_1160
 #gptofoo escp2-1500 printer/Epson-Stylus_Color_1500
@@ -383,6 +398,11 @@
 #gptofoo escp2-dx7450 printer/Epson-Stylus_DX7450
 #gptofoo escp2-dx8400 printer/Epson-Stylus_DX8400
 #gptofoo escp2-dx8450 printer/Epson-Stylus_DX8450
+#gptofoo escp2-dx9400f printer/Epson-Stylus_DX9400F
+#gptofoo escp2-nx100 printer/Epson-Stylus_NX100
+#gptofoo escp2-nx200 printer/Epson-Stylus_NX200
+#gptofoo escp2-nx300 printer/Epson-Stylus_NX300
+#gptofoo escp2-nx400 printer/Epson-Stylus_NX400
 #gptofoo escp2-photo printer/Epson-Stylus_Photo
 #gptofoo escp2-1200 printer/Epson-Stylus_Photo_1200
 #gptofoo escp2-1270 printer/Epson-Stylus_Photo_1270
@@ -417,6 +437,7 @@
 #gptofoo escp2-ex printer/Epson-Stylus_Photo_EX
 #gptofoo escp2-ex3 printer/Epson-Stylus_Photo_EX3
 #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-r200 printer/Epson-Stylus_Photo_R200
 #gptofoo escp2-r210 printer/Epson-Stylus_Photo_R210
@@ -429,6 +450,7 @@
 #gptofoo escp2-r270 printer/Epson-Stylus_Photo_R270
 #gptofoo escp2-r280 printer/Epson-Stylus_Photo_R280
 #gptofoo escp2-r285 printer/Epson-Stylus_Photo_R285
+#gptofoo escp2-r290 printer/Epson-Stylus_Photo_R290
 #gptofoo escp2-r300 printer/Epson-Stylus_Photo_R300
 #gptofoo escp2-r310 printer/Epson-Stylus_Photo_R310
 #gptofoo escp2-r320 printer/Epson-Stylus_Photo_R320
@@ -450,24 +472,67 @@
 #gptofoo escp2-rx590 printer/Epson-Stylus_Photo_RX590
 #gptofoo escp2-rx595 printer/Epson-Stylus_Photo_RX595
 #gptofoo escp2-rx600 printer/Epson-Stylus_Photo_RX600
+#gptofoo escp2-rx610 printer/Epson-Stylus_Photo_RX610
 #gptofoo escp2-rx620 printer/Epson-Stylus_Photo_RX620
 #gptofoo escp2-rx630 printer/Epson-Stylus_Photo_RX630
 #gptofoo escp2-rx640 printer/Epson-Stylus_Photo_RX640
 #gptofoo escp2-rx680 printer/Epson-Stylus_Photo_RX680
 #gptofoo escp2-rx685 printer/Epson-Stylus_Photo_RX685
+#gptofoo escp2-rx690 printer/Epson-Stylus_Photo_RX690
 #gptofoo escp2-rx700 printer/Epson-Stylus_Photo_RX700
-#gptofoo escp2-10000 printer/Epson-Stylus_Pro_10000
 #gptofoo escp2-5000 printer/Epson-Stylus_Pro_5000
 #gptofoo escp2-5500 printer/Epson-Stylus_Pro_5500
 #gptofoo escp2-7000 printer/Epson-Stylus_Pro_7000
 #gptofoo escp2-7500 printer/Epson-Stylus_Pro_7500
 #gptofoo escp2-7600 printer/Epson-Stylus_Pro_7600
+#gptofoo escp2-7800 printer/Epson-Stylus_Pro_7800
+#gptofoo escp2-7880 printer/Epson-Stylus_Pro_7880
 #gptofoo escp2-9000 printer/Epson-Stylus_Pro_9000
 #gptofoo escp2-9500 printer/Epson-Stylus_Pro_9500
 #gptofoo escp2-9600 printer/Epson-Stylus_Pro_9600
+#gptofoo escp2-9800 printer/Epson-Stylus_Pro_9800
+#gptofoo escp2-9880 printer/Epson-Stylus_Pro_9880
+#gptofoo escp2-10000 printer/Epson-Stylus_Pro_10000
+#gptofoo escp2-11880 printer/Epson-Stylus_Pro_11880
 #gptofoo escp2-pro-xl printer/Epson-Stylus_Pro_XL
 #gptofoo escp2-scan2000 printer/Epson-Stylus_Scan_2000
 #gptofoo escp2-scan2500 printer/Epson-Stylus_Scan_2500
+#gptofoo escp2-px101 printer/Epson-PX_101
+#gptofoo escp2-px201 printer/Epson-PX_201
+#gptofoo escp2-px601f printer/Epson-PX_601F
+#gptofoo escp2-of-b30 printer/Epson-Stylus_Office_B30
+#gptofoo escp2-of-b33 printer/Epson-Stylus_Office_B33
+#gptofoo escp2-of-b40w printer/Epson-Stylus_Office_B40W
+#gptofoo escp2-of-t30 printer/Epson-Stylus_Office_T30
+#gptofoo escp2-of-t33 printer/Epson-Stylus_Office_T33
+#gptofoo escp2-of-t40w printer/Epson-Stylus_Office_T40W
+#gptofoo escp2-of-bx300f printer/Epson-Stylus_Office_BX300F
+#gptofoo escp2-of-bx600fw printer/Epson-Stylus_Office_BX600FW
+#gptofoo escp2-of-sx600fw printer/Epson-Stylus_Office_SX600FW
+#gptofoo escp2-of-tx600fw printer/Epson-Stylus_Office_TX600FW
+#gptofoo escp2-of-tx300f printer/Epson-Stylus_Office_TX300F
+#gptofoo escp2-meof70 printer/Epson-ME_Office_70
+#gptofoo escp2-meof80w printer/Epson-ME_Office_80W
+#gptofoo escp2-meof700fw printer/Epson-ME_Office_700FW
+#gptofoo escp2-wf30 printer/Epson-WorkForce_30
+#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-px800fw printer/Epson-Stylus_PX800FW
+#gptofoo escp2-s20 printer/Epson-Stylus_S20
+#gptofoo escp2-sx100 printer/Epson-Stylus_SX100
+#gptofoo escp2-sx105 printer/Epson-Stylus_SX105
+#gptofoo escp2-sx200 printer/Epson-Stylus_SX200
+#gptofoo escp2-sx205 printer/Epson-Stylus_SX205
+#gptofoo escp2-sx400 printer/Epson-Stylus_SX400
+#gptofoo escp2-sx405 printer/Epson-Stylus_SX405
+#gptofoo escp2-t20 printer/Epson-Stylus_T20
+#gptofoo escp2-tx100 printer/Epson-Stylus_TX100
+#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 fujifilm-cx400 printer/Fujifilm-Printpix-CX-400
 #gptofoo fujifilm-cx550 printer/Fujifilm-Printpix-CX-550
 #gptofoo fujifilm-nx500 printer/Fujifilm-FinePix-NX-500
@@ -810,21 +875,21 @@
 #gptofoo nec-ssc_660i printer/NEC-SuperScript_660i
 #gptofoo nec-ssc_860 printer/NEC-SuperScript_860
 #gptofoo nec-ssc_870 printer/NEC-SuperScript_870
-#gptofoo okidata-ol400 printer/Okidata-OL400
-#gptofoo okidata-ol400e printer/Okidata-OL400e
-#gptofoo okidata-ol400ex printer/Okidata-OL400ex
-#gptofoo okidata-ol410e printer/Okidata-OL410e
-#gptofoo okidata-ol600e printer/Okidata-OL600e
-#gptofoo okidata-ol610e_s printer/Okidata-OL610e_S
-#gptofoo okidata-ol800 printer/Okidata-OL800
-#gptofoo okidata-ol810ex printer/Okidata-OL810ex
-#gptofoo okidata-okp_10e printer/Okidata-Okipage_10e
-#gptofoo okidata-okp_10ex printer/Okidata-Okipage_10ex
-#gptofoo okidata-okp_14ex printer/Okidata-Okipage_14ex
-#gptofoo okidata-okp_6e printer/Okidata-Okipage_6e
-#gptofoo okidata-okp_6ex printer/Okidata-Okipage_6ex
-#gptofoo okidata-okp_8p printer/Okidata-Okipage_8p
-#gptofoo okidata-super_6e printer/Okidata-Super_6e
+#gptofoo okidata-ol400 printer/Oki-OL400
+#gptofoo okidata-ol400e printer/Oki-OL400e
+#gptofoo okidata-ol400ex printer/Oki-OL400ex
+#gptofoo okidata-ol410e printer/Oki-OL410e
+#gptofoo okidata-ol600e printer/Oki-OL600e
+#gptofoo okidata-ol610e_s printer/Oki-OL610e_S
+#gptofoo okidata-ol800 printer/Oki-OL800
+#gptofoo okidata-ol810ex printer/Oki-OL810ex
+#gptofoo okidata-okp_10e printer/Oki-Okipage_10e
+#gptofoo okidata-okp_10ex printer/Oki-Okipage_10ex
+#gptofoo okidata-okp_14ex printer/Oki-Okipage_14ex
+#gptofoo okidata-okp_6e printer/Oki-Okipage_6e
+#gptofoo okidata-okp_6ex printer/Oki-Okipage_6ex
+#gptofoo okidata-okp_8p printer/Oki-Okipage_8p
+#gptofoo okidata-super_6e printer/Oki-Super_6e
 #gptofoo olivetti-jp350s printer/Olivetti-JP350S
 #gptofoo olivetti-pg_306 printer/Olivetti-PG_306
 #gptofoo olympus-p10 printer/Olympus-P-10
@@ -880,3 +945,466 @@
 #gptofoo xerox-dp_p8e printer/Xerox-DocuPrint_P8e
 #gptofoo xerox-dc_400 printer/Xerox-Document_Centre_400
 #gptofoo xerox-wc_m118 printer/Xerox-Work_Centre_M118
+#gptofoo brother-dcp-8045d printer/Brother-DCP-8045D
+#gptofoo brother-hl-1430 printer/Brother-HL-1430
+#gptofoo brother-hl-1450 printer/Brother-HL-1450
+#gptofoo brother-hl-1470n printer/Brother-HL-1470N
+#gptofoo brother-hl-1650 printer/Brother-HL-1650
+#gptofoo brother-hl-1670n printer/Brother-HL-1670N
+#gptofoo brother-hl-1850 printer/Brother-HL-1850
+#gptofoo brother-hl-1870n printer/Brother-HL-1870N
+#gptofoo brother-hl-2460 printer/Brother-HL-2460
+#gptofoo brother-hl-2460n printer/Brother-HL-2460N
+#gptofoo brother-hl-5030 printer/Brother-HL-5030
+#gptofoo brother-hl-5040 printer/Brother-HL-5040
+#gptofoo brother-hl-5050 printer/Brother-HL-5050
+#gptofoo brother-hl-5070n printer/Brother-HL-5070N
+#gptofoo brother-hl-5140 printer/Brother-HL-5140
+#gptofoo brother-hl-5150d printer/Brother-HL-5150D
+#gptofoo brother-hl-5170dn printer/Brother-HL-5170DN
+#gptofoo brother-hl-7050 printer/Brother-HL-7050
+#gptofoo brother-hl-7050n printer/Brother-HL-7050N
+#gptofoo epson-epl-n2050 printer/Epson-EPL-N2050
+#gptofoo epson-epl-n2050ps printer/Epson-EPL-N2050PS
+#gptofoo epson-epl-n2050psplus printer/Epson-EPL-N2050PS+
+#gptofoo epson-epl-n2050plus printer/Epson-EPL-N2050+
+#gptofoo epson-epl-n2120 printer/Epson-EPL-N2120
+#gptofoo epson-epl-n2500 printer/Epson-EPL-N2500
+#gptofoo epson-epl-n2500ps printer/Epson-EPL-N2500PS
+#gptofoo epson-epl-n2750 printer/Epson-EPL-N2750
+#gptofoo epson-epl-n2750ps printer/Epson-EPL-N2750PS
+#gptofoo gestetner-10512 printer/Gestetner-10512
+#gptofoo gestetner-2212 printer/Gestetner-2212
+#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-4502 printer/Gestetner-4502
+#gptofoo gestetner-4532 printer/Gestetner-4532
+#gptofoo gestetner-4245g printer/Gestetner-4245g
+#gptofoo gestetner-6002 printer/Gestetner-6002
+#gptofoo gestetner-7502 printer/Gestetner-7502
+#gptofoo gestetner-9002 printer/Gestetner-9002
+#gptofoo gestetner-dsm415 printer/Gestetner-DSm415
+#gptofoo gestetner-dsm615 printer/Gestetner-DSm615
+#gptofoo gestetner-dsm616 printer/Gestetner-DSm616
+#gptofoo gestetner-dsm618 printer/Gestetner-DSm618
+#gptofoo gestetner-dsm618d printer/Gestetner-DSm618d
+#gptofoo gestetner-dsm620 printer/Gestetner-DSm620
+#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-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-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-mp_3350 printer/Gestetner-MP_3350
+#gptofoo gestetner-mp_3350b printer/Gestetner-MP_3350B
+#gptofoo gestetner-mp_4000 printer/Gestetner-MP_4000
+#gptofoo gestetner-mp_4000b printer/Gestetner-MP_4000B
+#gptofoo gestetner-mp_5000 printer/Gestetner-MP_5000
+#gptofoo gestetner-mp_5000b printer/Gestetner-MP_5000B
+#gptofoo infotec-4353_mf printer/Infotec-4353_MF
+#gptofoo infotec-4452_mf printer/Infotec-4452_MF
+#gptofoo infotec-is2022 printer/Infotec-IS2022
+#gptofoo infotec-is2027 printer/Infotec-IS2027
+#gptofoo infotec-is2032 printer/Infotec-IS2032
+#gptofoo infotec-is2035 printer/Infotec-IS2035
+#gptofoo infotec-is2045 printer/Infotec-IS2045
+#gptofoo infotec-is2090 printer/Infotec-IS2090
+#gptofoo infotec-is2105 printer/Infotec-IS2105
+#gptofoo infotec-is_2015 printer/Infotec-IS_2015
+#gptofoo infotec-is_2018 printer/Infotec-IS_2018
+#gptofoo infotec-is_2018d printer/Infotec-IS_2018D
+#gptofoo infotec-is_2060 printer/Infotec-IS_2060
+#gptofoo infotec-is_2075 printer/Infotec-IS_2075
+#gptofoo infotec-is_2122 printer/Infotec-IS_2122
+#gptofoo infotec-is_2127 printer/Infotec-IS_2127
+#gptofoo infotec-is_2132 printer/Infotec-IS_2132
+#gptofoo infotec-is_2135 printer/Infotec-IS_2135
+#gptofoo infotec-is_2145 printer/Infotec-IS_2145
+#gptofoo infotec-is_2151 printer/Infotec-IS_2151
+#gptofoo infotec-is_2160 printer/Infotec-IS_2160
+#gptofoo infotec-is_2175 printer/Infotec-IS_2175
+#gptofoo infotec-is_2215 printer/Infotec-IS_2215
+#gptofoo infotec-is_2216 printer/Infotec-IS_2216
+#gptofoo infotec-is_2220 printer/Infotec-IS_2220
+#gptofoo infotec-is_2220d printer/Infotec-IS_2220D
+#gptofoo infotec-is_2225 printer/Infotec-IS_2225
+#gptofoo infotec-is_2230 printer/Infotec-IS_2230
+#gptofoo infotec-is_2235 printer/Infotec-IS_2235
+#gptofoo infotec-is_2245 printer/Infotec-IS_2245
+#gptofoo infotec-is_2255 printer/Infotec-IS_2255
+#gptofoo infotec-is_2265 printer/Infotec-IS_2265
+#gptofoo infotec-is_2275 printer/Infotec-IS_2275
+#gptofoo infotec-is_2316 printer/Infotec-IS_2316
+#gptofoo infotec-is_2320 printer/Infotec-IS_2320
+#gptofoo infotec-is_2325 printer/Infotec-IS_2325
+#gptofoo infotec-is_2416 printer/Infotec-IS_2416
+#gptofoo infotec-is_2425 printer/Infotec-IS_2425
+#gptofoo infotec-is_2430 printer/Infotec-IS_2430
+#gptofoo infotec-is_2435 printer/Infotec-IS_2435
+#gptofoo infotec-is_2445 printer/Infotec-IS_2445
+#gptofoo infotec-is_3090 printer/Infotec-IS_3090
+#gptofoo infotec-is_3110 printer/Infotec-IS_3110
+#gptofoo infotec-is_3135 printer/Infotec-IS_3135
+#gptofoo infotec-mp_2550 printer/Infotec-MP_2550
+#gptofoo infotec-mp_2550b printer/Infotec-MP_2550B
+#gptofoo infotec-mp_3350 printer/Infotec-MP_3350
+#gptofoo infotec-mp_3350b printer/Infotec-MP_3350B
+#gptofoo infotec-mp_4000 printer/Infotec-MP_4000
+#gptofoo infotec-mp_4000b printer/Infotec-MP_4000B
+#gptofoo infotec-mp_5000 printer/Infotec-MP_5000
+#gptofoo infotec-mp_5000b printer/Infotec-MP_5000B
+#gptofoo lanier-5622 printer/Lanier-5622
+#gptofoo lanier-5627 printer/Lanier-5627
+#gptofoo lanier-5632 printer/Lanier-5632
+#gptofoo lanier-5635 printer/Lanier-5635
+#gptofoo lanier-5645 printer/Lanier-5645
+#gptofoo lanier-ld0105 printer/Lanier-LD0105
+#gptofoo lanier-ld015 printer/Lanier-LD015
+#gptofoo lanier-ld035 printer/Lanier-LD035
+#gptofoo lanier-ld045 printer/Lanier-LD045
+#gptofoo lanier-ld060 printer/Lanier-LD060
+#gptofoo lanier-ld075 printer/Lanier-LD075
+#gptofoo lanier-ld090 printer/Lanier-LD090
+#gptofoo lanier-ld115 printer/Lanier-LD115
+#gptofoo lanier-ld116 printer/Lanier-LD116
+#gptofoo lanier-ld118 printer/Lanier-LD118
+#gptofoo lanier-ld118d printer/Lanier-LD118d
+#gptofoo lanier-ld120 printer/Lanier-LD120
+#gptofoo lanier-ld120d printer/Lanier-LD120d
+#gptofoo lanier-ld122 printer/Lanier-LD122
+#gptofoo lanier-ld127 printer/Lanier-LD127
+#gptofoo lanier-ld132 printer/Lanier-LD132
+#gptofoo lanier-ld135 printer/Lanier-LD135
+#gptofoo lanier-ld145 printer/Lanier-LD145
+#gptofoo lanier-ld151 printer/Lanier-LD151
+#gptofoo lanier-ld160 printer/Lanier-LD160
+#gptofoo lanier-ld175 printer/Lanier-LD175
+#gptofoo lanier-ld225 printer/Lanier-LD225
+#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 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-dsm415 printer/NRG-DSm415
+#gptofoo nrg-dsm615 printer/NRG-DSm615
+#gptofoo nrg-dsm616 printer/NRG-DSm616
+#gptofoo nrg-dsm618 printer/NRG-DSm618
+#gptofoo nrg-dsm618d printer/NRG-DSm618d
+#gptofoo nrg-dsm620 printer/NRG-DSm620
+#gptofoo nrg-dsm620d printer/NRG-DSm620d
+#gptofoo nrg-dsm622 printer/NRG-DSm622
+#gptofoo nrg-dsm627 printer/NRG-DSm627
+#gptofoo nrg-dsm632 printer/NRG-DSm632
+#gptofoo nrg-dsm635 printer/NRG-DSm635
+#gptofoo nrg-dsm645 printer/NRG-DSm645
+#gptofoo nrg-dsm651 printer/NRG-DSm651
+#gptofoo nrg-dsm660 printer/NRG-DSm660
+#gptofoo nrg-dsm675 printer/NRG-DSm675
+#gptofoo nrg-dsm725 printer/NRG-DSm725
+#gptofoo nrg-dsm730 printer/NRG-DSm730
+#gptofoo nrg-dsm735 printer/NRG-DSm735
+#gptofoo nrg-dsm745 printer/NRG-DSm745
+#gptofoo nrg-mp_1100 printer/NRG-MP_1100
+#gptofoo nrg-mp_1350 printer/NRG-MP_1350
+#gptofoo nrg-mp_1600 printer/NRG-MP_1600
+#gptofoo nrg-mp_161 printer/NRG-MP_161
+#gptofoo nrg-mp_2000 printer/NRG-MP_2000
+#gptofoo nrg-mp_2500 printer/NRG-MP_2500
+#gptofoo nrg-mp_2510 printer/NRG-MP_2510
+#gptofoo nrg-mp_2550 printer/NRG-MP_2550
+#gptofoo nrg-mp_2550b printer/NRG-MP_2550B
+#gptofoo nrg-mp_3010 printer/NRG-MP_3010
+#gptofoo nrg-mp_3350 printer/NRG-MP_3350
+#gptofoo nrg-mp_3350b printer/NRG-MP_3350B
+#gptofoo nrg-mp_3500 printer/NRG-MP_3500
+#gptofoo nrg-mp_4000 printer/NRG-MP_4000
+#gptofoo nrg-mp_4000b printer/NRG-MP_4000B
+#gptofoo nrg-mp_4500 printer/NRG-MP_4500
+#gptofoo nrg-mp_5000 printer/NRG-MP_5000
+#gptofoo nrg-mp_5000b printer/NRG-MP_5000B
+#gptofoo nrg-mp_5500 printer/NRG-MP_5500
+#gptofoo nrg-mp_6500 printer/NRG-MP_6500
+#gptofoo nrg-mp_7500 printer/NRG-MP_7500
+#gptofoo nrg-mp_9000 printer/NRG-MP_9000
+#gptofoo ricoh-afc_1022 printer/Ricoh-Aficio_1022
+#gptofoo ricoh-afc_1027 printer/Ricoh-Aficio_1027
+#gptofoo ricoh-afc_1032 printer/Ricoh-Aficio_1032
+#gptofoo ricoh-afc_1035 printer/Ricoh-Aficio_1035
+#gptofoo ricoh-afc_1045 printer/Ricoh-Aficio_1045
+#gptofoo ricoh-afc_1060 printer/Ricoh-Aficio_1060
+#gptofoo ricoh-afc_1075 printer/Ricoh-Aficio_1075
+#gptofoo ricoh-afc_1515 printer/Ricoh-Aficio_1515
+#gptofoo ricoh-afc_2015 printer/Ricoh-Aficio_2015
+#gptofoo ricoh-afc_2016 printer/Ricoh-Aficio_2016
+#gptofoo ricoh-afc_2018 printer/Ricoh-Aficio_2018
+#gptofoo ricoh-afc_2018d printer/Ricoh-Aficio_2018D
+#gptofoo ricoh-afc_2020 printer/Ricoh-Aficio_2020
+#gptofoo ricoh-afc_2020d printer/Ricoh-Aficio_2020D
+#gptofoo ricoh-afc_2022 printer/Ricoh-Aficio_2022
+#gptofoo ricoh-afc_2027 printer/Ricoh-Aficio_2027
+#gptofoo ricoh-afc_2032 printer/Ricoh-Aficio_2032
+#gptofoo ricoh-afc_2035 printer/Ricoh-Aficio_2035
+#gptofoo ricoh-afc_2035e printer/Ricoh-Aficio_2035e
+#gptofoo ricoh-afc_2045 printer/Ricoh-Aficio_2045
+#gptofoo ricoh-afc_2045e printer/Ricoh-Aficio_2045e
+#gptofoo ricoh-afc_2051 printer/Ricoh-Aficio_2051
+#gptofoo ricoh-afc_2060 printer/Ricoh-Aficio_2060
+#gptofoo ricoh-afc_2075 printer/Ricoh-Aficio_2075
+#gptofoo ricoh-afc_2090 printer/Ricoh-Aficio_2090
+#gptofoo ricoh-afc_2105 printer/Ricoh-Aficio_2105
+#gptofoo ricoh-afc_3025 printer/Ricoh-Aficio_3025
+#gptofoo ricoh-afc_3030 printer/Ricoh-Aficio_3030
+#gptofoo ricoh-afc_3035 printer/Ricoh-Aficio_3035
+#gptofoo ricoh-afc_3045 printer/Ricoh-Aficio_3045
+#gptofoo ricoh-afc_mp_1100 printer/Ricoh-Aficio_MP_1100
+#gptofoo ricoh-afc_mp_1350 printer/Ricoh-Aficio_MP_1350
+#gptofoo ricoh-afc_mp_1600 printer/Ricoh-Aficio_MP_1600
+#gptofoo ricoh-afc_mp_161 printer/Ricoh-Aficio_MP_161
+#gptofoo ricoh-afc_mp_2000 printer/Ricoh-Aficio_MP_2000
+#gptofoo ricoh-afc_mp_2500 printer/Ricoh-Aficio_MP_2500
+#gptofoo ricoh-afc_mp_2510 printer/Ricoh-Aficio_MP_2510
+#gptofoo ricoh-afc_mp_2550 printer/Ricoh-Aficio_MP_2550
+#gptofoo ricoh-afc_mp_2550b printer/Ricoh-Aficio_MP_2550B
+#gptofoo ricoh-afc_mp_3010 printer/Ricoh-Aficio_MP_3010
+#gptofoo ricoh-afc_mp_3350 printer/Ricoh-Aficio_MP_3350
+#gptofoo ricoh-afc_mp_3350b printer/Ricoh-Aficio_MP_3350B
+#gptofoo ricoh-afc_mp_3500 printer/Ricoh-Aficio_MP_3500
+#gptofoo ricoh-afc_mp_4000 printer/Ricoh-Aficio_MP_4000
+#gptofoo ricoh-afc_mp_4000b printer/Ricoh-Aficio_MP_4000B
+#gptofoo ricoh-afc_mp_4500 printer/Ricoh-Aficio_MP_4500
+#gptofoo ricoh-afc_mp_5000 printer/Ricoh-Aficio_MP_5000
+#gptofoo ricoh-afc_mp_5000b printer/Ricoh-Aficio_MP_5000B
+#gptofoo ricoh-afc_mp_5500 printer/Ricoh-Aficio_MP_5500
+#gptofoo ricoh-afc_mp_6500 printer/Ricoh-Aficio_MP_6500
+#gptofoo ricoh-afc_mp_7500 printer/Ricoh-Aficio_MP_7500
+#gptofoo ricoh-afc_mp_9000 printer/Ricoh-Aficio_MP_9000
+#gptofoo samsung-ml-1250 printer/Samsung-ML-1250
+#gptofoo samsung-ml-1450 printer/Samsung-ML-1450
+#gptofoo samsung-ml-1450ps printer/Samsung-ML-1450PS
+#gptofoo samsung-ml-1650 printer/Samsung-ML-1650
+#gptofoo samsung-ml-1651n printer/Samsung-ML-1651N
+#gptofoo samsung-ml-1750 printer/Samsung-ML-1750
+#gptofoo samsung-ml-2150 printer/Samsung-ML-2150
+#gptofoo samsung-ml-2150ps printer/Samsung-ML-2150PS
+#gptofoo samsung-ml-2151n printer/Samsung-ML-2151N
+#gptofoo samsung-ml-2151nps printer/Samsung-ML-2151NPS
+#gptofoo samsung-ml-2152w printer/Samsung-ML-2152W
+#gptofoo samsung-ml-2152wps printer/Samsung-ML-2152WPS
+#gptofoo samsung-ml-2250 printer/Samsung-ML-2250
+#gptofoo samsung-ml-2550 printer/Samsung-ML-2550
+#gptofoo samsung-ml-2551n printer/Samsung-ML-2551N
+#gptofoo samsung-ml-2552w printer/Samsung-ML-2552W
+#gptofoo samsung-ml-7300 printer/Samsung-ML-7300
+#gptofoo samsung-ml-7300n printer/Samsung-ML-7300N
+#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-2560 printer/Savin-2560
+#gptofoo savin-2575 printer/Savin-2575
+#gptofoo savin-3515 printer/Savin-3515
+#gptofoo savin-40105 printer/Savin-40105
+#gptofoo savin-4015 printer/Savin-4015
+#gptofoo savin-4018 printer/Savin-4018
+#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-4051 printer/Savin-4051
+#gptofoo savin-4060 printer/Savin-4060
+#gptofoo savin-4075 printer/Savin-4075
+#gptofoo savin-4090 printer/Savin-4090
+#gptofoo savin-7025 printer/Savin-7025
+#gptofoo savin-8016 printer/Savin-8016
+#gptofoo savin-8020 printer/Savin-8020
+#gptofoo savin-8020d printer/Savin-8020d
+#gptofoo savin-8025 printer/Savin-8025
+#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-8035e printer/Savin-8035e
+#gptofoo savin-8045 printer/Savin-8045
+#gptofoo savin-8045g printer/Savin-8045g
+#gptofoo savin-8045e printer/Savin-8045e
+#gptofoo savin-8055 printer/Savin-8055
+#gptofoo savin-8065 printer/Savin-8065
+#gptofoo savin-8075 printer/Savin-8075
+#gptofoo savin-8090 printer/Savin-8090
+#gptofoo savin-8110 printer/Savin-8110
+#gptofoo savin-8135 printer/Savin-8135
+#gptofoo savin-816 printer/Savin-816
+#gptofoo savin-9016 printer/Savin-9016
+#gptofoo savin-9021d printer/Savin-9021d
+#gptofoo savin-9025 printer/Savin-9025
+#gptofoo savin-9025b printer/Savin-9025b
+#gptofoo savin-9033 printer/Savin-9033
+#gptofoo savin-9033b printer/Savin-9033b
+#gptofoo savin-9040 printer/Savin-9040
+#gptofoo savin-9040b printer/Savin-9040b
+#gptofoo savin-9050 printer/Savin-9050
+#gptofoo savin-9050b printer/Savin-9050b
+#gptofoo hp-lj_1160 printer/HP-LaserJet_1160
+#gptofoo hp-lj_1320 printer/HP-LaserJet_1320
+#gptofoo hp-lj_2410 printer/HP-LaserJet_2410
+#gptofoo hp-lj_2420 printer/HP-LaserJet_2420
+#gptofoo hp-lj_2430 printer/HP-LaserJet_2430
+#gptofoo hp-lj_3015 printer/HP-LaserJet_3015
+#gptofoo hp-lj_3020 printer/HP-LaserJet_3020
+#gptofoo hp-lj_3030 printer/HP-LaserJet_3030
+#gptofoo hp-lj_3050 printer/HP-LaserJet_3050
+#gptofoo hp-lj_3052 printer/HP-LaserJet_3052
+#gptofoo hp-lj_3055 printer/HP-LaserJet_3055
+#gptofoo hp-lj_3380 printer/HP-LaserJet_3380
+#gptofoo hp-lj_3390 printer/HP-LaserJet_3390
+#gptofoo hp-lj_3392 printer/HP-LaserJet_3392
+#gptofoo hp-lj_4240 printer/HP-LaserJet_4240
+#gptofoo hp-lj_4250 printer/HP-LaserJet_4250
+#gptofoo hp-lj_4345_mfp printer/HP-LaserJet_4345_mfp
+#gptofoo hp-lj_4350 printer/HP-LaserJet_4350
+#gptofoo hp-lj_5200 printer/HP-LaserJet_5200
+#gptofoo hp-lj_5200l printer/HP-LaserJet_5200L
+#gptofoo hp-lj_9040 printer/HP-LaserJet_9040
+#gptofoo hp-lj_9040_mfp printer/HP-LaserJet_9040_MFP
+#gptofoo hp-lj_9050 printer/HP-LaserJet_9050
+#gptofoo hp-lj_9050_mfp printer/HP-LaserJet_9050_MFP
+#gptofoo hp-lj_m3027_mfp printer/HP-LaserJet_M3027_MFP
+#gptofoo hp-lj_m3035_mfp printer/HP-LaserJet_M3035_MFP
+#gptofoo hp-lj_m4345_mfp printer/HP-LaserJet_M4345_MFP
+#gptofoo hp-lj_m5025_mfp printer/HP-LaserJet_M5025_MFP
+#gptofoo hp-lj_m5035_mfp printer/HP-LaserJet_M5035_MFP
+#gptofoo hp-lj_p2010 printer/HP-LaserJet_P2010
+#gptofoo hp-lj_p2015 printer/HP-LaserJet_P2015
+#gptofoo hp-lj_p3004 printer/HP-LaserJet_P3004
+#gptofoo hp-lj_p3005 printer/HP-LaserJet_P3005
diff --git a/src/foomatic/printers.c b/src/foomatic/printers.c
index 24643e7..af22394 100644
--- a/src/foomatic/printers.c
+++ b/src/foomatic/printers.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: printers.c,v 1.11 2007/03/05 00:04:00 tillkamppeter Exp $"
+ * "$Id: printers.c,v 1.13 2008/10/19 13:57:26 rlk Exp $"
  *
  *   Dump the per-printer options for the OpenPrinting database
  *
@@ -39,6 +39,9 @@ main(int argc, char **argv)
 	     stp_printer_get_long_name(p));
       printf("$printer_make{'%s'} = '%s';\n", stp_printer_get_driver(p),
 	     stp_printer_get_manufacturer(p));
+      printf("$printer_family{'%s'} = '%s';\n", stp_printer_get_driver(p),
+	     stp_printer_get_family(p));
+      printf("push @printer_list, '%s';\n", stp_printer_get_driver(p));
     }
   return 0;
 }
diff --git a/src/ghost/Makefile.in b/src/ghost/Makefile.in
index d3d2c88..22e953d 100644
--- a/src/ghost/Makefile.in
+++ b/src/ghost/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,7 +17,7 @@
 # Variables
 
 #export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
-#export STP_DATA_PATH = $(top_srcdir)/src/main
+#export STP_DATA_PATH = $(top_srcdir)/src/xml
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
@@ -45,7 +45,8 @@ 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/progtest.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
@@ -71,7 +72,7 @@ ijsgutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LINK =  \
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(ijsgutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDFLAGS) \
 	$(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -119,6 +120,7 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
+DSYMUTIL = @DSYMUTIL@
 DVIPDF = @DVIPDF@
 DVIPS = @DVIPS@
 ECHO = @ECHO@
@@ -139,6 +141,7 @@ GIMP2_LIBS = @GIMP2_LIBS@
 GIMPTOOL2_CHECK = @GIMPTOOL2_CHECK@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
 GNUCFLAGS = @GNUCFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
@@ -171,6 +174,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
@@ -191,9 +195,10 @@ MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -220,6 +225,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WHICH_PPDS = @WHICH_PPDS@
 XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
 abs_builddir = @abs_builddir@
@@ -336,8 +342,8 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	     || test -f $$p1 \
 	  ; then \
 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -399,8 +405,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -412,8 +418,8 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -423,13 +429,12 @@ ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff --git a/src/ghost/ijsgutenprint.c b/src/ghost/ijsgutenprint.c
index bdd8fed..9a75815 100644
--- a/src/ghost/ijsgutenprint.c
+++ b/src/ghost/ijsgutenprint.c
@@ -1,5 +1,5 @@
 /*
- *  $Id: ijsgutenprint.c,v 1.20 2008/04/22 23:59:50 rlk Exp $
+ *  $Id: ijsgutenprint.c,v 1.21 2008/07/05 03:43:26 rlk Exp $
  *
  *   IJS server for Gutenprint.
  *
@@ -711,7 +711,7 @@ gutenprint_set_cb (void *set_cb_data, IjsServerCtx *ctx, IjsJobId jobid,
 	  STP_DEBUG(fprintf(stderr, "ijsgutenprint: paper size %f %f %s\n", w, h, vbuf));
 	  stp_set_page_width(img->v, w);
 	  stp_set_page_height(img->v, h);
-	  if ((p = stp_get_papersize_by_size(h, w)) != NULL)
+	  if ((p = stp_get_papersize_by_size_exact(h, w)) != NULL)
 	    {
 	      STP_DEBUG(fprintf(stderr, "ijsgutenprint: Found page size %s\n", p->name));
 	      stp_set_string_parameter(img->v, "PageSize", p->name);
diff --git a/src/gimp2/Makefile.in b/src/gimp2/Makefile.in
index 5a45632..67c22c4 100644
--- a/src/gimp2/Makefile.in
+++ b/src/gimp2/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,7 +17,7 @@
 # Variables
 
 #export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
-#export STP_DATA_PATH = $(top_srcdir)/src/main
+#export STP_DATA_PATH = $(top_srcdir)/src/xml
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
@@ -46,7 +46,8 @@ 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/progtest.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
@@ -65,7 +66,7 @@ am__DEPENDENCIES_1 =
 am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) $(GUTENPRINTUI2_LIBS)
 am_print_OBJECTS = $(am__objects_1) print-print.$(OBJEXT)
 print_OBJECTS = $(am_print_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -113,6 +114,7 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
+DSYMUTIL = @DSYMUTIL@
 DVIPDF = @DVIPDF@
 DVIPS = @DVIPS@
 ECHO = @ECHO@
@@ -133,6 +135,7 @@ GIMP2_LIBS = @GIMP2_LIBS@
 GIMPTOOL2_CHECK = @GIMPTOOL2_CHECK@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
 GNUCFLAGS = @GNUCFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
@@ -165,6 +168,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
@@ -185,9 +189,10 @@ MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -214,6 +219,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WHICH_PPDS = @WHICH_PPDS@
 XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
 abs_builddir = @abs_builddir@
@@ -340,8 +346,8 @@ install-gimp2_plug_inPROGRAMS: $(gimp2_plug_in_PROGRAMS)
 	     || test -f $$p1 \
 	  ; then \
 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(gimp2_plug_inPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(gimp2_plug_indir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(gimp2_plug_inPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(gimp2_plug_indir)/$$f" || exit 1; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(gimp2_plug_inPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(gimp2_plug_indir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(gimp2_plug_inPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(gimp2_plug_indir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -409,8 +415,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -422,8 +428,8 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -433,13 +439,12 @@ ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff --git a/src/gimp2/print-gutenprint.c b/src/gimp2/print-gutenprint.c
index 1fab376..56bf111 100644
--- a/src/gimp2/print-gutenprint.c
+++ b/src/gimp2/print-gutenprint.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-gutenprint.c,v 1.1 2006/07/04 02:57:59 rlk Exp $"
+ * "$Id: print-gutenprint.c,v 1.2 2008/07/04 14:29:28 rlk Exp $"
  *
  *   Print plug-in for the GIMP.
  *
@@ -56,7 +56,8 @@ do_gimp_install_procedure(const char *blurb, const char *help,
   gimp_plugin_menu_register ((BAD_CONST_CHAR) "file_print_gutenprint",
 			     (BAD_CONST_CHAR) "<Image>/File/Send");
   gimp_plugin_icon_register ((BAD_CONST_CHAR) "file_print_gutenprint",
-                             GIMP_ICON_TYPE_STOCK_ID, GTK_STOCK_PRINT);
+                             GIMP_ICON_TYPE_STOCK_ID,
+			     (BAD_CONST_CHAR) GTK_STOCK_PRINT);
 #endif
 }
 			  
diff --git a/src/gutenprintui2/Makefile.in b/src/gutenprintui2/Makefile.in
index 8e850a6..35e10e3 100644
--- a/src/gutenprintui2/Makefile.in
+++ b/src/gutenprintui2/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,7 +17,7 @@
 # Variables
 
 #export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
-#export STP_DATA_PATH = $(top_srcdir)/src/main
+#export STP_DATA_PATH = $(top_srcdir)/src/xml
 
 
 VPATH = @srcdir@
@@ -46,7 +46,8 @@ 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/progtest.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
@@ -80,7 +81,7 @@ libgutenprintui2_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(libgutenprintui2_la_LDFLAGS) $(LDFLAGS) -o $@
 @BUILD_LIBGUTENPRINTUI2_TRUE@am_libgutenprintui2_la_rpath = -rpath \
 @BUILD_LIBGUTENPRINTUI2_TRUE@	$(libdir)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -139,6 +140,7 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
+DSYMUTIL = @DSYMUTIL@
 DVIPDF = @DVIPDF@
 DVIPS = @DVIPS@
 ECHO = @ECHO@
@@ -159,6 +161,7 @@ GIMP2_LIBS = @GIMP2_LIBS@
 GIMPTOOL2_CHECK = @GIMPTOOL2_CHECK@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
 GNUCFLAGS = @GNUCFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
@@ -191,6 +194,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
@@ -211,9 +215,10 @@ MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -240,6 +245,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WHICH_PPDS = @WHICH_PPDS@
 XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
 abs_builddir = @abs_builddir@
@@ -389,8 +395,8 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
-	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
-	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
 	  else :; fi; \
 	done
 
@@ -398,8 +404,8 @@ uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
 	done
 
 clean-libLTLIBRARIES:
@@ -552,8 +558,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -565,8 +571,8 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -576,13 +582,12 @@ ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff --git a/src/gutenprintui2/panel.c b/src/gutenprintui2/panel.c
index cf262e5..1a915e5 100644
--- a/src/gutenprintui2/panel.c
+++ b/src/gutenprintui2/panel.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: panel.c,v 1.17 2008/01/22 02:36:42 rlk Exp $"
+ * "$Id: panel.c,v 1.18 2008/07/09 01:32:40 rlk Exp $"
  *
  *   Main window code for Print plug-in for the GIMP.
  *
@@ -261,6 +261,7 @@ static void set_printer_defaults (void);
 static void redraw_color_swatch (void);
 static void color_update (GtkAdjustment *adjustment);
 static void dimension_update (GtkAdjustment *adjustment);
+static void integer_update (GtkAdjustment *adjustment);
 static void set_controls_active (GtkObject *checkbutton, gpointer optno);
 static void update_adjusted_thumbnail (gboolean regenerate_image);
 
@@ -882,6 +883,7 @@ populate_options(const stp_vars_t *v)
 	      break;
 	    case STP_PARAMETER_TYPE_DOUBLE:
 	    case STP_PARAMETER_TYPE_DIMENSION:
+	    case STP_PARAMETER_TYPE_INT:
 	      if (opt->info.flt.adjustment)
 		{
 		  gtk_widget_destroy
@@ -971,6 +973,14 @@ populate_options(const stp_vars_t *v)
 	      opt->info.flt.scale = 1.0;
 	      opt->is_active = desc.is_active;
 	      break;
+	    case STP_PARAMETER_TYPE_INT:
+	      opt->info.flt.adjustment = NULL;
+	      opt->info.flt.upper = desc.bounds.integer.upper;
+	      opt->info.flt.lower = desc.bounds.integer.lower;
+	      opt->info.flt.deflt = desc.deflt.dimension;
+	      opt->info.flt.scale = 1.0;
+	      opt->is_active = desc.is_active;
+	      break;
 	    case STP_PARAMETER_TYPE_CURVE:
 	      opt->info.curve.label = NULL;
 	      opt->info.curve.button = NULL;
@@ -1057,6 +1067,7 @@ populate_option_table(GtkWidget *table, int p_class)
 	    {
 	    case STP_PARAMETER_TYPE_STRING_LIST:
 	    case STP_PARAMETER_TYPE_DIMENSION:
+	    case STP_PARAMETER_TYPE_INT:
 	    case STP_PARAMETER_TYPE_DOUBLE:
 	    case STP_PARAMETER_TYPE_CURVE:
 	    case STP_PARAMETER_TYPE_BOOLEAN:
@@ -1182,6 +1193,25 @@ populate_option_table(GtkWidget *table, int p_class)
 		stp_set_dimension_parameter_active(pv->v, desc->name,
 						   STP_PARAMETER_INACTIVE);
 	      break;
+	    case STP_PARAMETER_TYPE_INT:
+	      add_reset_button(opt, table, 4, vpos[desc->p_level][desc->p_type]);
+	      stpui_create_scale_entry(opt, GTK_TABLE(table), 0,
+				       vpos[desc->p_level][desc->p_type]++,
+				       gettext(desc->text), 200, 0,
+				       opt->info.flt.deflt,
+				       opt->info.flt.lower,
+				       opt->info.flt.upper,
+				       1, 10, 0, TRUE, 0, 0, NULL,
+				       !(desc->is_mandatory));
+	      stpui_set_adjustment_tooltip(opt->info.flt.adjustment,
+					   gettext(desc->help));
+	      g_signal_connect(G_OBJECT(opt->info.flt.adjustment),
+			       "value_changed",
+			       G_CALLBACK(integer_update), opt);
+	      if (desc->p_level > MAXIMUM_PARAMETER_LEVEL)
+		stp_set_int_parameter_active(pv->v, desc->name,
+					     STP_PARAMETER_INACTIVE);
+	      break;
 	    case STP_PARAMETER_TYPE_CURVE:
 	      xcurve = stp_get_curve_parameter(pv->v, opt->fast_desc->name);
 	      if (xcurve)
@@ -1209,10 +1239,6 @@ populate_option_table(GtkWidget *table, int p_class)
 		stp_set_boolean_parameter_active(pv->v, desc->name,
 						 STP_PARAMETER_INACTIVE);
 	      break;
-	    case STP_PARAMETER_TYPE_INT:
-	      stp_set_int_parameter_active(pv->v, opt->fast_desc->name,
-					   STP_PARAMETER_INACTIVE);
-	      break;
 	    case STP_PARAMETER_TYPE_RAW:
 	      stp_set_raw_parameter_active(pv->v, opt->fast_desc->name,
 					   STP_PARAMETER_INACTIVE);
@@ -1259,6 +1285,7 @@ set_options_active(const char *omit)
 	  break;
 	case STP_PARAMETER_TYPE_DOUBLE:
 	case STP_PARAMETER_TYPE_DIMENSION:
+	case STP_PARAMETER_TYPE_INT:
 	  adj = opt->info.flt.adjustment;
 	  if (adj)
 	    {
@@ -3088,6 +3115,21 @@ do_color_updates (void)
 	      else
 		set_adjustment_active(opt, FALSE, TRUE);
 	      break;
+	    case STP_PARAMETER_TYPE_INT:
+	      if (stp_check_int_parameter(pv->v, opt->fast_desc->name,
+					  STP_PARAMETER_INACTIVE))
+		{
+		  gtk_adjustment_set_value
+		  (GTK_ADJUSTMENT(opt->info.flt.adjustment),
+		   (stp_get_int_parameter(pv->v, opt->fast_desc->name)));
+		}
+	      if (stp_check_int_parameter(pv->v, opt->fast_desc->name,
+					  STP_PARAMETER_ACTIVE) ||
+		  opt->fast_desc->is_mandatory)
+		set_adjustment_active(opt, TRUE, TRUE);
+	      else
+		set_adjustment_active(opt, FALSE, TRUE);
+	      break;
 	    case STP_PARAMETER_TYPE_CURVE:
 	      if (stp_check_curve_parameter(pv->v, opt->fast_desc->name,
 					    STP_PARAMETER_ACTIVE) ||
@@ -5205,6 +5247,30 @@ dimension_update (GtkAdjustment *adjustment)
 }
 
 static void
+integer_update (GtkAdjustment *adjustment)
+{
+  int i;
+  for (i = 0; i < current_option_count; i++)
+    {
+      option_t *opt = &(current_options[i]);
+      if (opt->fast_desc->p_type == STP_PARAMETER_TYPE_INT &&
+	  opt->fast_desc->p_level <= MAXIMUM_PARAMETER_LEVEL &&
+	  opt->info.flt.adjustment &&
+	  adjustment == GTK_ADJUSTMENT(opt->info.flt.adjustment))
+	{
+	  invalidate_preview_thumbnail ();
+	  if (stp_get_int_parameter(pv->v, opt->fast_desc->name) !=
+	      (int) adjustment->value)
+	    {
+	      stp_set_int_parameter(pv->v, opt->fast_desc->name,
+				    (int) adjustment->value);
+	      update_adjusted_thumbnail(FALSE);
+	    }
+	}
+    }
+}
+
+static void
 set_controls_active (GtkObject *checkbutton, gpointer xopt)
 {
   option_t *opt = (option_t *) xopt;
@@ -5231,7 +5297,7 @@ set_controls_active (GtkObject *checkbutton, gpointer xopt)
 	case STP_PARAMETER_TYPE_DIMENSION:
 	  set_adjustment_active(opt, TRUE, FALSE);
 	  if (! stp_check_dimension_parameter(pv->v, opt->fast_desc->name,
-					  STP_PARAMETER_INACTIVE))
+					      STP_PARAMETER_INACTIVE))
 	    {
 	      stp_describe_parameter(pv->v, opt->fast_desc->name, &desc);
 	      stp_set_dimension_parameter(pv->v, opt->fast_desc->name,
@@ -5241,6 +5307,19 @@ set_controls_active (GtkObject *checkbutton, gpointer xopt)
 	  stp_set_dimension_parameter_active(pv->v, opt->fast_desc->name,
 					     STP_PARAMETER_ACTIVE);
 	  break;
+	case STP_PARAMETER_TYPE_INT:
+	  set_adjustment_active(opt, TRUE, FALSE);
+	  if (! stp_check_int_parameter(pv->v, opt->fast_desc->name,
+					    STP_PARAMETER_INACTIVE))
+	    {
+	      stp_describe_parameter(pv->v, opt->fast_desc->name, &desc);
+	      stp_set_int_parameter(pv->v, opt->fast_desc->name,
+				    desc.deflt.integer);
+	      stp_parameter_description_destroy(&desc);
+	    }
+	  stp_set_int_parameter_active(pv->v, opt->fast_desc->name,
+				       STP_PARAMETER_ACTIVE);
+	  break;
 	case STP_PARAMETER_TYPE_CURVE:
 	  set_curve_active(opt, TRUE, FALSE);
 	  if (! stp_check_curve_parameter(pv->v, opt->fast_desc->name,
@@ -5303,6 +5382,11 @@ set_controls_active (GtkObject *checkbutton, gpointer xopt)
 	  stp_set_dimension_parameter_active(pv->v, opt->fast_desc->name,
 					     STP_PARAMETER_INACTIVE);
 	  break;
+	case STP_PARAMETER_TYPE_INT:
+	  set_adjustment_active(opt, FALSE, FALSE);
+	  stp_set_int_parameter_active(pv->v, opt->fast_desc->name,
+				       STP_PARAMETER_INACTIVE);
+	  break;
 	case STP_PARAMETER_TYPE_CURVE:
 	  set_curve_active(opt, FALSE, FALSE);
 	  stp_set_curve_parameter_active(pv->v, opt->fast_desc->name,
@@ -5340,39 +5424,39 @@ set_one_default(option_t *opt)
     {
     case STP_PARAMETER_TYPE_DOUBLE:
       active = stp_get_float_parameter_active(pv->v, opt->fast_desc->name);
-      stp_set_float_parameter(pv->v, opt->fast_desc->name,
-			      opt->info.flt.deflt);
-      stp_set_float_parameter_active(pv->v, opt->fast_desc->name,
-				     active);
+      stp_set_float_parameter(pv->v, opt->fast_desc->name, opt->info.flt.deflt);
+      stp_set_float_parameter_active(pv->v, opt->fast_desc->name, active);
       break;
     case STP_PARAMETER_TYPE_DIMENSION:
       unit_scaler = units[pv->unit].scale;
-      active = stp_get_dimension_parameter_active(pv->v,
-					   opt->fast_desc->name);
+      active = stp_get_dimension_parameter_active(pv->v, opt->fast_desc->name);
       stp_set_dimension_parameter(pv->v, opt->fast_desc->name,
 				  opt->info.flt.deflt * unit_scaler);
-      stp_set_dimension_parameter_active(pv->v, opt->fast_desc->name,
-					 active);
+      stp_set_dimension_parameter_active(pv->v, opt->fast_desc->name, active);
+      break;
+    case STP_PARAMETER_TYPE_INT:
+      unit_scaler = units[pv->unit].scale;
+      active = stp_get_int_parameter_active(pv->v, opt->fast_desc->name);
+      stp_set_int_parameter(pv->v, opt->fast_desc->name,
+			    (int) opt->info.flt.deflt);
+      stp_set_int_parameter_active(pv->v, opt->fast_desc->name, active);
       break;
     case STP_PARAMETER_TYPE_BOOLEAN:
       active = stp_get_boolean_parameter_active(pv->v, opt->fast_desc->name);
       stp_set_boolean_parameter(pv->v, opt->fast_desc->name,
 				opt->info.bool.deflt);
-      stp_set_boolean_parameter_active(pv->v, opt->fast_desc->name,
-				       active);
+      stp_set_boolean_parameter_active(pv->v, opt->fast_desc->name, active);
       break;
     case STP_PARAMETER_TYPE_STRING_LIST:
       active = stp_get_string_parameter_active(pv->v, opt->fast_desc->name);
       stp_set_string_parameter(pv->v, opt->fast_desc->name,
 			       opt->info.list.default_val);
-      stp_set_string_parameter_active(pv->v, opt->fast_desc->name,
-				      active);
+      stp_set_string_parameter_active(pv->v, opt->fast_desc->name, active);
       break;
     case STP_PARAMETER_TYPE_FILE:
       active = stp_get_file_parameter_active(pv->v, opt->fast_desc->name);
       stp_set_file_parameter(pv->v, opt->fast_desc->name, "");
-      stp_set_file_parameter_active(pv->v, opt->fast_desc->name,
-				    active);
+      stp_set_file_parameter_active(pv->v, opt->fast_desc->name, active);
       break;
     default:
       break;
diff --git a/src/gutenprintui2/plist.c b/src/gutenprintui2/plist.c
index e8b5aec..77e8cab 100644
--- a/src/gutenprintui2/plist.c
+++ b/src/gutenprintui2/plist.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: plist.c,v 1.17 2008/01/31 12:56:09 m0m Exp $"
+ * "$Id: plist.c,v 1.18 2008/07/04 14:29:28 rlk Exp $"
  *
  *   Print plug-in for the GIMP.
  *
@@ -1631,7 +1631,6 @@ stpui_print(const stpui_plist_t *printer, stpui_image_t *image)
 				  _exit(0);
 				}
 			    }
-			  /* NOTREACHED */
 			  write(syncfd[1], "Done", 5);
 			  _exit(0);
 			}
@@ -1835,5 +1834,5 @@ stpui_print(const stpui_plist_t *printer, stpui_image_t *image)
 }
 
 /*
- * End of "$Id: plist.c,v 1.17 2008/01/31 12:56:09 m0m Exp $".
+ * End of "$Id: plist.c,v 1.18 2008/07/04 14:29:28 rlk Exp $".
  */
diff --git a/src/main/Makefile.am b/src/main/Makefile.am
index 077713f..87c2fa7 100644
--- a/src/main/Makefile.am
+++ b/src/main/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.99 2008/04/28 02:06:44 rlk Exp $
+## $Id: Makefile.am,v 1.103 2008/08/13 07:35:53 easysw Exp $
 ## Copyright (C) 2000 Roger Leigh
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -25,7 +25,6 @@ include $(top_srcdir)/scripts/global.mk
 ## Variables
 
 pkgconfigdatadir = $(libdir)/pkgconfig
-pkgxmldatadir = $(pkgdatadir)/@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@/xml
 pkgmoduledir = $(pkglibdir)/@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@/modules
 
 
@@ -66,7 +65,6 @@ print_escp2_la_SOURCES = \
 	print-escp2.h \
 	print-escp2-data.c \
 	escp2-channels.c \
-	escp2-inks.c \
 	escp2-papers.c \
 	escp2-resolutions.c
 print_escp2_la_LDFLAGS = -module -avoid-version
@@ -165,37 +163,9 @@ libgutenprint_la_LDFLAGS = $(libgutenprint_version) \
 
 pkgconfigdata_DATA = gutenprint.pc
 
-pkgxmldata_DATA = \
-	dither-matrix-1x1.xml \
-	dither-matrix-2x1.xml \
-	dither-matrix-4x1.xml \
-	papers.xml \
-	printers.xml
-
-
-
-## Rules
-
-all-local: xmli18n-tmp.h
-
-
-xmli18n-tmp.h:  $(srcdir)/papers.xml $(srcdir)/printers.xml
-# Pull out translatable strings from XML files.  This is crude, but
-# works for now.
-	sed -e '/description.*value/!d' \
-	  -e 's/.*description.*value="\([^"]*\)".*/N_("\1");/' \
-	  < $(srcdir)/papers.xml > $@;
-	sed -e '/printer.*name/!d' \
-	  -e 's/.*printer.*name="\([^"]*\)".*/N_("\1");/' \
-	  < $(srcdir)/printers.xml >> $@;
-
-dist-hook: xmli18n-tmp.h
-# xmli18n-tmp.h is needed by po/POTFILES.in at dist time
-
 
 ## Clean
 
-CLEANFILES = xmli18n-tmp.h
 MAINTAINERCLEANFILES = Makefile.in
 
-EXTRA_DIST = $(pkgxmldata_DATA) libgutenprint.sym
+EXTRA_DIST = libgutenprint.sym
diff --git a/src/main/Makefile.in b/src/main/Makefile.in
index 3af179d..cd04b9d 100644
--- a/src/main/Makefile.in
+++ b/src/main/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,7 +17,7 @@
 # Variables
 
 #export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
-#export STP_DATA_PATH = $(top_srcdir)/src/main
+#export STP_DATA_PATH = $(top_srcdir)/src/xml
 
 
 VPATH = @srcdir@
@@ -45,7 +45,8 @@ 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/progtest.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
@@ -61,7 +62,7 @@ am__vpath_adj = case $$p in \
   esac;
 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgmoduledir)" \
-	"$(DESTDIR)$(pkgconfigdatadir)" "$(DESTDIR)$(pkgxmldatadir)"
+	"$(DESTDIR)$(pkgconfigdatadir)"
 libLTLIBRARIES_INSTALL = $(INSTALL)
 pkgmoduleLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES) $(pkgmodule_LTLIBRARIES)
@@ -88,16 +89,15 @@ am__libgutenprint_la_SOURCES_DIST = array.c bit-ops.c channel.c \
 	color-conversion.h color-conversions.c print-canon.c \
 	print-canon.h canon-inks.h canon-media.h canon-modes.h \
 	canon-printers.h print-escp2.c escp2-driver.c print-escp2.h \
-	print-escp2-data.c escp2-channels.c escp2-inks.c \
-	escp2-papers.c escp2-resolutions.c print-lexmark.c print-pcl.c \
-	print-ps.c xmlppd.c xmlppd.h print-olympus.c print-raw.c
+	print-escp2-data.c escp2-channels.c escp2-papers.c \
+	escp2-resolutions.c print-lexmark.c print-pcl.c print-ps.c \
+	xmlppd.c xmlppd.h print-olympus.c print-raw.c
 am__objects_1 = mxml-attr.lo mxml-file.lo mxml-node.lo mxml-search.lo
 am__objects_2 =
 am__objects_3 = print-color.lo color-conversions.lo
 am__objects_4 = print-canon.lo
 am__objects_5 = print-escp2.lo escp2-driver.lo print-escp2-data.lo \
-	escp2-channels.lo escp2-inks.lo escp2-papers.lo \
-	escp2-resolutions.lo
+	escp2-channels.lo escp2-papers.lo escp2-resolutions.lo
 am__objects_6 = print-lexmark.lo
 am__objects_7 = print-pcl.lo
 am__objects_8 = print-ps.lo xmlppd.lo
@@ -136,8 +136,8 @@ print_dyesub_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 @BUILD_MODULES_TRUE@am_print_dyesub_la_rpath = -rpath $(pkgmoduledir)
 print_escp2_la_LIBADD =
 am_print_escp2_la_OBJECTS = print-escp2.lo escp2-driver.lo \
-	print-escp2-data.lo escp2-channels.lo escp2-inks.lo \
-	escp2-papers.lo escp2-resolutions.lo
+	print-escp2-data.lo escp2-channels.lo escp2-papers.lo \
+	escp2-resolutions.lo
 print_escp2_la_OBJECTS = $(am_print_escp2_la_OBJECTS)
 print_escp2_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@@ -171,7 +171,7 @@ print_raw_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(print_raw_la_LDFLAGS) $(LDFLAGS) -o $@
 @BUILD_MODULES_TRUE@am_print_raw_la_rpath = -rpath $(pkgmoduledir)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -194,8 +194,7 @@ DIST_SOURCES = $(color_traditional_la_SOURCES) \
 	$(print_lexmark_la_SOURCES) $(print_pcl_la_SOURCES) \
 	$(print_ps_la_SOURCES) $(print_raw_la_SOURCES)
 pkgconfigdataDATA_INSTALL = $(INSTALL_DATA)
-pkgxmldataDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(pkgconfigdata_DATA) $(pkgxmldata_DATA)
+DATA = $(pkgconfigdata_DATA)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -230,6 +229,7 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
+DSYMUTIL = @DSYMUTIL@
 DVIPDF = @DVIPDF@
 DVIPS = @DVIPS@
 ECHO = @ECHO@
@@ -250,6 +250,7 @@ GIMP2_LIBS = @GIMP2_LIBS@
 GIMPTOOL2_CHECK = @GIMPTOOL2_CHECK@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
 GNUCFLAGS = @GNUCFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
@@ -282,6 +283,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
@@ -302,9 +304,10 @@ MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -331,6 +334,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WHICH_PPDS = @WHICH_PPDS@
 XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
 abs_builddir = @abs_builddir@
@@ -401,7 +405,6 @@ 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
 pkgconfigdatadir = $(libdir)/pkgconfig
-pkgxmldatadir = $(pkgdatadir)/@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@/xml
 pkgmoduledir = $(pkglibdir)/@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@/modules
 @BUILD_MODULES_TRUE@pkgmodule_LTLIBRARIES = \
 @BUILD_MODULES_TRUE@	color-traditional.la \
@@ -434,7 +437,6 @@ print_escp2_la_SOURCES = \
 	print-escp2.h \
 	print-escp2-data.c \
 	escp2-channels.c \
-	escp2-inks.c \
 	escp2-papers.c \
 	escp2-resolutions.c
 
@@ -520,17 +522,8 @@ libgutenprint_la_LDFLAGS = $(libgutenprint_version) \
 # using a linker version script.
 #	-export-symbols $(srcdir)/libgutenprint.sym
 pkgconfigdata_DATA = gutenprint.pc
-pkgxmldata_DATA = \
-	dither-matrix-1x1.xml \
-	dither-matrix-2x1.xml \
-	dither-matrix-4x1.xml \
-	papers.xml \
-	printers.xml
-
-# xmli18n-tmp.h is needed by po/POTFILES.in at dist time
-CLEANFILES = xmli18n-tmp.h
 MAINTAINERCLEANFILES = Makefile.in
-EXTRA_DIST = $(pkgxmldata_DATA) libgutenprint.sym
+EXTRA_DIST = libgutenprint.sym
 all: all-am
 
 .SUFFIXES:
@@ -572,8 +565,8 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
-	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
-	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
 	  else :; fi; \
 	done
 
@@ -581,8 +574,8 @@ uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
 	done
 
 clean-libLTLIBRARIES:
@@ -599,8 +592,8 @@ install-pkgmoduleLTLIBRARIES: $(pkgmodule_LTLIBRARIES)
 	@list='$(pkgmodule_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
-	    echo " $(LIBTOOL) --mode=install $(pkgmoduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pkgmoduledir)/$$f'"; \
-	    $(LIBTOOL) --mode=install $(pkgmoduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pkgmoduledir)/$$f"; \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pkgmoduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pkgmoduledir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pkgmoduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pkgmoduledir)/$$f"; \
 	  else :; fi; \
 	done
 
@@ -608,8 +601,8 @@ uninstall-pkgmoduleLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
 	@list='$(pkgmodule_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(pkgmoduledir)/$$p'"; \
-	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(pkgmoduledir)/$$p"; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkgmoduledir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkgmoduledir)/$$p"; \
 	done
 
 clean-pkgmoduleLTLIBRARIES:
@@ -662,7 +655,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dither-very-fast.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/escp2-channels.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/escp2-driver.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/escp2-inks.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/escp2-papers.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/escp2-resolutions.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/generic-options.Plo@am__quote@
@@ -738,31 +730,14 @@ uninstall-pkgconfigdataDATA:
 	  echo " rm -f '$(DESTDIR)$(pkgconfigdatadir)/$$f'"; \
 	  rm -f "$(DESTDIR)$(pkgconfigdatadir)/$$f"; \
 	done
-install-pkgxmldataDATA: $(pkgxmldata_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(pkgxmldatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgxmldatadir)"
-	@list='$(pkgxmldata_DATA)'; for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(pkgxmldataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgxmldatadir)/$$f'"; \
-	  $(pkgxmldataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgxmldatadir)/$$f"; \
-	done
-
-uninstall-pkgxmldataDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(pkgxmldata_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(pkgxmldatadir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(pkgxmldatadir)/$$f"; \
-	done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -774,8 +749,8 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -785,13 +760,12 @@ ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
@@ -830,14 +804,11 @@ 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 $(LTLIBRARIES) $(DATA) all-local
+all-am: Makefile $(LTLIBRARIES) $(DATA)
 installdirs:
-	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgmoduledir)" "$(DESTDIR)$(pkgconfigdatadir)" "$(DESTDIR)$(pkgxmldatadir)"; do \
+	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgmoduledir)" "$(DESTDIR)$(pkgconfigdatadir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
@@ -857,7 +828,6 @@ install-strip:
 mostlyclean-generic:
 
 clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -888,7 +858,7 @@ info: info-am
 info-am:
 
 install-data-am: install-pkgconfigdataDATA \
-	install-pkgmoduleLTLIBRARIES install-pkgxmldataDATA
+	install-pkgmoduleLTLIBRARIES
 
 install-dvi: install-dvi-am
 
@@ -925,27 +895,26 @@ ps: ps-am
 ps-am:
 
 uninstall-am: uninstall-libLTLIBRARIES uninstall-pkgconfigdataDATA \
-	uninstall-pkgmoduleLTLIBRARIES uninstall-pkgxmldataDATA
+	uninstall-pkgmoduleLTLIBRARIES
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am all-local check check-am clean \
-	clean-generic clean-libLTLIBRARIES clean-libtool \
-	clean-pkgmoduleLTLIBRARIES ctags dist-hook distclean \
-	distclean-compile 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 install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am \
-	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
-	install-pkgconfigdataDATA install-pkgmoduleLTLIBRARIES \
-	install-pkgxmldataDATA install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-libLTLIBRARIES \
-	uninstall-pkgconfigdataDATA uninstall-pkgmoduleLTLIBRARIES \
-	uninstall-pkgxmldataDATA
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-libLTLIBRARIES clean-libtool clean-pkgmoduleLTLIBRARIES \
+	ctags distclean distclean-compile 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 install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-libLTLIBRARIES install-man install-pdf \
+	install-pdf-am install-pkgconfigdataDATA \
+	install-pkgmoduleLTLIBRARIES install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+	uninstall-libLTLIBRARIES uninstall-pkgconfigdataDATA \
+	uninstall-pkgmoduleLTLIBRARIES
 
 
 @SET_MAKE@
@@ -963,20 +932,6 @@ $(top_builddir)/src/gutenprintui/libgutenprintui.la:
 $(top_builddir)/src/gutenprintui2/libgutenprintui2.la:
 	cd $(top_builddir)/src/gutenprintui2; \
 	$(MAKE)
-
-all-local: xmli18n-tmp.h
-
-xmli18n-tmp.h:  $(srcdir)/papers.xml $(srcdir)/printers.xml
-# Pull out translatable strings from XML files.  This is crude, but
-# works for now.
-	sed -e '/description.*value/!d' \
-	  -e 's/.*description.*value="\([^"]*\)".*/N_("\1");/' \
-	  < $(srcdir)/papers.xml > $@;
-	sed -e '/printer.*name/!d' \
-	  -e 's/.*printer.*name="\([^"]*\)".*/N_("\1");/' \
-	  < $(srcdir)/printers.xml >> $@;
-
-dist-hook: xmli18n-tmp.h
 # 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/main/channel.c b/src/main/channel.c
index 88d316d..278d8e2 100644
--- a/src/main/channel.c
+++ b/src/main/channel.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: channel.c,v 1.29 2005/07/14 23:43:30 rlk Exp $"
+ * "$Id: channel.c,v 1.30 2008/08/20 11:49:45 rlk Exp $"
  *
  *   Dither routine entrypoints
  *
@@ -88,6 +88,9 @@ typedef struct
   int black_channel;
   int gloss_channel;
   int gloss_physical_channel;
+  double cyan_balance;
+  double magenta_balance;
+  double yellow_balance;
 } stpi_channel_group_t;
 
 
@@ -598,13 +601,16 @@ stp_channel_initialize(stp_vars_t *v, stp_image_t *image,
 	}
       cg->gcr_channels = cg->aux_output_channels;
     }
+  cg->cyan_balance = stp_get_float_parameter(v, "CyanBalance");
+  cg->magenta_balance = stp_get_float_parameter(v, "MagentaBalance");
+  cg->yellow_balance = stp_get_float_parameter(v, "YellowBalance");
   stp_dprintf(STP_DBG_INK, v, "stp_channel_initialize:\n");
   stp_dprintf(STP_DBG_INK, v, "   channel_count  %d\n", cg->channel_count);
   stp_dprintf(STP_DBG_INK, v, "   total_channels %d\n", cg->total_channels);
   stp_dprintf(STP_DBG_INK, v, "   input_channels %d\n", cg->input_channels);
   stp_dprintf(STP_DBG_INK, v, "   aux_channels   %d\n", cg->aux_output_channels);
   stp_dprintf(STP_DBG_INK, v, "   gcr_channels   %d\n", cg->gcr_channels);
-  stp_dprintf(STP_DBG_INK, v, "   width          %d\n", cg->width);
+  stp_dprintf(STP_DBG_INK, v, "   width          %d\n", (int) cg->width);
   stp_dprintf(STP_DBG_INK, v, "   ink_limit      %d\n", cg->ink_limit);
   stp_dprintf(STP_DBG_INK, v, "   gloss_limit    %d\n", cg->gloss_limit);
   stp_dprintf(STP_DBG_INK, v, "   max_density    %d\n", cg->max_density);
@@ -612,6 +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, "   input_data     %p\n",
 	      (void *) cg->input_data);
   stp_dprintf(STP_DBG_INK, v, "   multi_tmp      %p\n",
@@ -1080,9 +1089,6 @@ do_gcr(const stp_vars_t *v)
   const unsigned short *gcr_lookup;
   unsigned short *output = cg->gcr_data;
   size_t count;
-  double cb = stp_get_float_parameter(v, "CyanBalance");
-  double mb = stp_get_float_parameter(v, "MagentaBalance");
-  double yb = stp_get_float_parameter(v, "YellowBalance");
   int i;
 
   stp_curve_resample(cg->gcr_curve, 65536);
@@ -1098,9 +1104,9 @@ do_gcr(const stp_vars_t *v)
 	    kk = k;
 	  ck = k - kk;
 	  output[0] = kk;
-	  output[1] += ck * cb;
-	  output[2] += ck * mb;
-	  output[3] += ck * yb;
+	  output[1] += ck * cg->cyan_balance;
+	  output[2] += ck * cg->magenta_balance;
+	  output[3] += ck * cg->yellow_balance;
 	}
       output += cg->gcr_channels;
     }
diff --git a/src/main/dither-main.c b/src/main/dither-main.c
index b9ba80a..22ea02b 100644
--- a/src/main/dither-main.c
+++ b/src/main/dither-main.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: dither-main.c,v 1.59 2008/02/18 14:20:17 rlk Exp $"
+ * "$Id: dither-main.c,v 1.61 2008/07/04 14:29:28 rlk Exp $"
  *
  *   Dither routine entrypoints
  *
@@ -94,7 +94,7 @@ static const stp_parameter_t dither_parameters[] =
        "paper or smears; increase the density if black "
        "regions are not solid."),
     STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
-    STP_PARAMETER_LEVEL_ADVANCED, 0, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_ADVANCED, 0, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "DitherAlgorithm", N_("Dither Algorithm"), N_("Screening Adjustment"),
@@ -105,7 +105,7 @@ static const stp_parameter_t dither_parameters[] =
        "Fast and Very Fast are considerably faster, and work well for text and line art.\n"
        "Hybrid Floyd-Steinberg generally produces inferior output."),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_OUTPUT,
-    STP_PARAMETER_LEVEL_ADVANCED, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_ADVANCED, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
 };
 
@@ -254,6 +254,8 @@ stpi_set_dither_function(stp_vars_t *v)
 	  (d->x_aspect > 2 || d->y_aspect > 2))
 	d->stpi_dither_type = D_ADAPTIVE_HYBRID;
     }
+  if (d->stpi_dither_type == -1)
+    d->stpi_dither_type = D_ADAPTIVE_HYBRID;
   switch (d->stpi_dither_type)
     {
     case D_PREDITHERED:
diff --git a/src/main/dither-ordered.c b/src/main/dither-ordered.c
index ca119c1..52edb3c 100644
--- a/src/main/dither-ordered.c
+++ b/src/main/dither-ordered.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: dither-ordered.c,v 1.28 2008/02/18 14:20:17 rlk Exp $"
+ * "$Id: dither-ordered.c,v 1.30 2008/06/01 03:30:46 rlk Exp $"
  *
  *   Ordered dither algorithm
  *
@@ -180,11 +180,6 @@ print_color_ordered_new(const stpi_dither_t *d, stpi_dither_channel_t *dc,
   unsigned short *where = ord ? ord->lut + (val * levels) : &swhere;
   /*
    * Look for the appropriate range into which the input value falls.
-   * Notice that we use the input, not the error, to decide what dot type
-   * to print (if any).  We actually use the "density" input to permit
-   * the caller to use something other that simply the input value, if it's
-   * desired to use some function of overall density, rather than just
-   * this color's input, for this purpose.
    */
   for (i = levels - 1; i >= 0; i--)
     {
@@ -223,11 +218,6 @@ print_color_ordered(const stpi_dither_t *d, stpi_dither_channel_t *dc, int val,
 
   /*
    * Look for the appropriate range into which the input value falls.
-   * Notice that we use the input, not the error, to decide what dot type
-   * to print (if any).  We actually use the "density" input to permit
-   * the caller to use something other that simply the input value, if it's
-   * desired to use some function of overall density, rather than just
-   * this color's input, for this purpose.
    */
   for (i = levels; i >= 0; i--)
     {
@@ -274,7 +264,7 @@ free_dither_ordered(stpi_dither_t *d)
   int i;
   stpi_dither_channel_t *dc0 = &CHANNEL(d, 0);
   stpi_ordered_t *o0 = dc0->aux_data;
-  stpi_new_ordered_t *no0;
+  stpi_new_ordered_t *no0 = NULL;
   if (o0)
     no0 = o0->ord_new;
   for (i = CHANNEL_COUNT(d) - 1; i >= 0 ; i--)
diff --git a/src/main/escp2-channels.c b/src/main/escp2-channels.c
index 1ca2c94..99c2664 100644
--- a/src/main/escp2-channels.c
+++ b/src/main/escp2-channels.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: escp2-channels.c,v 1.75 2008/02/27 00:43:37 rlk Exp $"
+ * "$Id: escp2-channels.c,v 1.86 2008/07/06 15:50:56 rlk Exp $"
  *
  *   Print plug-in EPSON ESC/P2 driver for the GIMP.
  *
@@ -29,3257 +29,439 @@
 #include <gutenprint/gutenprint-intl-internal.h>
 #include "print-escp2.h"
 
+static inkgroup_t *default_black_inkgroup;
 
-#define DECLARE_INK_CHANNEL(name)				\
-static const ink_channel_t name##_channel =			\
-{								\
-  #name,							\
-  name##_subchannels,						\
-  sizeof(name##_subchannels) / sizeof(physical_subchannel_t),	\
-  NULL								\
-}
-
-#define DECLARE_EXTENDED_INK_CHANNEL(name)			\
-static const ink_channel_t name##_channel =			\
-{								\
-  #name,							\
-  name##_subchannels,						\
-  sizeof(name##_subchannels) / sizeof(physical_subchannel_t),	\
-  &name##_curve							\
-}
-
-static hue_curve_t generic_cyan_curve =
-{
-  "CyanCurve",
-  "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-  "<gutenprint>\n"
-  "<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-  "<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
-  /* C */  "1.000 1.000 1.000 1.000 1.000 1.000 1.000 1.000 "  /* B */
-  /* B */  "1.000 0.875 0.750 0.625 0.500 0.375 0.250 0.125 "  /* M */
-  /* M */  "0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* R */
-  /* R */  "0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* Y */
-  /* Y */  "0.000 0.125 0.250 0.375 0.500 0.625 0.750 0.875 "  /* G */
-  /* G */  "1.000 1.000 1.000 1.000 1.000 1.000 1.000 1.000 "  /* C */
-  "</sequence>\n"
-  "</curve>\n"
-  "</gutenprint>\n"
-};
-
-static hue_curve_t generic_magenta_curve =
-{
-  "CyanCurve",
-  "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-  "<gutenprint>\n"
-  "<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-  "<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
-  /* C */  "0.000 0.125 0.250 0.375 0.500 0.625 0.750 0.875 "  /* B */
-  /* B */  "1.000 1.000 1.000 1.000 1.000 1.000 1.000 1.000 "  /* M */
-  /* M */  "1.000 1.000 1.000 1.000 1.000 1.000 1.000 1.000 "  /* R */
-  /* R */  "1.000 0.875 0.750 0.625 0.500 0.375 0.250 0.125 "  /* Y */
-  /* Y */  "0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* G */
-  /* G */  "0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* C */
-  "</sequence>\n"
-  "</curve>\n"
-  "</gutenprint>\n"
-};
-
-static hue_curve_t generic_yellow_curve =
-{
-  "CyanCurve",
-  "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-  "<gutenprint>\n"
-  "<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-  "<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
-  /* C */  "0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* B */
-  /* B */  "0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* M */
-  /* M */  "0.000 0.125 0.250 0.375 0.500 0.625 0.750 0.875 "  /* R */
-  /* R */  "1.000 1.000 1.000 1.000 1.000 1.000 1.000 1.000 "  /* Y */
-  /* Y */  "1.000 1.000 1.000 1.000 1.000 1.000 1.000 1.000 "  /* G */
-  /* G */  "1.000 0.875 0.750 0.625 0.500 0.375 0.250 0.125 "  /* C */
-  "</sequence>\n"
-  "</curve>\n"
-  "</gutenprint>\n"
-};
-
-static hue_curve_t r800_cyan_curve =
-{
-  "CyanCurve",
-  "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-  "<gutenprint>\n"
-  "<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-  "<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
-  /* C */  "1.000 1.000 1.000 1.000 1.000 1.000 1.000 1.000 "  /* B */
-  /* B */  "1.000 0.875 0.700 0.550 0.400 0.300 0.200 0.100 "  /* M */
-  /* M */  "0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* R */
-  /* R */  "0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* Y */
-  /* Y */  "0.000 0.125 0.250 0.375 0.500 0.625 0.750 0.875 "  /* G */
-  /* G */  "1.000 1.000 1.000 1.000 1.000 1.000 1.000 1.000 "  /* C */
-  "</sequence>\n"
-  "</curve>\n"
-  "</gutenprint>\n"
-};
-
-static hue_curve_t r800_magenta_curve =
-{
-  "CyanCurve",
-  "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-  "<gutenprint>\n"
-  "<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-  "<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
-  /* C */  "0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* B */
-  /* B */  "0.000 0.000 0.000 0.002 0.050 0.300 0.600 0.800 "  /* M */
-  /* M */  "1.000 1.000 0.850 0.700 0.600 0.500 0.400 0.300 "  /* R */
-  /* R */  "0.200 0.100 0.050 0.000 0.000 0.000 0.000 0.000 "  /* Y */
-  /* Y */  "0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* G */
-  /* G */  "0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* C */
-  "</sequence>\n"
-  "</curve>\n"
-  "</gutenprint>\n"
-};
-
-static hue_curve_t r800_yellow_curve =
-{
-  "CyanCurve",
-  "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-  "<gutenprint>\n"
-  "<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-  "<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
-  /* C */  "0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* B */
-  /* B */  "0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* M */
-  /* M */  "0.000 0.000 0.000 0.000 0.000 0.000 0.050 0.150 "  /* R */
-  /* R */  "0.250 0.350 0.450 0.550 0.650 0.750 0.850 0.950 "  /* Y */
-  /* Y */  "1.000 1.000 1.000 1.000 1.000 1.000 1.000 1.000 "  /* G */
-  /* G */  "1.000 0.875 0.750 0.625 0.500 0.375 0.250 0.125 "  /* C */
-  "</sequence>\n"
-  "</curve>\n"
-  "</gutenprint>\n"
-};
-
-static hue_curve_t r800_red_curve =
-{
-  "CyanCurve",
-  "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-  "<gutenprint>\n"
-  "<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-  "<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
-  /* C */  "0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* B */
-  /* B */  "0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* M */
-  /* M */  "0.025 0.400 0.600 0.750 0.890 1.000 1.000 1.000 "  /* R */
-  /* R */  "1.000 0.875 0.750 0.625 0.500 0.375 0.250 0.125 "  /* Y */
-  /* Y */  "0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* G */
-  /* G */  "0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* C */
-  "</sequence>\n"
-  "</curve>\n"
-  "</gutenprint>\n"
-};
-
-static hue_curve_t r800_blue_curve =
-{
-  "CyanCurve",
-  "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-  "<gutenprint>\n"
-  "<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-  "<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
-  /* C */  "0.000 0.250 0.475 0.700 0.810 0.875 0.940 1.000 "  /* B */
-  /* B */  "1.000 0.975 0.930 0.875 0.810 0.740 0.650 0.400 "  /* M */
-  /* M */  "0.040 0.002 0.000 0.000 0.000 0.000 0.000 0.000 "  /* R */
-  /* R */  "0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* Y */
-  /* Y */  "0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* G */
-  /* G */  "0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* C */
-  "</sequence>\n"
-  "</curve>\n"
-  "</gutenprint>\n"
-};
-
-static hue_curve_t picturemate_cyan_curve =
-{
-  "CyanCurve",
-  "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-  "<gutenprint>\n"
-  "<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-  "<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
-  /* C */  "1.000 1.000 1.000 1.000 1.000 1.000 1.000 1.000 "  /* B */
-  /* B */  "1.000 0.875 0.700 0.550 0.400 0.300 0.200 0.100 "  /* M */
-  /* M */  "0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* R */
-  /* R */  "0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* Y */
-  /* Y */  "0.000 0.125 0.250 0.375 0.500 0.625 0.750 0.875 "  /* G */
-  /* G */  "1.000 1.000 1.000 1.000 1.000 1.000 1.000 1.000 "  /* C */
-  "</sequence>\n"
-  "</curve>\n"
-  "</gutenprint>\n"
-};
-
-static hue_curve_t picturemate_magenta_curve =
-{
-  "CyanCurve",
-  "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-  "<gutenprint>\n"
-  "<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-  "<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
-  /* C */  "0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* B */
-  /* B */  "0.000 0.000 0.000 0.002 0.050 0.300 0.600 0.800 "  /* M */
-  /* M */  "1.000 1.000 0.850 0.700 0.600 0.500 0.400 0.300 "  /* R */
-  /* R */  "0.200 0.100 0.050 0.000 0.000 0.000 0.000 0.000 "  /* Y */
-  /* Y */  "0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* G */
-  /* G */  "0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* C */
-  "</sequence>\n"
-  "</curve>\n"
-  "</gutenprint>\n"
-};
-
-static hue_curve_t picturemate_yellow_curve =
-{
-  "CyanCurve",
-  "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-  "<gutenprint>\n"
-  "<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-  "<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
-  /* C */  "0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* B */
-  /* B */  "0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* M */
-  /* M */  "0.000 0.000 0.000 0.000 0.000 0.000 0.050 0.150 "  /* R */
-  /* R */  "0.250 0.350 0.450 0.550 0.650 0.750 0.850 0.950 "  /* Y */
-  /* Y */  "1.000 1.000 1.000 1.000 1.000 1.000 1.000 1.000 "  /* G */
-  /* G */  "1.000 0.875 0.750 0.625 0.500 0.375 0.250 0.125 "  /* C */
-  "</sequence>\n"
-  "</curve>\n"
-  "</gutenprint>\n"
-};
-
-static hue_curve_t picturemate_red_curve =
-{
-  "CyanCurve",
-  "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-  "<gutenprint>\n"
-  "<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-  "<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
-  /* C */  "0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* B */
-  /* B */  "0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* M */
-  /* M */  "0.025 0.400 0.600 0.750 0.890 1.000 1.000 1.000 "  /* R */
-  /* R */  "1.000 0.875 0.750 0.625 0.500 0.375 0.250 0.125 "  /* Y */
-  /* Y */  "0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* G */
-  /* G */  "0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* C */
-  "</sequence>\n"
-  "</curve>\n"
-  "</gutenprint>\n"
-};
-
-static hue_curve_t picturemate_blue_curve =
-{
-  "CyanCurve",
-  "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-  "<gutenprint>\n"
-  "<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-  "<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
-  /* C */  "0.000 0.250 0.475 0.700 0.810 0.875 0.940 1.000 "  /* B */
-  /* B */  "1.000 0.975 0.930 0.875 0.810 0.740 0.650 0.400 "  /* M */
-  /* M */  "0.040 0.002 0.000 0.000 0.000 0.000 0.000 0.000 "  /* R */
-  /* R */  "0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* Y */
-  /* Y */  "0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* G */
-  /* G */  "0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* C */
-  "</sequence>\n"
-  "</curve>\n"
-  "</gutenprint>\n"
-};
-
-
-static const physical_subchannel_t standard_black_subchannels[] =
-{
-  { 0, -1, 0, 0, "BlackDensity", NULL, NULL, NULL }
-};
-
-DECLARE_INK_CHANNEL(standard_black);
-
-static const physical_subchannel_t f360_black_subchannels[] =
-{
-  { 0, 0, 1, 0, "BlackDensity", NULL, NULL, NULL }
-};
-
-DECLARE_INK_CHANNEL(f360_black);
-
-static const physical_subchannel_t x80_black_subchannels[] =
-{
-  { 0, -1, 48, 0, "BlackDensity", NULL, NULL, NULL }
-};
-
-DECLARE_INK_CHANNEL(x80_black);
-
-static const physical_subchannel_t c80_black_subchannels[] =
-{
-  { 0, -1, 0, 0, "BlackDensity", NULL, NULL, NULL }
-};
-
-DECLARE_INK_CHANNEL(c80_black);
-
-static const physical_subchannel_t c120_black_subchannels[] =
-{
-  { 0, 4, 0, 2, "BlackDensity", NULL, NULL, NULL, { 0, 0x40 } }
-};
-
-DECLARE_INK_CHANNEL(c120_black);
-
-static const physical_subchannel_t c64_black_subchannels[] =
-{
-  { 0, -1, 0, 0, "BlackDensity", NULL, NULL, NULL }
-};
-
-DECLARE_INK_CHANNEL(c64_black);
-
-static const physical_subchannel_t standard_cyan_subchannels[] =
-{
-  { 2, -1, 0, 0, "CyanDensity", NULL, NULL, NULL }
-};
-
-DECLARE_INK_CHANNEL(standard_cyan);
-
-static const physical_subchannel_t f360_standard_cyan_subchannels[] =
-{
-  { 2, -1, 1, 0, "CyanDensity", NULL, NULL, NULL }
-};
-
-DECLARE_INK_CHANNEL(f360_standard_cyan);
-
-static const physical_subchannel_t r800_cyan_subchannels[] =
-{
-  { 2, -1, 1, 0, "CyanDensity", NULL, NULL, NULL }
-};
-
-DECLARE_EXTENDED_INK_CHANNEL(r800_cyan);
-
-static const physical_subchannel_t picturemate_cyan_subchannels[] =
-{
-  { 2, -1, 0, 0, "CyanDensity", NULL, NULL, NULL }
-};
-
-DECLARE_EXTENDED_INK_CHANNEL(picturemate_cyan);
-
-static const physical_subchannel_t cx3650_standard_cyan_subchannels[] =
-{
-  { 2, -1, 2, 0, "CyanDensity", NULL, NULL, NULL }
-};
-
-DECLARE_INK_CHANNEL(cx3650_standard_cyan);
-
-static const physical_subchannel_t x80_cyan_subchannels[] =
+static void
+load_subchannel(stp_mxml_node_t *node, stp_mxml_node_t *root, physical_subchannel_t *icl)
 {
-  { 2, -1, 96, 0, "CyanDensity", NULL, NULL, NULL }
-};
-
-DECLARE_INK_CHANNEL(x80_cyan);
-
-static const physical_subchannel_t c80_cyan_subchannels[] =
-{
-  { 2, -1, 0, 0, "CyanDensity", NULL, NULL, NULL }
-};
-
-DECLARE_INK_CHANNEL(c80_cyan);
-
-static const physical_subchannel_t c120_cyan_subchannels[] =
-{
-  { 2, -1, 0, 0, "CyanDensity", NULL, NULL, NULL }
-};
-
-DECLARE_INK_CHANNEL(c120_cyan);
-
-static const physical_subchannel_t c64_cyan_subchannels[] =
-{
-  { 2, -1, 0, 0, "CyanDensity", NULL, NULL, NULL }
-};
-
-DECLARE_INK_CHANNEL(c64_cyan);
-
-static const physical_subchannel_t standard_magenta_subchannels[] =
-{
-  { 1, -1, 0, 0, "MagentaDensity", NULL, NULL, NULL }
-};
-
-DECLARE_INK_CHANNEL(standard_magenta);
-
-static const physical_subchannel_t r800_magenta_subchannels[] =
-{
-  { 1, -1, 0, 0, "MagentaDensity", NULL, NULL, NULL }
-};
-
-DECLARE_EXTENDED_INK_CHANNEL(r800_magenta);
-
-static const physical_subchannel_t picturemate_magenta_subchannels[] =
-{
-  { 1, -1, 0, 0, "MagentaDensity", NULL, NULL, NULL }
-};
-
-DECLARE_EXTENDED_INK_CHANNEL(picturemate_magenta);
-
-static const physical_subchannel_t f360_standard_magenta_subchannels[] =
-{
-  { 1, -1, 1, 0, "MagentaDensity", NULL, NULL, NULL }
-};
-
-DECLARE_INK_CHANNEL(f360_standard_magenta);
-
-static const physical_subchannel_t x80_magenta_subchannels[] =
-{
-  { 1, -1, 48, 0, "MagentaDensity", NULL, NULL, NULL }
-};
-
-DECLARE_INK_CHANNEL(x80_magenta);
-
-static const physical_subchannel_t c80_magenta_subchannels[] =
-{
-  { 1, -1, 120, 0, "MagentaDensity", NULL, NULL, NULL }
-};
-
-DECLARE_INK_CHANNEL(c80_magenta);
-
-static const physical_subchannel_t c120_magenta_subchannels[] =
-{
-  { 1, -1, 120, 0, "MagentaDensity", NULL, NULL, NULL }
-};
-
-DECLARE_INK_CHANNEL(c120_magenta);
-
-static const physical_subchannel_t c64_magenta_subchannels[] =
-{
-  { 1, -1, 90, 0, "MagentaDensity", NULL, NULL, NULL }
-};
-
-DECLARE_INK_CHANNEL(c64_magenta);
-
-static const physical_subchannel_t standard_yellow_subchannels[] =
-{
-  { 4, -1, 0, 0, "YellowDensity", NULL, NULL, NULL }
-};
-
-DECLARE_INK_CHANNEL(standard_yellow);
-
-static const physical_subchannel_t x80_yellow_subchannels[] =
-{
-  { 4, -1, 0, 0, "YellowDensity", NULL, NULL, NULL }
-};
-
-DECLARE_INK_CHANNEL(x80_yellow);
-
-static const physical_subchannel_t c80_yellow_subchannels[] =
-{
-  { 4, -1, 240, 0, "YellowDensity", NULL, NULL, NULL }
-};
-
-DECLARE_INK_CHANNEL(c80_yellow);
-
-static const physical_subchannel_t c120_yellow_subchannels[] =
-{
-  { 4, -1, 240, 0, "YellowDensity", NULL, NULL, NULL }
-};
-
-DECLARE_INK_CHANNEL(c120_yellow);
-
-static const physical_subchannel_t c64_yellow_subchannels[] =
-{
-  { 4, -1, 180, 0, "YellowDensity", NULL, NULL, NULL }
-};
-
-DECLARE_INK_CHANNEL(c64_yellow);
-
-static const physical_subchannel_t f360_standard_yellow_subchannels[] =
-{
-  { 4, -1, 1, 0, "YellowDensity", NULL, NULL, NULL }
-};
-
-DECLARE_INK_CHANNEL(f360_standard_yellow);
-
-static const physical_subchannel_t r800_yellow_subchannels[] =
-{
-  { 4, -1, 1, 0, "YellowDensity", NULL, NULL, NULL }
-};
-
-DECLARE_EXTENDED_INK_CHANNEL(r800_yellow);
-
-static const physical_subchannel_t picturemate_yellow_subchannels[] =
-{
-  { 4, -1, 0, 0, "YellowDensity", NULL, NULL, NULL }
-};
-
-DECLARE_EXTENDED_INK_CHANNEL(picturemate_yellow);
-
-static const physical_subchannel_t r800_red_subchannels[] =
-{
-  { 7, -1, 0, 0, "RedDensity", NULL, NULL, NULL }
-};
-
-DECLARE_EXTENDED_INK_CHANNEL(r800_red);
-
-static const physical_subchannel_t picturemate_red_subchannels[] =
-{
-  { 7, -1, 0, 0, "RedDensity", NULL, NULL, NULL }
-};
-
-DECLARE_EXTENDED_INK_CHANNEL(picturemate_red);
-
-static const physical_subchannel_t r800_blue_subchannels[] =
-{
-  { 8, -1, 1, 0, "BlueDensity", NULL, NULL, NULL }
-};
-
-DECLARE_EXTENDED_INK_CHANNEL(r800_blue);
-
-static const physical_subchannel_t picturemate_blue_subchannels[] =
-{
-  { 8, -1, 1, 0, "BlueDensity", NULL, NULL, NULL }
-};
-
-DECLARE_EXTENDED_INK_CHANNEL(picturemate_blue);
-
-static const physical_subchannel_t standard_gloss_subchannels[] =
-{
-  { 9, -1, 0, 0, "GlossDensity", NULL, NULL, NULL }
-};
-
-DECLARE_INK_CHANNEL(standard_gloss);
-
-static const physical_subchannel_t f360_gloss_subchannels[] =
-{
-  { 9, -1, 1, 0, "GlossDensity", NULL, NULL, NULL }
-};
-
-DECLARE_INK_CHANNEL(f360_gloss);
-
-static const physical_subchannel_t standard_photo_black_subchannels[] =
-{
-  { 0, 4, 0, 0, "BlackDensity", NULL, NULL, NULL }
-};
-
-DECLARE_INK_CHANNEL(standard_photo_black);
-
-static const physical_subchannel_t f360_photo_black_subchannels[] =
-{
-  { 0, 4, 1, 0, "BlackDensity", NULL, NULL, NULL }
-};
-
-DECLARE_INK_CHANNEL(f360_photo_black);
-
-static const physical_subchannel_t r800_matte_black_subchannels[] =
-{
-  { 0, 0, 0, 0, "BlackDensity", NULL, NULL, NULL }
-};
-
-DECLARE_INK_CHANNEL(r800_matte_black);
-
-static const physical_subchannel_t photo_black_subchannels[] =
-{
-  { 0, 0, 0, 0, "BlackDensity", NULL, NULL, NULL }
-};
-
-DECLARE_INK_CHANNEL(photo_black);
-
-static const physical_subchannel_t extended_black_subchannels[] =
-{
-  { 0, 1, 0, 0, "BlackDensity", NULL, NULL, NULL }
-};
-
-DECLARE_INK_CHANNEL(extended_black);
-
-static const physical_subchannel_t f360_extended_black_subchannels[] =
-{
-  { 0, 1, 1, 0, "BlackDensity", NULL, NULL, NULL }
-};
-
-DECLARE_INK_CHANNEL(f360_extended_black);
-
-static const physical_subchannel_t photo_cyan_subchannels[] =
-{
-  { 2, 0, 0, 0, "CyanDensity", "LightCyanTransition", NULL, NULL },
-  { 2, 1, 0, 0, "CyanDensity", "LightCyanTransition", "LightCyanValue", "LightCyanScale" }
-};
-
-DECLARE_INK_CHANNEL(photo_cyan);
-
-static const physical_subchannel_t extended_cyan_subchannels[] =
-{
-  { 2, 1, 0, 0, "CyanDensity", NULL, NULL, NULL }
-};
-
-DECLARE_INK_CHANNEL(extended_cyan);
-
-static const physical_subchannel_t f360_extended_cyan_subchannels[] =
-{
-  { 2, 1, 1, 0, "CyanDensity", NULL, NULL, NULL }
-};
-
-DECLARE_INK_CHANNEL(f360_extended_cyan);
-
-static const physical_subchannel_t photo_magenta_subchannels[] =
-{
-  { 1, 0, 0, 0, "MagentaDensity", "LightMagentaTransition", NULL, NULL },
-  { 1, 1, 0, 0, "MagentaDensity", "LightMagentaTransition", "LightMagentaValue", "LightMagentaScale" }
-};
-
-DECLARE_INK_CHANNEL(photo_magenta);
-
-static const physical_subchannel_t extended_magenta_subchannels[] =
-{
-  { 1, 1, 0, 0, "MagentaDensity", NULL, NULL, NULL }
-};
-
-DECLARE_INK_CHANNEL(extended_magenta);
-
-static const physical_subchannel_t f360_extended_magenta_subchannels[] =
-{
-  { 1, 1, 1, 0, "MagentaDensity", NULL, NULL, NULL }
-};
-
-DECLARE_INK_CHANNEL(f360_extended_magenta);
-
-static const physical_subchannel_t photo_yellow_subchannels[] =
-{
-  { 4, 0, 0, 0, "YellowDensity", NULL, NULL, NULL }
-};
-
-DECLARE_INK_CHANNEL(photo_yellow);
-
-static const physical_subchannel_t f360_photo_yellow_subchannels[] =
-{
-  { 4, 0, 1, 0, "YellowDensity", NULL, NULL, NULL }
-};
-
-DECLARE_INK_CHANNEL(f360_photo_yellow);
-
-static const physical_subchannel_t j_extended_yellow_subchannels[] =
-{
-  { 4, 2, 0, 0, "YellowDensity", NULL, NULL, NULL }
-};
-
-DECLARE_INK_CHANNEL(j_extended_yellow);
-
-static const physical_subchannel_t extended_photo3_black_subchannels[] =
-{
-  { 0, 3, 0, 0, "BlackDensity", NULL, NULL, NULL }
-};
-
-DECLARE_INK_CHANNEL(extended_photo3_black);
-
-static const physical_subchannel_t f360_extended_photo3_black_subchannels[] =
-{
-  { 0, 3, 1, 0, "BlackDensity", NULL, NULL, NULL }
-};
-
-DECLARE_INK_CHANNEL(f360_extended_photo3_black);
-
-/* For Japanese 7-color printers, with dark yellow */
-static const physical_subchannel_t photo2_yellow_subchannels[] =
-{
-  { 4, 2, 0, 0, "YellowDensity", "DarkYellowTransition", NULL, NULL },
-  { 4, 0, 0, 0, "YellowDensity", "DarkYellowTransition", "DarkYellowValue", "DarkYellowScale" }
-};
-
-DECLARE_INK_CHANNEL(photo2_yellow);
-
-static const physical_subchannel_t f360_photo2_yellow_subchannels[] =
-{
-  { 4, 2, 0, 0, "YellowDensity", "DarkYellowTransition", NULL, NULL },
-  { 4, 0, 1, 0, "YellowDensity", "DarkYellowTransition", "DarkYellowValue", "DarkYellowScale" }
-};
-
-DECLARE_INK_CHANNEL(f360_photo2_yellow);
-
-static const physical_subchannel_t photo2_black_subchannels[] =
-{
-  { 0, 0, 0, 0, "BlackDensity", "GrayTransition", NULL, NULL },
-  { 0, 1, 0, 0, "BlackDensity", "GrayTransition", "GrayValue", "GrayScale" }
-};
-
-DECLARE_INK_CHANNEL(photo2_black);
-
-static const physical_subchannel_t f360_photo2_black_subchannels[] =
-{
-  { 0, 0, 1, 0, "BlackDensity", "GrayTransition", NULL, NULL },
-  { 0, 1, 0, 0, "BlackDensity", "GrayTransition", "GrayValue", "GrayScale" }
-};
-
-DECLARE_INK_CHANNEL(f360_photo2_black);
-
-static const physical_subchannel_t photo3_black_subchannels[] =
-{
-  { 0, 0, 0, 0, "BlackDensity", "GrayTransition", NULL, NULL },
-  { 0, 1, 0, 0, "BlackDensity", "GrayTransition", "DarkGrayValue", "DarkGrayScale" },
-  { 0, 3, 0, 0, "BlackDensity", "GrayTransition", "LightGrayValue", "LightGrayScale" }
-};
-
-DECLARE_INK_CHANNEL(photo3_black);
-
-static const physical_subchannel_t f360_photo3_black_subchannels[] =
-{
-  { 0, 0, 1, 0, "BlackDensity", NULL, NULL, NULL },
-  { 0, 1, 0, 0, "BlackDensity", "DarkGrayTransition", "DarkGrayValue", "DarkGrayScale" },
-  { 0, 3, 1, 0, "BlackDensity", "LightGrayTransition", "LightGrayValue", "LightGrayScale" }
-};
-
-DECLARE_INK_CHANNEL(f360_photo3_black);
-
-static const physical_subchannel_t quadtone_subchannels[] =
-{
-  { 0, -1, 0, 0, "BlackDensity", "GrayTransition", NULL, NULL },
-  { 2, -1, 0, 0, "BlackDensity", "GrayTransition", "Gray3Value", "Gray3Scale" },
-  { 1, -1, 0, 0, "BlackDensity", "GrayTransition", "Gray2Value", "Gray2Scale" },
-  { 4, -1, 0, 0, "BlackDensity", "GrayTransition", "Gray1Value", "Gray1Scale" },
-};
-
-DECLARE_INK_CHANNEL(quadtone);
-
-static const physical_subchannel_t c80_quadtone_subchannels[] =
-{
-  { 0, -1, 0, 0, "BlackDensity", "GrayTransition", NULL, NULL },
-  { 2, -1, 0, 0, "BlackDensity", "GrayTransition", "Gray3Value", "Gray3Scale" },
-  { 1, -1, 120, 0, "BlackDensity", "GrayTransition", "Gray2Value", "Gray2Scale" },
-  { 4, -1, 240, 0, "BlackDensity", "GrayTransition", "Gray1Value", "Gray1Scale" },
-};
-
-DECLARE_INK_CHANNEL(c80_quadtone);
-
-static const physical_subchannel_t c120_quadtone_subchannels[] =
-{
-  { 0, 4, 0, 0, "BlackDensity", "GrayTransition", NULL, NULL },
-  { 2, -1, 0, 0, "BlackDensity", "GrayTransition", "Gray3Value", "Gray3Scale" },
-  { 1, -1, 120, 0, "BlackDensity", "GrayTransition", "Gray2Value", "Gray2Scale" },
-  { 4, -1, 240, 0, "BlackDensity", "GrayTransition", "Gray1Value", "Gray1Scale" },
-};
-
-DECLARE_INK_CHANNEL(c120_quadtone);
-
-static const physical_subchannel_t c64_quadtone_subchannels[] =
-{
-  { 0, -1, 0, 0, "BlackDensity", "GrayTransition", NULL, NULL },
-  { 2, -1, 0, 0, "BlackDensity", "Gray3Transition", "Gray3Value", "Gray3Scale" },
-  { 1, -1, 90, 0, "BlackDensity", "Gray2Transition", "Gray2Value", "Gray2Scale" },
-  { 4, -1, 180, 0, "BlackDensity", "Gray1Transition", "Gray1Value", "Gray1Scale" },
-};
-
-DECLARE_INK_CHANNEL(c64_quadtone);
-
-static const physical_subchannel_t f360_quadtone_subchannels[] =
-{
-  { 0, -1, 0, 0, "BlackDensity", "GrayTransition", NULL, NULL },
-  { 2, -1, 1, 0, "BlackDensity", "GrayTransition", "Gray3Value", "Gray3Scale" },
-  { 1, -1, 1, 0, "BlackDensity", "GrayTransition", "Gray2Value", "Gray2Scale" },
-  { 4, -1, 0, 0, "BlackDensity", "GrayTransition", "Gray1Value", "Gray1Scale" },
-};
-
-DECLARE_INK_CHANNEL(f360_quadtone);
-
-static const physical_subchannel_t cx3650_quadtone_subchannels[] =
-{
-  { 0, -1, 0, 0, "BlackDensity", "GrayTransition", NULL, NULL },
-  { 2, -1, 2, 0, "BlackDensity", "GrayTransition", "Gray3Value", "Gray3Scale" },
-  { 1, -1, 1, 0, "BlackDensity", "GrayTransition", "Gray2Value", "Gray2Scale" },
-  { 4, -1, 0, 0, "BlackDensity", "GrayTransition", "Gray1Value", "Gray1Scale" },
-};
-
-DECLARE_INK_CHANNEL(cx3650_quadtone);
-
-static const physical_subchannel_t f360_photo_cyan_subchannels[] =
-{
-  { 2, 0, 1, 0, "CyanDensity", "LightCyanTransition", NULL, NULL },
-  { 2, 1, 0, 0, "CyanDensity", "LightCyanTransition", "LightCyanValue", "LightCyanScale" }
-};
-
-DECLARE_INK_CHANNEL(f360_photo_cyan);
-
-static const physical_subchannel_t f360x_photo_cyan_subchannels[] =
-{
-  { 2, 0, 0, 0, "CyanDensity", "LightCyanTransition", NULL, NULL },
-  { 2, 1, 1, 0, "CyanDensity", "LightCyanTransition", "LightCyanValue", "LightCyanScale" }
-};
-
-DECLARE_INK_CHANNEL(f360x_photo_cyan);
-
-static const physical_subchannel_t f360_photo_magenta_subchannels[] =
-{
-  { 1, 0, 1, 0, "MagentaDensity", "LightMagentaTransition", NULL, NULL },
-  { 1, 1, 0, 0, "MagentaDensity", "LightMagentaTransition", "LightMagentaValue", "LightMagentaScale" }
-};
-
-DECLARE_INK_CHANNEL(f360_photo_magenta);
-
-static const physical_subchannel_t f360x_photo_magenta_subchannels[] =
-{
-  { 1, 0, 0, 0, "MagentaDensity", "LightMagentaTransition", NULL, NULL },
-  { 1, 1, 1, 0, "MagentaDensity", "LightMagentaTransition", "LightMagentaValue", "LightMagentaScale" }
-};
-
-DECLARE_INK_CHANNEL(f360x_photo_magenta);
-
-static const physical_subchannel_t claria_black_subchannels[] =
-{
-  { 0, 0, 0, 0, "BlackDensity", NULL, NULL, NULL },
-};
-
-DECLARE_INK_CHANNEL(claria_black);
-
-static const physical_subchannel_t claria_yellow_subchannels[] =
-{
-  { 4, 0, 2, 0, "YellowDensity", NULL, NULL, NULL },
-};
-
-DECLARE_INK_CHANNEL(claria_yellow);
-
-static const physical_subchannel_t claria_cyan_subchannels[] =
-{
-  { 2, 0, 0, 0, "CyanDensity", NULL, NULL, NULL },
-};
-
-DECLARE_INK_CHANNEL(claria_cyan);
-
-static const physical_subchannel_t claria_photo_cyan_subchannels[] =
-{
-  { 2, 0, 0, 0, "CyanDensity", "LightCyanTransition", NULL, NULL },
-  { 2, 1, 2, 0, "CyanDensity", "LightCyanTransition", "LightCyanValue", "LightCyanScale" },
-};
-
-DECLARE_INK_CHANNEL(claria_photo_cyan);
-
-static const physical_subchannel_t extended_claria_cyan_subchannels[] =
-{
-  { 2, 1, 2, 0, "CyanDensity", NULL, NULL, NULL },
-};
-
-DECLARE_INK_CHANNEL(extended_claria_cyan);
-
-static const physical_subchannel_t claria_magenta_subchannels[] =
-{
-  { 1, 0, 2, 0, "MagentaDensity", NULL, NULL, NULL },
-};
-
-DECLARE_INK_CHANNEL(claria_magenta);
-
-static const physical_subchannel_t claria_photo_magenta_subchannels[] =
-{
-  { 1, 0, 2, 0, "MagentaDensity", "LightMagentaTransition", NULL, NULL },
-  { 1, 1, 0, 0, "MagentaDensity", "LightMagentaTransition", "LightMagentaValue", "LightMagentaScale" },
-};
-
-DECLARE_INK_CHANNEL(claria_photo_magenta);
-
-static const physical_subchannel_t extended_claria_magenta_subchannels[] =
-{
-  { 1, 1, 0, 0, "MagentaDensity", NULL, NULL, NULL },
-};
-
-DECLARE_INK_CHANNEL(extended_claria_magenta);
-
-
-#define DECLARE_CHANNEL_SET(name)			\
-static const channel_set_t name##_channel_set =		\
-{							\
-  #name " channel set",					\
-  name##_channels,					\
-  NULL,							\
-  sizeof(name##_channels) / sizeof(ink_channel_t *),	\
-  0							\
-}
-
-#define DECLARE_AUX_CHANNEL_SET(name, aux)		\
-static const channel_set_t name##_##aux##_channel_set =	\
-{							\
-  #name " channel set",					\
-  name##_channels,					\
-  aux##_channels,					\
-  sizeof(name##_channels) / sizeof(ink_channel_t *),	\
-  sizeof(aux##_channels) / sizeof(ink_channel_t *),	\
+  const char *name;
+  stp_mxml_node_t *child = node->child;
+  name = stp_mxmlElementGetAttr(node, "color");
+  if (name)
+    icl->color = stp_xmlstrtol(name);
+  name = stp_mxmlElementGetAttr(node, "subchannel");
+  if (name)
+    icl->subchannel = stp_xmlstrtol(name);
+  else
+    icl->subchannel = -1;
+  name = stp_mxmlElementGetAttr(node, "headOffset");
+  if (name)
+    icl->head_offset = stp_xmlstrtol(name);
+  while (child)
+    {
+      if (child->type == STP_MXML_ELEMENT)
+	{
+	  const char *param = child->value.element.name;
+	  name = stp_mxmlElementGetAttr(child, "name");
+	  if (name && !strcmp(param, "ChannelDensityParam"))
+	    icl->channel_density = stp_strdup(name);
+	  else if (name && !strcmp(param, "SubchannelTransitionParam"))
+	    icl->subchannel_transition = stp_strdup(name);
+	  else if (name && !strcmp(param, "SubchannelValueParam"))
+	    icl->subchannel_value = stp_strdup(name);
+	  else if (name && !strcmp(param, "SubchannelScaleParam"))
+	    icl->subchannel_scale = stp_strdup(name);
+	  else if (!strcmp(param, "SplitChannels"))
+	    {
+	      if (stp_mxmlElementGetAttr(child, "count"))
+		icl->split_channel_count =
+		  stp_xmlstrtoul(stp_mxmlElementGetAttr(child, "count"));
+	      if (icl->split_channel_count > 0)
+		{
+		  char *endptr;
+		  int count = 0;
+		  stp_mxml_node_t *cchild = child->child;
+		  icl->split_channels =
+		    stp_zalloc(sizeof(short) * icl->split_channel_count);
+		  while (cchild && count < icl->split_channel_count)
+		    {
+		      if (cchild->type == STP_MXML_TEXT)
+			{
+			  unsigned val =
+			    strtoul(cchild->value.text.string, &endptr, 0);
+			  if (endptr)
+			    icl->split_channels[count++] = val;
+			}
+		      cchild = cchild->next;
+		    }
+		}
+	    }
+	}
+      child = child->next;
+    }
 }
 
-
-/*
- ****************************************************************
- *                                                              *
- * Grayscale                                                    *
- *                                                              *
- ****************************************************************
- */
-
-static const ink_channel_t *const standard_gloss_channels[] =
-{
-  &standard_gloss_channel
-};
-
-static const ink_channel_t *const f360_gloss_channels[] =
-{
-  &f360_gloss_channel
-};
-
-static const ink_channel_t *const standard_black_channels[] =
-{
-  &standard_black_channel
-};
-
-DECLARE_CHANNEL_SET(standard_black);
-
-static const escp2_inkname_t stpi_escp2_default_black_inkset =
-{
-  "Gray", N_("Grayscale"), INKSET_CMYK,
-  &standard_black_channel_set
-};
-
-static const ink_channel_t *const standard_photo_black_channels[] =
-{
-  &standard_photo_black_channel
-};
-
-DECLARE_CHANNEL_SET(standard_photo_black);
-
-static const escp2_inkname_t stpi_escp2_default_photo_black_inkset =
-{
-  "Gray", N_("Grayscale"), INKSET_CMYK,
-  &standard_photo_black_channel_set
-};
-
-static const ink_channel_t *const standard_photo_gloss_black_channels[] =
-{
-  &f360_photo_black_channel, &standard_gloss_channel
-};
-
-DECLARE_CHANNEL_SET(standard_photo_gloss_black);
-DECLARE_AUX_CHANNEL_SET(standard_photo_black, standard_gloss);
-
-static const escp2_inkname_t stpi_escp2_default_photo_gloss_black_inkset =
-{
-  "GrayG", N_("Grayscale"), INKSET_CMYK,
-  &standard_photo_black_standard_gloss_channel_set
-};
-
-
-/*
- ****************************************************************
- *                                                              *
- * Two shade gray                                               *
- *                                                              *
- ****************************************************************
- */
-
-static const ink_channel_t *const photo2_black_channels[] =
-{
-  &photo2_black_channel
-};
-
-DECLARE_CHANNEL_SET(photo2_black);
-
-static const escp2_inkname_t two_color_grayscale_inkset =
-{
-  "Gray2", N_("Two Level Grayscale"), INKSET_CcMmYKk,
-  &photo2_black_channel_set
-};
-
-static const ink_channel_t *const f360_photo2_black_channels[] =
-{
-  &f360_photo2_black_channel
-};
-
-DECLARE_CHANNEL_SET(f360_photo2_black);
-
-static const escp2_inkname_t f360_two_color_grayscale_inkset =
-{
-  "Gray2", N_("Two Level Grayscale"), INKSET_CcMmYKk,
-  &f360_photo2_black_channel_set
-};
-
-
-/*
- ****************************************************************
- *                                                              *
- * Three shade gray                                             *
- *                                                              *
- ****************************************************************
- */
-
-static const ink_channel_t *const photo3_black_channels[] =
-{
-  &photo3_black_channel
-};
-
-DECLARE_CHANNEL_SET(photo3_black);
-
-static const escp2_inkname_t three_color_grayscale_inkset =
-{
-  "Gray3", N_("Three Level Grayscale"), INKSET_CcMmYKk,
-  &photo3_black_channel_set
-};
-
-static const ink_channel_t *const f360_photo3_black_channels[] =
-{
-  &f360_photo3_black_channel
-};
-
-DECLARE_CHANNEL_SET(f360_photo3_black);
-
-static const escp2_inkname_t f360_three_color_grayscale_inkset =
-{
-  "Gray3", N_("Three Level Grayscale"), INKSET_CcMmYKk,
-  &f360_photo3_black_channel_set
-};
-
-
-/*
- ****************************************************************
- *                                                              *
- * Quadtone gray                                                *
- *                                                              *
- ****************************************************************
- */
-
-static const ink_channel_t *const quadtone_channels[] =
-{
-  &quadtone_channel
-};
-
-DECLARE_CHANNEL_SET(quadtone);
-
-static const escp2_inkname_t generic_quadtone_inkset =
-{
-  "Quadtone", N_("Quadtone"), INKSET_QUADTONE,
-  &quadtone_channel_set
-};
-
-static const ink_channel_t *const c80_quadtone_channels[] =
-{
-  &c80_quadtone_channel
-};
-
-DECLARE_CHANNEL_SET(c80_quadtone);
-
-static const escp2_inkname_t c80_generic_quadtone_inkset =
-{
-  "Quadtone", N_("Quadtone"), INKSET_QUADTONE,
-  &c80_quadtone_channel_set
-};
-
-static const ink_channel_t *const c120_quadtone_channels[] =
-{
-  &c120_quadtone_channel
-};
-
-DECLARE_CHANNEL_SET(c120_quadtone);
-
-static const escp2_inkname_t c120_generic_quadtone_inkset =
-{
-  "Quadtone", N_("Quadtone"), INKSET_QUADTONE,
-  &c120_quadtone_channel_set
-};
-
-static const ink_channel_t *const c64_quadtone_channels[] =
-{
-  &c64_quadtone_channel
-};
-
-DECLARE_CHANNEL_SET(c64_quadtone);
-
-static const escp2_inkname_t c64_generic_quadtone_inkset =
-{
-  "Quadtone", N_("Quadtone"), INKSET_QUADTONE,
-  &c64_quadtone_channel_set
-};
-
-static const ink_channel_t *const f360_quadtone_channels[] =
-{
-  &f360_quadtone_channel
-};
-
-DECLARE_CHANNEL_SET(f360_quadtone);
-
-static const escp2_inkname_t f360_generic_quadtone_inkset =
-{
-  "Quadtone", N_("Quadtone"), INKSET_QUADTONE,
-  &f360_quadtone_channel_set
-};
-
-static const ink_channel_t *const cx3650_quadtone_channels[] =
-{
-  &cx3650_quadtone_channel
-};
-
-DECLARE_CHANNEL_SET(cx3650_quadtone);
-
-static const escp2_inkname_t cx3650_generic_quadtone_inkset =
-{
-  "Quadtone", N_("Quadtone"), INKSET_QUADTONE,
-  &cx3650_quadtone_channel_set
-};
-
-
-
-/*
- ****************************************************************
- *                                                              *
- * Three color CMY                                              *
- *                                                              *
- ****************************************************************
- */
-
-static const ink_channel_t *const standard_cmy_channels[] =
-{
-  NULL, &standard_cyan_channel,
-  &standard_magenta_channel, &standard_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(standard_cmy);
-
-static const escp2_inkname_t three_color_composite_inkset =
-{
-  "RGB", N_("Three Color Composite"), INKSET_CMYK,
-  &standard_cmy_channel_set
-};
-
-static const ink_channel_t *const x80_cmy_channels[] =
-{
-  NULL, &x80_cyan_channel,
-  &x80_magenta_channel, &x80_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(x80_cmy);
-
-static const escp2_inkname_t x80_three_color_composite_inkset =
-{
-  "RGB", N_("Three Color Composite"), INKSET_CMYK,
-  &x80_cmy_channel_set
-};
-
-static const ink_channel_t *const c80_cmy_channels[] =
-{
-  NULL, &c80_cyan_channel,
-  &c80_magenta_channel, &c80_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(c80_cmy);
-
-static const escp2_inkname_t c80_three_color_composite_inkset =
-{
-  "RGB", N_("Three Color Composite"), INKSET_CMYK,
-  &c80_cmy_channel_set
-};
-
-static const ink_channel_t *const c120_cmy_channels[] =
-{
-  NULL, &c120_cyan_channel,
-  &c120_magenta_channel, &c120_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(c120_cmy);
-
-static const escp2_inkname_t c120_three_color_composite_inkset =
-{
-  "RGB", N_("Three Color Composite"), INKSET_CMYK,
-  &c120_cmy_channel_set
-};
-
-static const ink_channel_t *const c64_cmy_channels[] =
-{
-  NULL, &c64_cyan_channel,
-  &c64_magenta_channel, &c64_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(c64_cmy);
-
-static const escp2_inkname_t c64_three_color_composite_inkset =
-{
-  "RGB", N_("Three Color Composite"), INKSET_CMYK,
-  &c64_cmy_channel_set
-};
-
-static const ink_channel_t *const f360_cmy_channels[] =
-{
-  NULL, &f360_standard_cyan_channel,
-  &f360_standard_magenta_channel, &standard_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(f360_cmy);
-
-static const escp2_inkname_t f360_three_color_composite_inkset =
-{
-  "RGB", N_("Three Color Composite"), INKSET_CMYK,
-  &f360_cmy_channel_set
-};
-
-static const ink_channel_t *const cx3650_cmy_channels[] =
-{
-  NULL, &cx3650_standard_cyan_channel,
-  &f360_standard_magenta_channel, &standard_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(cx3650_cmy);
-
-static const escp2_inkname_t cx3650_three_color_composite_inkset =
-{
-  "RGB", N_("Three Color Composite"), INKSET_CMYK,
-  &cx3650_cmy_channel_set
-};
-
-static const ink_channel_t *const standard_gloss_cmy_channels[] =
-{
-  NULL, &f360_standard_cyan_channel,
-  &standard_magenta_channel, &f360_standard_yellow_channel,
-  &standard_gloss_channel
-};
-
-DECLARE_CHANNEL_SET(standard_gloss_cmy);
-
-static const ink_channel_t *const r800_cmy_channels[] =
-{
-  NULL, &f360_standard_cyan_channel,
-  &standard_magenta_channel, &f360_standard_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(r800_cmy);
-DECLARE_AUX_CHANNEL_SET(r800_cmy, standard_gloss);
-
-static const escp2_inkname_t three_color_r800_gloss_inkset =
-{
-  "RGBG", N_("Three Color Composite"), INKSET_CMYK,
-  &r800_cmy_standard_gloss_channel_set
-};
-
-static const escp2_inkname_t three_color_r800_composite_inkset =
-{
-  "RGBG", N_("Three Color Composite"), INKSET_CMYK,
-  &r800_cmy_channel_set
-};
-
-static const ink_channel_t *const r2400_cmy_channels[] =
-{
-  NULL, &standard_cyan_channel,
-  &f360_standard_magenta_channel, &standard_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(r2400_cmy);
-
-static const escp2_inkname_t three_color_r2400_composite_inkset =
-{
-  "CMY", N_("Three Color Composite"), INKSET_CMYK,
-  &r2400_cmy_channel_set
-};
-
-static const ink_channel_t *const claria_cmy_channels[] =
-{
-  NULL, &claria_cyan_channel,
-  &claria_magenta_channel, &claria_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(claria_cmy);
-
-static const escp2_inkname_t claria_three_color_composite_inkset =
-{
-  "RGB", N_("Three Color Composite"), INKSET_CMYK,
-  &claria_cmy_channel_set
-};
-
-/*
- ****************************************************************
- *                                                              *
- * Four color CMYK                                              *
- *                                                              *
- ****************************************************************
- */
-
-static const ink_channel_t *const standard_cmyk_channels[] =
-{
-  &standard_black_channel, &standard_cyan_channel,
-  &standard_magenta_channel, &standard_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(standard_cmyk);
-
-static const escp2_inkname_t four_color_standard_inkset =
-{
-  "CMYK", N_("Four Color Standard"), INKSET_CMYK,
-  &standard_cmyk_channel_set
-};
-
-static const ink_channel_t *const photo_cmyk_channels[] =
-{
-  &standard_photo_black_channel, &standard_cyan_channel,
-  &standard_magenta_channel, &standard_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(photo_cmyk);
-
-static const escp2_inkname_t four_color_photo_inkset =
-{
-  "CMYK", N_("Four Color Standard"), INKSET_CMYK,
-  &photo_cmyk_channel_set
-};
-
-static const ink_channel_t *const r800_cmyk_channels[] =
-{
-  &standard_black_channel, &f360_standard_cyan_channel,
-  &standard_magenta_channel, &f360_standard_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(r800_cmyk);
-
-static const escp2_inkname_t four_color_r800_matte_inkset =
-{
-  "CMYKG", N_("Four Color Standard"), INKSET_CMYK,
-  &r800_cmyk_channel_set
-};
-
-static const ink_channel_t *const r2400_cmyk_channels[] =
-{
-  &f360_black_channel, &standard_cyan_channel,
-  &f360_standard_magenta_channel, &standard_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(r2400_cmyk);
-
-static const escp2_inkname_t four_color_r2400_standard_inkset =
-{
-  "CMYK", N_("Four Color Standard"), INKSET_CMYK,
-  &r2400_cmyk_channel_set
-};
-
-static const ink_channel_t *const photo_gloss_cmyk_channels[] =
-{
-  &f360_photo_black_channel, &f360_standard_cyan_channel,
-  &standard_magenta_channel, &f360_standard_yellow_channel,
-  &standard_gloss_channel
-};
-
-DECLARE_CHANNEL_SET(photo_gloss_cmyk);
-
-static const ink_channel_t *const r800_photo_cmyk_channels[] =
-{
-  &f360_photo_black_channel, &f360_standard_cyan_channel,
-  &standard_magenta_channel, &f360_standard_yellow_channel,
-};
-
-DECLARE_CHANNEL_SET(r800_photo_cmyk);
-DECLARE_AUX_CHANNEL_SET(r800_photo_cmyk, standard_gloss);
-
-static const escp2_inkname_t four_color_r800_photo_gloss_inkset =
-{
-  "CMYKG", N_("Four Color Standard"), INKSET_CMYK,
-  &r800_photo_cmyk_standard_gloss_channel_set
-};
-
-static const ink_channel_t *const x80_cmyk_channels[] =
-{
-  &x80_black_channel, &x80_cyan_channel,
-  &x80_magenta_channel, &x80_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(x80_cmyk);
-
-static const escp2_inkname_t x80_four_color_standard_inkset =
-{
-  "CMYK", N_("Four Color Standard"), INKSET_CMYK,
-  &x80_cmyk_channel_set
-};
-
-static const ink_channel_t *const c80_cmyk_channels[] =
-{
-  &c80_black_channel, &c80_cyan_channel,
-  &c80_magenta_channel, &c80_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(c80_cmyk);
-
-static const escp2_inkname_t c80_four_color_standard_inkset =
-{
-  "CMYK", N_("Four Color Standard"), INKSET_CMYK,
-  &c80_cmyk_channel_set
-};
-
-static const ink_channel_t *const c120_cmyk_channels[] =
-{
-  &c120_black_channel, &c120_cyan_channel,
-  &c120_magenta_channel, &c120_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(c120_cmyk);
-
-static const escp2_inkname_t c120_four_color_standard_inkset =
-{
-  "CMYK", N_("Four Color Standard"), INKSET_CMYK,
-  &c120_cmyk_channel_set
-};
-
-static const ink_channel_t *const c64_cmyk_channels[] =
-{
-  &c64_black_channel, &c64_cyan_channel,
-  &c64_magenta_channel, &c64_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(c64_cmyk);
-
-static const escp2_inkname_t c64_four_color_standard_inkset =
-{
-  "CMYK", N_("Four Color Standard"), INKSET_CMYK,
-  &c64_cmyk_channel_set
-};
-
-static const ink_channel_t *const f360_cmyk_channels[] =
-{
-  &standard_black_channel, &f360_standard_cyan_channel,
-  &f360_standard_magenta_channel, &standard_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(f360_cmyk);
-
-static const escp2_inkname_t f360_four_color_standard_inkset =
-{
-  "CMYK", N_("Four Color Standard"), INKSET_CMYK,
-  &f360_cmyk_channel_set
-};
-
-static const ink_channel_t *const cx3650_cmyk_channels[] =
-{
-  &standard_black_channel, &cx3650_standard_cyan_channel,
-  &f360_standard_magenta_channel, &standard_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(cx3650_cmyk);
-
-static const escp2_inkname_t cx3650_four_color_standard_inkset =
-{
-  "CMYK", N_("Four Color Standard"), INKSET_CMYK,
-  &cx3650_cmyk_channel_set
-};
-
-static const ink_channel_t *const claria_cmyk_channels[] =
-{
-  &claria_black_channel, &claria_cyan_channel,
-  &claria_magenta_channel, &claria_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(claria_cmyk);
-
-static const escp2_inkname_t claria_four_color_standard_inkset =
-{
-  "CMYK", N_("Four Color Standard"), INKSET_CMYK,
-  &claria_cmyk_channel_set
-};
-
-static const ink_channel_t *const four_color_picturemate_channels[] =
-{
-  &photo_black_channel, &picturemate_cyan_channel,
-  &picturemate_magenta_channel, &picturemate_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(four_color_picturemate);
-
-static const escp2_inkname_t four_color_picturemate_inkset =
-{
-  "CMYK", N_("Four Color Photo"), INKSET_CMYK,
-  &four_color_picturemate_channel_set
-};
-
-
-/*
- ****************************************************************
- *                                                              *
- * Five color CcMmY                                             *
- *                                                              *
- ****************************************************************
- */
-
-static const ink_channel_t *const photo_composite_channels[] =
-{
-  NULL, &photo_cyan_channel,
-  &photo_magenta_channel, &photo_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(photo_composite);
-
-static const escp2_inkname_t five_color_photo_composite_inkset =
-{
-  "PhotoCMY", N_("Five Color Photo Composite"), INKSET_CcMmYK,
-  &photo_composite_channel_set
-};
-
-static const ink_channel_t *const f360_photo_composite_channels[] =
-{
-  NULL, &f360_photo_cyan_channel,
-  &f360_photo_magenta_channel, &f360_photo_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(f360_photo_composite);
-
-static const escp2_inkname_t f360_five_color_photo_composite_inkset =
-{
-  "PhotoCMY", N_("Five Color Photo Composite"), INKSET_CcMmYK,
-  &f360_photo_composite_channel_set
-};
-
-static const ink_channel_t *const five_color_photo3_channels[] =
-{
-  NULL, &f360x_photo_cyan_channel,
-  &f360_photo_magenta_channel, &standard_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(five_color_photo3);
-
-static const escp2_inkname_t five_color_photo3_inkset =
-{
-  "PhotoCMY", N_("Five Color Photo Composite"), INKSET_CcMmYK,
-  &five_color_photo3_channel_set
-};
-
-static const ink_channel_t *const claria_ccmmy_channels[] =
-{
-  NULL, &claria_photo_cyan_channel,
-  &claria_photo_magenta_channel, &claria_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(claria_ccmmy);
-
-static const escp2_inkname_t claria_five_color_photo_composite_inkset =
-{
-  "PhotoCMY", N_("Five Color Photo Composite"), INKSET_CcMmYK,
-  &claria_ccmmy_channel_set
-};
-
-
-/*
- ****************************************************************
- *                                                              *
- * Six color CcMmYK                                             *
- *                                                              *
- ****************************************************************
- */
-
-static const ink_channel_t *const photo_channels[] =
-{
-  &photo_black_channel, &photo_cyan_channel,
-  &photo_magenta_channel, &photo_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(photo);
-
-static const escp2_inkname_t six_color_photo_inkset =
-{
-  "PhotoCMYK", N_("Six Color Photo"), INKSET_CcMmYK,
-  &photo_channel_set
-};
-
-static const ink_channel_t *const f360_photo_channels[] =
-{
-  &standard_black_channel, &f360_photo_cyan_channel,
-  &f360_photo_magenta_channel, &f360_photo_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(f360_photo);
-
-static const escp2_inkname_t f360_six_color_photo_inkset =
-{
-  "PhotoCMYK", N_("Six Color Photo"), INKSET_CcMmYK,
-  &f360_photo_channel_set
-};
-
-static const ink_channel_t *const six_color_photo3_channels[] =
-{
-  &f360_black_channel, &f360x_photo_cyan_channel,
-  &f360_photo_magenta_channel, &standard_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(six_color_photo3);
-
-static const escp2_inkname_t six_color_photo3_inkset =
-{
-  "PhotoCMYK", N_("Six Color Photo"), INKSET_CcMmYK,
-  &six_color_photo3_channel_set
-};
-
-static const ink_channel_t *const claria_ccmmyk_channels[] =
-{
-  &claria_black_channel, &claria_photo_cyan_channel,
-  &claria_photo_magenta_channel, &claria_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(claria_ccmmyk);
-
-static const escp2_inkname_t claria_six_color_photo_inkset =
-{
-  "PhotoCMYK", N_("Six Color Photo"), INKSET_CcMmYK,
-  &claria_ccmmyk_channel_set
-};
-
-/*
- ****************************************************************
- *                                                              *
- * Six color CcMmYy (Japan)                                     *
- *                                                              *
- ****************************************************************
- */
-
-static const ink_channel_t *const photoj_composite_channels[] =
-{
-  NULL, &photo_cyan_channel,
-  &photo_magenta_channel, &photo2_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(photoj_composite);
-
-static const escp2_inkname_t j_six_color_enhanced_composite_inkset =
-{
-  "PhotoEnhanceJ", N_("Six Color Enhanced Composite"), INKSET_CcMmYyK,
-  &photoj_composite_channel_set
-};
-
-static const ink_channel_t *const f360_photoj_composite_channels[] =
-{
-  NULL, &f360_photo_cyan_channel,
-  &f360_photo_magenta_channel, &f360_photo2_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(f360_photoj_composite);
-
-static const escp2_inkname_t f360_j_six_color_enhanced_composite_inkset =
-{
-  "PhotoEnhanceJ", N_("Six Color Enhanced Composite"), INKSET_CcMmYyK,
-  &f360_photoj_composite_channel_set
-};
-
-
-/*
- ****************************************************************
- *                                                              *
- * Seven color CcMmYKk                                          *
- *                                                              *
- ****************************************************************
- */
-
-static const ink_channel_t *const photo2_channels[] =
-{
-  &photo2_black_channel, &photo_cyan_channel,
-  &photo_magenta_channel, &photo_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(photo2);
-
-static const escp2_inkname_t seven_color_enhanced_inkset =
-{
-  "PhotoCMYK7", N_("Seven Color Photo"), INKSET_CcMmYKk,
-  &photo2_channel_set
-};
-
-static const ink_channel_t *const f360_photo2_channels[] =
-{
-  &f360_photo2_black_channel, &f360_photo_cyan_channel,
-  &f360_photo_magenta_channel, &f360_photo_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(f360_photo2);
-
-static const escp2_inkname_t f360_seven_color_enhanced_inkset =
-{
-  "PhotoCMYK7", N_("Seven Color Photo"), INKSET_CcMmYKk,
-  &f360_photo2_channel_set
-};
-
-static const ink_channel_t *const seven_color_photo3_channels[] =
-{
-  &f360_photo2_black_channel, &f360x_photo_cyan_channel,
-  &f360_photo_magenta_channel, &standard_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(seven_color_photo3);
-
-static const escp2_inkname_t seven_color_photo3_inkset =
-{
-  "PhotoCMYK7", N_("Seven Color Photo"), INKSET_CcMmYKk,
-  &seven_color_photo3_channel_set
-};
-
-/*
- ****************************************************************
- *                                                              *
- * Seven color CcMmYyK (Japan)                                  *
- *                                                              *
- ****************************************************************
- */
-
-static const ink_channel_t *const photoj_channels[] =
-{
-  &photo_black_channel, &photo_cyan_channel,
-  &photo_magenta_channel, &photo2_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(photoj);
-
-static const escp2_inkname_t j_seven_color_enhanced_inkset =
-{
-  "Photo7J", N_("Seven Color Enhanced"), INKSET_CcMmYyK,
-  &photoj_channel_set
-};
-
-static const ink_channel_t *const f360_photoj_channels[] =
-{
-  &standard_black_channel, &f360_photo_cyan_channel,
-  &f360_photo_magenta_channel, &f360_photo2_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(f360_photoj);
-
-static const escp2_inkname_t f360_j_seven_color_enhanced_inkset =
-{
-  "Photo7J", N_("Seven Color Photo"), INKSET_CcMmYKk,
-  &f360_photoj_channel_set
-};
-
-
-/*
- ****************************************************************
- *                                                              *
- * Eight color CcMmYKkk                                         *
- *                                                              *
- ****************************************************************
- */
-
-static const ink_channel_t *const photo3_channels[] =
-{
-  &f360_photo3_black_channel, &f360x_photo_cyan_channel,
-  &f360_photo_magenta_channel, &standard_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(photo3);
-
-static const escp2_inkname_t eight_color_enhanced_inkset =
-{
-  "PhotoCMYK8", N_("Eight Color Photo"), INKSET_CcMmYKk,
-  &photo3_channel_set
-};
-
-
-/*
- ****************************************************************
- *                                                              *
- * Five color CMYRB                                             *
- *                                                              *
- ****************************************************************
- */
-
-static const ink_channel_t *const five_color_r800_channels[] =
-{
-  NULL, &r800_cyan_channel,
-  &r800_magenta_channel, &r800_yellow_channel,
-  &r800_red_channel, &r800_blue_channel
-};
-
-DECLARE_CHANNEL_SET(five_color_r800);
-
-static const escp2_inkname_t five_color_r800_inkset =
-{
-  "CMYRB", N_("Five Color Photo Composite"), INKSET_CMYKRB,
-  &five_color_r800_channel_set
-};
-
-static const ink_channel_t *const five_color_r800_photo_channels[] =
-{
-  NULL, &r800_cyan_channel,
-  &r800_magenta_channel, &r800_yellow_channel,
-  &r800_red_channel, &r800_blue_channel
-};
-
-DECLARE_CHANNEL_SET(five_color_r800_photo);
-
-static const escp2_inkname_t five_color_r800_photo_inkset =
-{
-  "CMYRB", N_("Five Color Photo Composite"), INKSET_CMYKRB,
-  &five_color_r800_photo_channel_set
-};
-
-static const ink_channel_t *const five_color_r800_photo_gloss_channels[] =
-{
-  NULL, &f360_standard_cyan_channel,
-  &r800_magenta_channel, &r800_yellow_channel,
-  &r800_red_channel, &r800_blue_channel,
-  &standard_gloss_channel
-};
-
-DECLARE_CHANNEL_SET(five_color_r800_photo_gloss);
-DECLARE_AUX_CHANNEL_SET(five_color_r800_photo, standard_gloss);
-
-static const escp2_inkname_t five_color_r800_photo_gloss_inkset =
-{
-  "CMYRBG", N_("Five Color Photo Composite"), INKSET_CMYKRB,
-  &five_color_r800_photo_standard_gloss_channel_set
-};
-
-
-/*
- ****************************************************************
- *                                                              *
- * Six color CMYKRB                                             *
- *                                                              *
- ****************************************************************
- */
-
-static const ink_channel_t *const six_color_r800_channels[] =
-{
-  &standard_black_channel, &r800_cyan_channel,
-  &r800_magenta_channel, &r800_yellow_channel,
-  &r800_red_channel, &r800_blue_channel
-};
-
-DECLARE_CHANNEL_SET(six_color_r800);
-
-static const escp2_inkname_t six_color_r800_inkset =
-{
-  "CMYKRB", N_("Six Color Photo"), INKSET_CMYKRB,
-  &six_color_r800_channel_set
-};
-
-static const ink_channel_t *const six_color_r800_photo_channels[] =
-{
-  &f360_photo_black_channel, &r800_cyan_channel,
-  &r800_magenta_channel, &r800_yellow_channel,
-  &r800_red_channel, &r800_blue_channel
-};
-
-DECLARE_CHANNEL_SET(six_color_r800_photo);
-
-static const escp2_inkname_t six_color_r800_photo_inkset =
-{
-  "CMYKRB", N_("Six Color Photo"), INKSET_CMYKRB,
-  &six_color_r800_photo_channel_set
-};
-
-static const ink_channel_t *const six_color_picturemate_channels[] =
-{
-  &photo_black_channel, &picturemate_cyan_channel,
-  &picturemate_magenta_channel, &picturemate_yellow_channel,
-  &picturemate_red_channel, &picturemate_blue_channel
-};
-
-DECLARE_CHANNEL_SET(six_color_picturemate);
-
-static const escp2_inkname_t six_color_picturemate_inkset =
-{
-  "CMYKRB", N_("Six Color Photo"), INKSET_CMYKRB,
-  &six_color_picturemate_channel_set
-};
-
-static const ink_channel_t *const six_color_r800_photo_gloss_channels[] =
-{
-  &f360_photo_black_channel, &f360_standard_cyan_channel,
-  &r800_magenta_channel, &r800_yellow_channel,
-  &r800_red_channel, &r800_blue_channel,
-  &standard_gloss_channel
-};
-
-DECLARE_CHANNEL_SET(six_color_r800_photo_gloss);
-DECLARE_AUX_CHANNEL_SET(six_color_r800_photo, standard_gloss);
-
-static const escp2_inkname_t six_color_r800_photo_gloss_inkset =
-{
-  "CMYKRBG", N_("Six Color Photo"), INKSET_CMYKRB,
-  &six_color_r800_photo_standard_gloss_channel_set
-};
-
-
-/*
- ****************************************************************
- *                                                              *
- * Extended (raw)                                               *
- *                                                              *
- ****************************************************************
- */
-
-static const ink_channel_t *const one_color_extended_channels[] =
-{
-  &standard_black_channel
-};
-DECLARE_CHANNEL_SET(one_color_extended);
-
-static const escp2_inkname_t one_color_extended_inkset =
-{
-  "PhysicalBlack", N_("One Color Raw"), INKSET_EXTENDED,
-  &one_color_extended_channel_set
-};
-
-static const ink_channel_t *const c120_one_color_extended_channels[] =
+static void
+load_channel(stp_mxml_node_t *node, stp_mxml_node_t *root, ink_channel_t *icl)
 {
-  &c120_black_channel
-};
-DECLARE_CHANNEL_SET(c120_one_color_extended);
-
-static const escp2_inkname_t c120_one_color_extended_inkset =
-{
-  "PhysicalBlack", N_("One Color Raw"), INKSET_EXTENDED,
-  &c120_one_color_extended_channel_set
-};
-
-static const escp2_inkname_t one_color_photo_extended_inkset =
-{
-  "PhysicalBlack", N_("One Color Raw"), INKSET_EXTENDED,
-  &standard_photo_black_channel_set
-};
-
-static const escp2_inkname_t one_color_r800_photo_gloss_extended_inkset =
-{
-  "PhysicalBlackGloss", N_("One Color Raw Enhanced Gloss"), INKSET_EXTENDED,
-  &standard_photo_gloss_black_channel_set
-};
-
-
-static const ink_channel_t *const two_color_extended_channels[] =
-{
-  &photo_black_channel, &extended_black_channel
-};
-DECLARE_CHANNEL_SET(two_color_extended);
-
-static const escp2_inkname_t two_color_extended_inkset =
-{
-  "PhysicalBlack2", N_("Two Color Raw"), INKSET_EXTENDED,
-  &two_color_extended_channel_set
-};
-
-static const ink_channel_t *const f360_two_color_extended_channels[] =
-{
-  &standard_black_channel, &extended_black_channel
-};
-DECLARE_CHANNEL_SET(f360_two_color_extended);
-
-static const escp2_inkname_t f360_two_color_extended_inkset =
-{
-  "PhysicalBlack2", N_("Two Color Raw"), INKSET_EXTENDED,
-  &f360_two_color_extended_channel_set
-};
-
-
-static const ink_channel_t *const standard_three_color_extended_channels[] =
-{
-  &standard_cyan_channel, &standard_magenta_channel, &standard_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(standard_three_color_extended);
-
-static const escp2_inkname_t three_color_extended_inkset =
-{
-  "PhysicalCMY", N_("Three Color Raw"), INKSET_EXTENDED,
-  &standard_three_color_extended_channel_set
-};
-
-static const ink_channel_t *const r800_cmy_extended_channels[] =
-{
-  &f360_standard_cyan_channel, &standard_magenta_channel,
-  &f360_standard_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(r800_cmy_extended);
-
-static const escp2_inkname_t three_color_r800_extended_inkset =
-{
-  "PhysicalCMY", N_("Three Color Raw"), INKSET_EXTENDED,
-  &r800_cmy_extended_channel_set
-};
-
-static const ink_channel_t *const r800_cmy_gloss_extended_channels[] =
-{
-  &f360_standard_cyan_channel, &standard_magenta_channel,
-  &f360_standard_yellow_channel, &standard_gloss_channel
-};
-
-DECLARE_CHANNEL_SET(r800_cmy_gloss_extended);
-
-static const escp2_inkname_t three_color_r800_gloss_extended_inkset =
-{
-  "PhysicalCMY", N_("Three Color Raw Gloss"), INKSET_EXTENDED,
-  &r800_cmy_gloss_extended_channel_set
-};
-
-static const ink_channel_t *const x80_three_color_extended_channels[] =
-{
-  &x80_cyan_channel, &x80_magenta_channel, &x80_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(x80_three_color_extended);
-
-static const escp2_inkname_t x80_three_color_extended_inkset =
-{
-  "PhysicalCMY", N_("Three Color Raw"), INKSET_EXTENDED,
-  &x80_three_color_extended_channel_set
-};
-
-static const ink_channel_t *const c80_three_color_extended_channels[] =
-{
-  &c80_cyan_channel, &c80_magenta_channel, &c80_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(c80_three_color_extended);
-
-static const escp2_inkname_t c80_three_color_extended_inkset =
-{
-  "PhysicalCMY", N_("Three Color Raw"), INKSET_EXTENDED,
-  &c80_three_color_extended_channel_set
-};
-
-static const ink_channel_t *const c120_three_color_extended_channels[] =
-{
-  &c120_cyan_channel, &c120_magenta_channel, &c120_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(c120_three_color_extended);
-
-static const escp2_inkname_t c120_three_color_extended_inkset =
-{
-  "PhysicalCMY", N_("Three Color Raw"), INKSET_EXTENDED,
-  &c120_three_color_extended_channel_set
-};
-
-static const ink_channel_t *const c64_three_color_extended_channels[] =
-{
-  &c64_cyan_channel, &c64_magenta_channel, &c64_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(c64_three_color_extended);
-
-static const escp2_inkname_t c64_three_color_extended_inkset =
-{
-  "PhysicalCMY", N_("Three Color Raw"), INKSET_EXTENDED,
-  &c64_three_color_extended_channel_set
-};
-
-static const ink_channel_t *const f360_three_color_extended_channels[] =
-{
-  &f360_standard_cyan_channel, &f360_standard_magenta_channel,
-  &standard_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(f360_three_color_extended);
-
-static const escp2_inkname_t f360_three_color_extended_inkset =
-{
-  "PhysicalCMY", N_("Three Color Raw"), INKSET_EXTENDED,
-  &f360_three_color_extended_channel_set
-};
-
-static const ink_channel_t *const cx3650_three_color_extended_channels[] =
-{
-  &cx3650_standard_cyan_channel, &f360_standard_magenta_channel,
-  &standard_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(cx3650_three_color_extended);
-
-static const escp2_inkname_t cx3650_three_color_extended_inkset =
-{
-  "PhysicalCMY", N_("Three Color Raw"), INKSET_EXTENDED,
-  &cx3650_three_color_extended_channel_set
-};
-
-static const ink_channel_t *const claria_three_color_extended_channels[] =
-{
-  &claria_cyan_channel, &claria_magenta_channel, &claria_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(claria_three_color_extended);
-
-static const escp2_inkname_t claria_three_color_extended_inkset =
-{
-  "PhysicalCMY", N_("Three Color Raw"), INKSET_EXTENDED,
-  &claria_three_color_extended_channel_set
-};
-
-
-static const escp2_inkname_t four_color_extended_inkset =
-{
-  "PhysicalCMYK", N_("Four Color Raw"), INKSET_EXTENDED,
-  &standard_cmyk_channel_set
-};
-
-static const escp2_inkname_t four_color_photo_extended_inkset =
-{
-  "PhysicalCMYK", N_("Four Color Raw"), INKSET_EXTENDED,
-  &photo_cmyk_channel_set
-};
-
-static const escp2_inkname_t x80_four_color_extended_inkset =
-{
-  "PhysicalCMYK", N_("Four Color Raw"), INKSET_EXTENDED,
-  &x80_cmyk_channel_set
-};
-
-static const escp2_inkname_t c80_four_color_extended_inkset =
-{
-  "PhysicalCMYK", N_("Four Color Raw"), INKSET_EXTENDED,
-  &c80_cmyk_channel_set
-};
-
-static const escp2_inkname_t c120_four_color_extended_inkset =
-{
-  "PhysicalCMYK", N_("Four Color Raw"), INKSET_EXTENDED,
-  &c120_cmyk_channel_set
-};
-
-static const escp2_inkname_t c64_four_color_extended_inkset =
-{
-  "PhysicalCMYK", N_("Four Color Raw"), INKSET_EXTENDED,
-  &c64_cmyk_channel_set
-};
-
-static const escp2_inkname_t f360_four_color_extended_inkset =
-{
-  "PhysicalCMYK", N_("Four Color Raw"), INKSET_EXTENDED,
-  &f360_cmyk_channel_set
-};
-
-static const escp2_inkname_t cx3650_four_color_extended_inkset =
-{
-  "PhysicalCMYK", N_("Four Color Raw"), INKSET_EXTENDED,
-  &cx3650_cmyk_channel_set
-};
-
-static const escp2_inkname_t claria_four_color_extended_inkset =
-{
-  "PhysicalCMYK", N_("Four Color Raw"), INKSET_EXTENDED,
-  &claria_cmyk_channel_set
-};
-
-static const escp2_inkname_t four_color_picturemate_extended_inkset =
-{
-  "PhysicalCMYK", N_("Four Color Raw"), INKSET_EXTENDED,
-  &four_color_picturemate_channel_set
-};
-
-static const escp2_inkname_t four_color_r800_extended_inkset =
-{
-  "PhysicalCMYKGloss", N_("Four Color Raw"), INKSET_EXTENDED,
-  &r800_cmyk_channel_set
-};
-
-static const escp2_inkname_t four_color_r800_photo_gloss_extended_inkset =
-{
-  "PhysicalCMYKGloss", N_("Four Color Raw Gloss"), INKSET_EXTENDED,
-  &photo_gloss_cmyk_channel_set
-};
-
-
-static const ink_channel_t *const five_color_extended_channels[] =
-{
-  &standard_cyan_channel, &extended_cyan_channel,
-  &standard_magenta_channel, &extended_magenta_channel,
-  &photo_yellow_channel
-};
-DECLARE_CHANNEL_SET(five_color_extended);
-
-static const escp2_inkname_t five_color_extended_inkset =
-{
-  "PhysicalCcMmY", N_("Five Color Raw"), INKSET_EXTENDED,
-  &five_color_extended_channel_set
-};
-
-static const ink_channel_t *const f360_five_color_extended_channels[] =
-{
-  &f360_standard_cyan_channel, &extended_cyan_channel,
-  &f360_standard_magenta_channel, &extended_magenta_channel,
-  &f360_photo_yellow_channel
-};
-DECLARE_CHANNEL_SET(f360_five_color_extended);
-
-static const escp2_inkname_t f360_five_color_extended_inkset =
-{
-  "PhysicalCcMmY", N_("Five Color Raw"), INKSET_EXTENDED,
-  &f360_five_color_extended_channel_set
-};
-
-static const ink_channel_t *const claria_five_color_extended_channels[] =
-{
-  &claria_cyan_channel, &extended_claria_cyan_channel,
-  &claria_magenta_channel, &extended_claria_magenta_channel,
-  &claria_yellow_channel
-};
-DECLARE_CHANNEL_SET(claria_five_color_extended);
-
-static const escp2_inkname_t claria_five_color_extended_inkset =
-{
-  "PhysicalCcMmYK", N_("Six Color Raw"), INKSET_EXTENDED,
-  &claria_five_color_extended_channel_set
-};
-
-
-static const ink_channel_t *const six_color_extended_channels[] =
-{
-  &photo_black_channel,
-  &standard_cyan_channel, &extended_cyan_channel,
-  &standard_magenta_channel, &extended_magenta_channel,
-  &photo_yellow_channel
-};
-DECLARE_CHANNEL_SET(six_color_extended);
-
-static const escp2_inkname_t six_color_extended_inkset =
-{
-  "PhysicalCcMmYK", N_("Six Color Raw"), INKSET_EXTENDED,
-  &six_color_extended_channel_set
-};
-
-static const escp2_inkname_t six_color_r800_extended_inkset =
-{
-  "PhysicalCMYKRB", N_("Six Color Raw"), INKSET_EXTENDED,
-  &six_color_r800_channel_set
-};
-
-static const escp2_inkname_t six_color_picturemate_extended_inkset =
-{
-  "PhysicalCMYKRB", N_("Six Color Raw"), INKSET_EXTENDED,
-  &six_color_picturemate_channel_set
-};
-
-static const ink_channel_t *const f360_six_color_extended_channels[] =
-{
-  &standard_black_channel,
-  &f360_standard_cyan_channel, &extended_cyan_channel,
-  &f360_standard_magenta_channel, &extended_magenta_channel,
-  &f360_photo_yellow_channel
-};
-DECLARE_CHANNEL_SET(f360_six_color_extended);
-
-static const escp2_inkname_t f360_six_color_extended_inkset =
-{
-  "PhysicalCcMmYK", N_("Six Color Raw"), INKSET_EXTENDED,
-  &f360_six_color_extended_channel_set
-};
-
-static const escp2_inkname_t six_color_r800_photo_gloss_extended_inkset =
-{
-  "PhysicalCMYKRB", N_("Six Color Enhanced Gloss Raw"), INKSET_EXTENDED,
-  &six_color_r800_photo_gloss_channel_set
-};
-
-static const ink_channel_t *const claria_six_color_extended_channels[] =
-{
-  &claria_black_channel,
-  &claria_cyan_channel, &extended_claria_cyan_channel,
-  &claria_magenta_channel, &extended_claria_magenta_channel,
-  &claria_yellow_channel
-};
-DECLARE_CHANNEL_SET(claria_six_color_extended);
-
-static const escp2_inkname_t claria_six_color_extended_inkset =
-{
-  "PhysicalCcMmYK", N_("Six Color Raw"), INKSET_EXTENDED,
-  &claria_six_color_extended_channel_set
-};
-
-
-static const ink_channel_t *const j_seven_color_extended_channels[] =
-{
-  &photo_black_channel,
-  &standard_cyan_channel, &extended_cyan_channel,
-  &standard_magenta_channel, &extended_magenta_channel,
-  &photo_yellow_channel, &j_extended_yellow_channel
-};
-DECLARE_CHANNEL_SET(j_seven_color_extended);
-
-static const escp2_inkname_t j_seven_color_extended_inkset =
-{
-  "PhysicalCcMmYyK", N_("Seven Color Raw"), INKSET_EXTENDED,
-  &j_seven_color_extended_channel_set
-};
-
-static const ink_channel_t *const seven_color_extended_channels[] =
-{
-  &photo_black_channel, &extended_black_channel,
-  &standard_cyan_channel, &extended_cyan_channel,
-  &standard_magenta_channel, &extended_magenta_channel,
-  &photo_yellow_channel
-};
-DECLARE_CHANNEL_SET(seven_color_extended);
-
-static const escp2_inkname_t seven_color_extended_inkset =
-{
-  "PhysicalCcMmYKk", N_("Seven Color Raw"), INKSET_EXTENDED,
-  &seven_color_extended_channel_set
-};
-
-static const ink_channel_t *const f360_seven_color_extended_channels[] =
-{
-  &standard_black_channel, &extended_black_channel,
-  &f360_standard_cyan_channel, &extended_cyan_channel,
-  &f360_standard_magenta_channel, &extended_magenta_channel,
-  &f360_photo_yellow_channel
-};
-DECLARE_CHANNEL_SET(f360_seven_color_extended);
-
-static const escp2_inkname_t f360_seven_color_extended_inkset =
-{
-  "PhysicalCcMmYKk", N_("Seven Color Raw"), INKSET_EXTENDED,
-  &f360_seven_color_extended_channel_set
-};
-
-
-static const ink_channel_t *const seven_color_r800_gloss_extended_channels[] =
-{
-  &standard_black_channel, &f360_photo_black_channel,
-  &r800_cyan_channel, &r800_magenta_channel,
-  &r800_yellow_channel, &r800_red_channel,
-  &r800_blue_channel, &standard_gloss_channel
-};
-
-DECLARE_CHANNEL_SET(seven_color_r800_gloss_extended);
-
-static const escp2_inkname_t seven_color_r800_gloss_extended_inkset =
-{
-  "PhysicalCMYKPRB", N_("Seven Color Enhanced Gloss Raw"), INKSET_EXTENDED,
-  &seven_color_r800_gloss_extended_channel_set
-};
-
-
-static const ink_channel_t *const eight_color_extended_channels[] =
-{
-  &f360_black_channel, &extended_black_channel,
-  &f360_extended_photo3_black_channel,
-  &standard_cyan_channel, &f360_extended_cyan_channel,
-  &f360_standard_magenta_channel, &extended_magenta_channel,
-  &standard_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(eight_color_extended);
-
-static const escp2_inkname_t eight_color_extended_inkset =
-{
-  "PhysicalCMYKkk", N_("Eight Color Raw"), INKSET_EXTENDED,
-  &eight_color_extended_channel_set
-};
-
-
-static const shade_set_t standard_shades =
-{
-  { 1, { 1.0 }},		/* K */
-  { 1, { 1.0 }},		/* C */
-  { 1, { 1.0 }},		/* M */
-  { 1, { 1.0 }},		/* Y */
-  { 1, { 1.0 }},		/* Extended 5 */
-  { 1, { 1.0 }},		/* Extended 6 */
-  { 1, { 1.0 }},		/* Extended 7 */
-  { 1, { 1.0 }},		/* Extended 8 */
-};
-
-static const shade_set_t photo_gen1_shades =	/* Stylus 750 and older */
-{
-  { 1, { 1.0 }},
-  { 2, { 1.0, 0.305 }},
-  { 2, { 1.0, 0.315 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-};
-
-static const shade_set_t photo_gen2_shades =	/* Stylus 870 and newer */
-{
-  { 1, { 1.0 }},
-  { 2, { 1.0, 0.29 }},
-  { 2, { 1.0, 0.29 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-};
-
-static const shade_set_t photo_gen3_shades =	/* Stylus R300 and newer */
-{
-  { 1, { 1.0 }},
-  { 2, { 1.0, 0.35 }},
-  { 2, { 1.0, 0.35 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-};
-
-static const shade_set_t esp960_shades =	/* Epson 950/960/PM-950C/PM-970C */
-{
-  { 1, { 1.0 }},
-  { 2, { 1.0, 0.316 }},
-  { 2, { 1.0, 0.34 }},
-  { 2, { 1.0, 0.5 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-};
-
-static const shade_set_t stp2000_shades =	/* Stylus Photo 2000 */
-{
-  { 1, { 1.0 }},
-  { 2, { 1.0, 0.227 }},		/* Just a guess */
-  { 2, { 1.0, 0.227 }},		/* Just a guess */
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-};
-
-static const shade_set_t ultrachrome_photo_shades =	/* Ultrachrome with photo black ink */
-{
-  { 2, { 1.0, 0.48 }},
-  { 2, { 1.0, 0.33 }},
-  { 2, { 1.0, 0.25 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-};
-
-static const shade_set_t ultrachrome_matte_shades =	/* Ultrachrome with matte black ink */
-{
-  { 2, { 1.0, 0.33 }},
-  { 2, { 1.0, 0.33 }},
-  { 2, { 1.0, 0.25 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-};
-
-static const shade_set_t ultra3_photo_shades =	/* R2400 with photo black ink */
-{
-  { 3, { 1.0, 0.48, 0.16 }},
-  { 2, { 1.0, 0.35 }},
-  { 2, { 1.0, 0.20 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-};
-
-static const shade_set_t ultra3_matte_shades =	/* R2400 with matte black ink */
-{
-  { 3, { 1.0, 0.278, 0.093 }},
-  { 2, { 1.0, 0.35 }},
-  { 2, { 1.0, 0.20 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-};
-
-static const shade_set_t quadtone_shades =	/* Some kind of quadtone ink */
-{
-  { 4, { 1.0, 0.75, 0.5, 0.25 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-};
-
-static const shade_set_t claria_shades =	/* Stylus R260 and newer */
-{
-  { 1, { 1.0 }},
-  { 2, { 1.0, 0.35 }},
-  { 2, { 1.0, 0.33 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-};
-
-#define DECLARE_INKLIST(tname, name, inks, text, papers, adjustments, shades) \
-static const inklist_t name##_inklist =					      \
-{									      \
-  tname,								      \
-  text,									      \
-  inks##_ink_types,							      \
-  #papers,								      \
-  #adjustments,								      \
-  &shades##_shades,							      \
-  sizeof(inks##_ink_types) / sizeof(escp2_inkname_t *),			      \
+  const char *name;
+  stp_mxml_node_t *child = node->child;
+  int count = 0;
+  while (child)
+    {
+      if (child->type == STP_MXML_ELEMENT &&
+	  !strcmp(child->value.element.name, "subchannel"))
+	count++;
+      child = child->next;
+    }
+  name = stp_mxmlElementGetAttr(node, "name");
+  if (name)
+    icl->name = stp_strdup(name);
+  icl->n_subchannels = count;
+  icl->subchannels = stp_zalloc(sizeof(physical_subchannel_t) * count);
+  count = 0;
+  child = node->child;
+  while (child)
+    {
+      if (child->type == STP_MXML_ELEMENT)
+	{
+	  if (!strcmp(child->value.element.name, "subchannel"))
+	    load_subchannel(child, root, &(icl->subchannels[count++]));
+	  else if (!strcmp(child->value.element.name, "HueCurve"))
+	    {
+	      stp_mxml_node_t *cchild = child->child;
+	      stp_curve_t *curve;
+	      const char *cref = stp_mxmlElementGetAttr(child, "ref");
+	      if (cref)
+		{
+		  cchild = stp_mxmlFindElement(root, root, "curve", "name",
+					       cref, STP_MXML_DESCEND);
+		  if (!cchild)
+		    {
+		      stp_erprintf("Cannot find curve named '%s'!\n", cref);
+		      stp_abort();
+		    }
+		}
+	      else
+		{
+		  while (cchild && cchild->type != STP_MXML_ELEMENT)
+		    cchild = cchild->next;
+		  if (!cchild)
+		    {
+		      stp_erprintf("Cannot find curve!\n");
+		      stp_abort();
+		    }
+		}
+	      curve = stp_curve_create_from_xmltree(cchild);
+	      icl->hue_curve = curve;
+	    }
+	  else if (!strcmp(child->value.element.name, "HueCurveParam"))
+	    {
+	      name = stp_mxmlElementGetAttr(child, "name");
+	      if (name)
+		icl->hue_curve_name = stp_strdup(name);
+	    }
+	}
+      child = child->next;
+    }
 }
 
-
-static const escp2_inkname_t *const cmy_ink_types[] =
-{
-  &three_color_composite_inkset
-};
-
-DECLARE_INKLIST("None", cmy, cmy, N_("EPSON Standard Inks"),
-		standard, standard, standard);
-
-
-static const escp2_inkname_t *const standard_ink_types[] =
-{
-  &four_color_standard_inkset,
-  &three_color_composite_inkset,
-  &one_color_extended_inkset,
-  &three_color_extended_inkset,
-  &four_color_extended_inkset,
-};
-
-DECLARE_INKLIST("None", standard, standard, N_("EPSON Standard Inks"),
-		standard, standard, standard);
-DECLARE_INKLIST("None", photo_gen3_4, standard, N_("EPSON Standard Inks"),
-		standard, photo3, standard);
-
-static const escp2_inkname_t *const quadtone_ink_types[] =
+static void
+load_inkname(stp_mxml_node_t *node, stp_mxml_node_t *root, inkname_t *inl)
 {
-  &generic_quadtone_inkset,
-};
-
-DECLARE_INKLIST("quadtone", quadtone, quadtone, N_("Quadtone"),
-		standard, standard, quadtone);
-
-static const escp2_inkname_t *const c80_ink_types[] =
-{
-  &c80_four_color_standard_inkset,
-  &c80_three_color_composite_inkset,
-  &one_color_extended_inkset,
-  &c80_three_color_extended_inkset,
-  &c80_four_color_extended_inkset,
-};
-
-DECLARE_INKLIST("None", c80, c80, N_("EPSON Standard Inks"),
-		durabrite, durabrite, standard);
-
-DECLARE_INKLIST("None", c82, c80, N_("EPSON Standard Inks"),
-		durabrite2, durabrite2, standard);
-
-static const escp2_inkname_t *const c80_quadtone_ink_types[] =
-{
-  &c80_generic_quadtone_inkset,
-};
-
-DECLARE_INKLIST("Quadtone", c80_quadtone, c80_quadtone, N_("Quadtone"),
-		standard, standard, quadtone);
-
-static const escp2_inkname_t *const c120_ink_types[] =
-{
-  &c120_four_color_standard_inkset,
-  &c120_three_color_composite_inkset,
-  &c120_one_color_extended_inkset,
-  &c120_three_color_extended_inkset,
-  &c120_four_color_extended_inkset,
-};
-
-DECLARE_INKLIST("None", c120, c120, N_("EPSON Standard Inks"),
-		durabrite2, durabrite3, standard);
-
-static const escp2_inkname_t *const c120_quadtone_ink_types[] =
-{
-  &c120_generic_quadtone_inkset,
-};
-
-DECLARE_INKLIST("Quadtone", c120_quadtone, c120_quadtone, N_("Quadtone"),
-		standard, standard, quadtone);
-
-static const escp2_inkname_t *const c64_ink_types[] =
-{
-  &c64_four_color_standard_inkset,
-  &c64_three_color_composite_inkset,
-  &one_color_extended_inkset,
-  &c64_three_color_extended_inkset,
-  &c64_four_color_extended_inkset,
-};
-
-DECLARE_INKLIST("None", c64, c64, N_("EPSON Standard Inks"),
-		durabrite2, durabrite2, standard);
-
-static const escp2_inkname_t *const c64_quadtone_ink_types[] =
-{
-  &c64_generic_quadtone_inkset,
-};
-
-DECLARE_INKLIST("Quadtone", c64_quadtone, c64_quadtone, N_("Quadtone"),
-		standard, standard, quadtone);
-
-static const escp2_inkname_t *const f360_ink_types[] =
-{
-  &f360_four_color_standard_inkset,
-  &f360_three_color_composite_inkset,
-  &one_color_extended_inkset,
-  &f360_three_color_extended_inkset,
-  &f360_four_color_extended_inkset,
-};
-
-DECLARE_INKLIST("None", f360, f360, N_("EPSON Standard Inks"),
-		durabrite2, durabrite2, standard);
-
-static const escp2_inkname_t *const f360_quadtone_ink_types[] =
-{
-  &f360_generic_quadtone_inkset,
-};
-
-DECLARE_INKLIST("Quadtone", f360_quadtone, f360_quadtone, N_("Quadtone"),
-		standard, standard, quadtone);
-
-static const escp2_inkname_t *const cx3650_ink_types[] =
-{
-  &cx3650_four_color_standard_inkset,
-  &cx3650_three_color_composite_inkset,
-  &one_color_extended_inkset,
-  &cx3650_three_color_extended_inkset,
-  &cx3650_four_color_extended_inkset,
-};
-
-DECLARE_INKLIST("None", cx3650, cx3650, N_("EPSON Standard Inks"),
-		durabrite2, durabrite2, standard);
-
-static const escp2_inkname_t *const cx3650_quadtone_ink_types[] =
-{
-  &cx3650_generic_quadtone_inkset,
-};
-
-DECLARE_INKLIST("Quadtone", cx3650_quadtone, cx3650_quadtone, N_("Quadtone"),
-		standard, standard, quadtone);
-
-static const escp2_inkname_t *const x80_ink_types[] =
-{
-  &x80_four_color_standard_inkset,
-  &x80_three_color_composite_inkset,
-  &one_color_extended_inkset,
-  &x80_three_color_extended_inkset,
-  &x80_four_color_extended_inkset,
-};
-
-DECLARE_INKLIST("None", x80, x80, N_("EPSON Standard Inks"),
-		standard, standard, standard);
-
-static const escp2_inkname_t *const photo_ink_types[] =
-{
-  &six_color_photo_inkset,
-  &five_color_photo_composite_inkset,
-  &four_color_standard_inkset,
-  &three_color_composite_inkset,
-  &one_color_extended_inkset,
-  &three_color_extended_inkset,
-  &four_color_extended_inkset,
-  &five_color_extended_inkset,
-  &six_color_extended_inkset,
-};
-
-DECLARE_INKLIST("None", gen1, photo, N_("EPSON Standard Inks"),
-		standard, photo, photo_gen1);
-DECLARE_INKLIST("None", photo_gen2, photo, N_("EPSON Standard Inks"),
-		standard, photo2, photo_gen2);
-DECLARE_INKLIST("None", photo_gen3, photo, N_("EPSON Standard Inks"),
-		standard, photo3, photo_gen3);
-DECLARE_INKLIST("None", pigment, photo, N_("EPSON Standard Inks"),
-		ultrachrome, ultrachrome_photo, stp2000);
-
-static const escp2_inkname_t *const f360_photo_ink_types[] =
-{
-  &f360_six_color_photo_inkset,
-  &f360_five_color_photo_composite_inkset,
-  &f360_four_color_standard_inkset,
-  &three_color_composite_inkset,
-  &one_color_extended_inkset,
-  &three_color_extended_inkset,
-  &f360_four_color_extended_inkset,
-  &f360_five_color_extended_inkset,
-  &f360_six_color_extended_inkset,
-};
-
-DECLARE_INKLIST("None", f360_photo, f360_photo, N_("EPSON Standard Inks"),
-		standard, sp960, esp960);
-
-static const escp2_inkname_t *const claria_ink_types[] =
-{
-  &claria_six_color_photo_inkset,
-  &claria_five_color_photo_composite_inkset,
-  &claria_four_color_standard_inkset,
-  &claria_three_color_composite_inkset,
-  &one_color_extended_inkset,
-  &claria_three_color_extended_inkset,
-  &claria_four_color_extended_inkset,
-  &claria_five_color_extended_inkset,
-  &claria_six_color_extended_inkset,
-};
-
-DECLARE_INKLIST("None", claria, claria, N_("EPSON Standard Inks"),
-		standard, claria, claria);
-
-static const escp2_inkname_t *const f360_photo7_japan_ink_types[] =
-{
-  &f360_j_seven_color_enhanced_inkset,
-  &f360_j_six_color_enhanced_composite_inkset,
-  &f360_six_color_photo_inkset,
-  &f360_five_color_photo_composite_inkset,
-  &four_color_standard_inkset,
-  &three_color_composite_inkset,
-  &one_color_extended_inkset,
-  &three_color_extended_inkset,
-  &four_color_extended_inkset,
-  &f360_five_color_extended_inkset,
-  &f360_six_color_extended_inkset,
-  &f360_seven_color_extended_inkset,
-};
-
-DECLARE_INKLIST("None", f360_photo7_japan, f360_photo7_japan,
-		N_("EPSON Standard Inks"), standard, sp960, esp960);
-
-static const escp2_inkname_t *const f360_photo7_ink_types[] =
-{
-  &f360_seven_color_enhanced_inkset,
-  &f360_six_color_photo_inkset,
-  &f360_five_color_photo_composite_inkset,
-  &four_color_standard_inkset,
-  &three_color_composite_inkset,
-  &f360_two_color_grayscale_inkset,
-  &one_color_extended_inkset,
-  &f360_two_color_extended_inkset,
-  &three_color_extended_inkset,
-  &four_color_extended_inkset,
-  &f360_five_color_extended_inkset,
-  &f360_six_color_extended_inkset,
-  &f360_seven_color_extended_inkset,
-};
-
-DECLARE_INKLIST("ultraphoto", f360_ultra_photo7, f360_photo7,
-		N_("UltraChrome Photo Black"), ultrachrome,
-		ultrachrome_photo, ultrachrome_photo);
-
-DECLARE_INKLIST("ultramatte", f360_ultra_matte7, f360_photo7,
-		N_("UltraChrome Matte Black"), ultrachrome,
-		ultrachrome_matte, ultrachrome_matte);
-
-static const escp2_inkname_t *const photo7_ink_types[] =
-{
-  &seven_color_enhanced_inkset,
-  &six_color_photo_inkset,
-  &five_color_photo_composite_inkset,
-  &four_color_standard_inkset,
-  &three_color_composite_inkset,
-  &two_color_grayscale_inkset,
-  &one_color_extended_inkset,
-  &two_color_extended_inkset,
-  &three_color_extended_inkset,
-  &four_color_extended_inkset,
-  &five_color_extended_inkset,
-  &six_color_extended_inkset,
-  &seven_color_extended_inkset,
-};
-
-DECLARE_INKLIST("ultraphoto", ultra_photo7, photo7,
-		N_("UltraChrome Photo Black"), ultrachrome,
-		ultrachrome_photo, ultrachrome_photo);
-
-DECLARE_INKLIST("ultramatte", ultra_matte7, photo7,
-		N_("UltraChrome Matte Black"), ultrachrome,
-		ultrachrome_matte, ultrachrome_matte);
-
-static const escp2_inkname_t *const f360_photo8_ink_types[] =
-{
-  &eight_color_enhanced_inkset,
-  &seven_color_photo3_inkset,
-  &six_color_photo3_inkset,
-  &five_color_photo3_inkset,
-  &four_color_r2400_standard_inkset,
-  &three_color_r2400_composite_inkset,
-  &eight_color_extended_inkset,
-};
-
-DECLARE_INKLIST("ultra3photo", f360_ultra_photo8, f360_photo8,
-		N_("Photo Black"), ultrachrome_k3,
-		ultrachrome_k3_photo, ultra3_photo);
-
-DECLARE_INKLIST("ultra3matte", f360_ultra_matte8, f360_photo8,
-		N_("Matte Black"), ultrachrome_k3,
-		ultrachrome_k3_matte, ultra3_matte);
-
-static const escp2_inkname_t *const cmykrb_matte_ink_types[] =
-{
-  &six_color_r800_inkset,
-  &five_color_r800_inkset,
-  &four_color_r800_matte_inkset,
-  &three_color_r800_composite_inkset,
-  &one_color_extended_inkset,
-  &three_color_r800_extended_inkset,
-  &four_color_r800_extended_inkset,
-  &six_color_r800_extended_inkset,
-};
-
-DECLARE_INKLIST("cmykrbmatte", cmykrb_matte, cmykrb_matte,
-		N_("Matte Black"), r800, r800_matte, standard);
-
-static const escp2_inkname_t *const cmykrb_photo_ink_types[] =
-{
-  &six_color_r800_photo_gloss_inkset,
-  &five_color_r800_photo_gloss_inkset,
-  &four_color_r800_photo_gloss_inkset,
-  &three_color_r800_gloss_inkset,
-  &one_color_extended_inkset,
-  &one_color_r800_photo_gloss_extended_inkset,
-  &three_color_r800_extended_inkset,
-  &three_color_r800_gloss_extended_inkset,
-  &four_color_r800_photo_gloss_extended_inkset,
-  &six_color_r800_photo_gloss_extended_inkset,
-  &seven_color_r800_gloss_extended_inkset
-};
-
-DECLARE_INKLIST("cmykrbphoto", cmykrb_photo, cmykrb_photo,
-		N_("Photo Black"), r800, r800_photo, standard);
-
-static const escp2_inkname_t *const picturemate_6_photo_ink_types[] =
-{
-  &six_color_picturemate_inkset,
-  &four_color_picturemate_inkset,
-  &six_color_picturemate_extended_inkset,
-  &four_color_picturemate_extended_inkset,
-};
-
-DECLARE_INKLIST("picturemate_6", picturemate_6, picturemate_6_photo,
-		N_("Standard"), picturemate, picturemate_6, standard);
-
-static const escp2_inkname_t *const picturemate_4_photo_ink_types[] =
-{
-  &four_color_picturemate_inkset,
-  &four_color_picturemate_extended_inkset,
-};
-
-DECLARE_INKLIST("picturemate_4", picturemate_4, picturemate_4_photo,
-		N_("Standard"), picturemate, picturemate_4, standard);
-
-
-#define DECLARE_INKGROUP(name)			\
-static const inkgroup_t name##_inkgroup =	\
-{						\
-  #name,					\
-  name##_group,					\
-  sizeof(name##_group) / sizeof(inklist_t *),	\
+  const char *name;
+  stp_mxml_node_t *child = node->child;
+  int channel_count = 0;
+  int aux_channel_count = 0;
+
+  while (child)
+    {
+      if (child->type == STP_MXML_ELEMENT)
+	{
+	  if (!strcmp(child->value.element.name, "Channels"))
+	    {
+	      stp_mxml_node_t *cchild = child->child;
+	      while (cchild)
+		{
+		  if (cchild->type == STP_MXML_ELEMENT &&
+		      !strcmp(cchild->value.element.name, "channel"))
+		    {
+		      name = stp_mxmlElementGetAttr(cchild, "index");
+		      if (name)
+			{
+			  unsigned idx = stp_xmlstrtoul(name);
+			  if (idx + 1 > channel_count)
+			    channel_count = idx + 1;
+			}
+		    }
+		  cchild = cchild->next;
+		}
+	    }
+	  else if (!strcmp(child->value.element.name, "AuxChannels"))
+	    {
+	      stp_mxml_node_t *cchild = child->child;
+	      while (cchild)
+		{
+		  if (cchild->type == STP_MXML_ELEMENT &&
+		      !strcmp(cchild->value.element.name, "channel"))
+		    {
+		      name = stp_mxmlElementGetAttr(cchild, "index");
+		      if (name)
+			{
+			  unsigned idx = stp_xmlstrtoul(name);
+			  if (idx + 1 > aux_channel_count)
+			    aux_channel_count = idx + 1;
+			}
+		    }
+		  cchild = cchild->next;
+		}
+	    }
+	}
+      child = child->next;
+    }
+  inl->channel_count = channel_count;
+  if (channel_count > 0)
+    inl->channels = stp_zalloc(sizeof(ink_channel_t) * channel_count);
+  inl->aux_channel_count = aux_channel_count;
+  if (aux_channel_count > 0)
+    inl->aux_channels = stp_zalloc(sizeof(ink_channel_t) * aux_channel_count);
+  name = stp_mxmlElementGetAttr(node, "name");
+  if (name)
+    inl->name = stp_strdup(name);
+  name = stp_mxmlElementGetAttr(node, "text");
+  if (name)
+    inl->text = stp_strdup(name);
+  name = stp_mxmlElementGetAttr(node, "InkID");
+  if (name)
+    {
+      if (!strcmp(name, "CMYK"))
+	inl->inkset = INKSET_CMYK;
+      else if (!strcmp(name, "CcMmYK"))
+	inl->inkset = INKSET_CcMmYK;
+      else if (!strcmp(name, "CcMmYyK"))
+	inl->inkset = INKSET_CcMmYyK;
+      else if (!strcmp(name, "CcMmYKk"))
+	inl->inkset = INKSET_CcMmYKk;
+      else if (!strcmp(name, "Quadtone"))
+	inl->inkset = INKSET_QUADTONE;
+      else if (!strcmp(name, "OTHER"))
+	inl->inkset = INKSET_OTHER;
+      else if (!strcmp(name, "Extended"))
+	inl->inkset = INKSET_EXTENDED;
+    }
+
+  channel_count = 0;
+  aux_channel_count = 0;
+  child = node->child;
+  while (child)
+    {
+      if (child->type == STP_MXML_ELEMENT)
+	{
+	  if (!strcmp(child->value.element.name, "Channels"))
+	    {
+	      stp_mxml_node_t *cchild = child->child;
+	      while (cchild)
+		{
+		  if (cchild->type == STP_MXML_ELEMENT &&
+		      !strcmp(cchild->value.element.name, "channel"))
+		    {
+		      name = stp_mxmlElementGetAttr(cchild, "index");
+		      if (name)
+			{
+			  unsigned idx = stp_xmlstrtoul(name);
+			  load_channel(cchild, root, &(inl->channels[idx]));
+			}
+		    }
+		  cchild = cchild->next;
+		}
+	    }
+	  else if (!strcmp(child->value.element.name, "AuxChannels"))
+	    {
+	      stp_mxml_node_t *cchild = child->child;
+	      while (cchild)
+		{
+		  if (cchild->type == STP_MXML_ELEMENT &&
+		      !strcmp(cchild->value.element.name, "channel"))
+		    {
+		      name = stp_mxmlElementGetAttr(cchild, "index");
+		      if (name)
+			{
+			  unsigned idx = stp_xmlstrtoul(name);
+			  load_channel(cchild, root, &(inl->aux_channels[idx]));
+			}
+		    }
+		  cchild = cchild->next;
+		}
+	    }
+	}
+      child = child->next;
+    }
 }
 
-static const inklist_t *const cmy_group[] =
-{
-  &cmy_inklist
-};
-
-DECLARE_INKGROUP(cmy);
-
-static const inklist_t *const standard_group[] =
-{
-  &standard_inklist,
-  &quadtone_inklist
-};
-
-DECLARE_INKGROUP(standard);
-
-static const inklist_t *const c80_group[] =
-{
-  &c80_inklist,
-  &c80_quadtone_inklist
-};
-
-DECLARE_INKGROUP(c80);
-
-static const inklist_t *const c120_group[] =
-{
-  &c120_inklist,
-  &c120_quadtone_inklist
-};
-
-DECLARE_INKGROUP(c120);
-
-static const inklist_t *const c82_group[] =
-{
-  &c82_inklist,
-  &c80_quadtone_inklist
-};
-
-DECLARE_INKGROUP(c82);
-
-static const inklist_t *const c64_group[] =
-{
-  &c64_inklist,
-  &c64_quadtone_inklist
-};
-
-DECLARE_INKGROUP(c64);
-
-static const inklist_t *const f360_group[] =
-{
-  &f360_inklist,
-  &f360_quadtone_inklist
-};
-
-DECLARE_INKGROUP(f360);
-
-static const inklist_t *const cx3650_group[] =
-{
-  &cx3650_inklist,
-  &cx3650_quadtone_inklist
-};
-
-DECLARE_INKGROUP(cx3650);
-
-static const inklist_t *const x80_group[] =
-{
-  &x80_inklist
-};
-
-DECLARE_INKGROUP(x80);
-
-static const inklist_t *const photo_gen1_group[] =
-{
-  &gen1_inklist,
-  &quadtone_inklist
-};
-
-DECLARE_INKGROUP(photo_gen1);
-
-static const inklist_t *const photo_gen2_group[] =
-{
-  &photo_gen2_inklist,
-  &quadtone_inklist
-};
-
-DECLARE_INKGROUP(photo_gen2);
-
-static const inklist_t *const photo_gen3_group[] =
-{
-  &photo_gen3_inklist,
-  &quadtone_inklist
-};
-
-DECLARE_INKGROUP(photo_gen3);
-
-static const inklist_t *const photo_gen3_4_group[] =
-{
-  &photo_gen3_4_inklist,
-  &quadtone_inklist
-};
-
-DECLARE_INKGROUP(photo_gen3_4);
-
-static const inklist_t *const photo_pigment_group[] =
-{
-  &pigment_inklist
-};
-
-DECLARE_INKGROUP(photo_pigment);
-
-static const inklist_t *const f360_photo_group[] =
-{
-  &f360_photo_inklist
-};
-
-DECLARE_INKGROUP(f360_photo);
-
-static const inklist_t *const f360_photo7_japan_group[] =
-{
-  &f360_photo7_japan_inklist
-};
-
-DECLARE_INKGROUP(f360_photo7_japan);
-
-static const inklist_t *const f360_ultrachrome_group[] =
-{
-  &f360_ultra_photo7_inklist,
-  &f360_ultra_matte7_inklist
-};
-
-DECLARE_INKGROUP(f360_ultrachrome);
-
-static const inklist_t *const ultrachrome_group[] =
-{
-  &ultra_photo7_inklist,
-  &ultra_matte7_inklist
-};
-
-DECLARE_INKGROUP(ultrachrome);
-
-static const inklist_t *const f360_ultrachrome_k3_group[] =
-{
-  &f360_ultra_photo8_inklist,
-  &f360_ultra_matte8_inklist
-};
-
-DECLARE_INKGROUP(f360_ultrachrome_k3);
-
-static const inklist_t *const cmykrb_group[] =
-{
-  &cmykrb_photo_inklist,
-  &cmykrb_matte_inklist
-};
-
-DECLARE_INKGROUP(cmykrb);
-
-static const inklist_t *const picturemate_4_group[] =
-{
-  &picturemate_4_inklist,
-};
-
-DECLARE_INKGROUP(picturemate_4);
-
-static const inklist_t *const picturemate_6_group[] =
-{
-  &picturemate_6_inklist,
-};
-
-DECLARE_INKGROUP(picturemate_6);
-
-static const inklist_t *const claria_group[] =
-{
-  &claria_inklist,
-};
-
-DECLARE_INKGROUP(claria);
+static void
+load_shades(stp_mxml_node_t *node, stp_mxml_node_t *root, inklist_t *ikl)
+{
+  stp_mxml_node_t *child = node->child;
+  int count = 0;
+
+  while (child)
+    {
+      if (child->type == STP_MXML_ELEMENT &&
+	  !strcmp(child->value.element.name, "shade"))
+	count++;
+      child = child->next;
+    }
+  ikl->n_shades = count;
+  ikl->shades = stp_zalloc(sizeof(shade_t) * count);
+  count = 0;
+  child = node->child;
+  while (child)
+    {
+      if (child->type == STP_MXML_ELEMENT &&
+	  !strcmp(child->value.element.name, "shade"))
+	{
+	  if (stp_mxmlElementGetAttr(child, "count"))
+	    {
+	      unsigned nshades =
+		stp_xmlstrtoul(stp_mxmlElementGetAttr(child, "count"));
+	      ikl->shades[count].n_shades = nshades;
+	      if (nshades > 0)
+		{
+		  char *endptr;
+		  stp_mxml_node_t *cchild = child->child;
+		  ikl->shades[count].shades = stp_zalloc(sizeof(double) * nshades);
+		  nshades = 0;
+		  while (cchild && nshades < ikl->shades[count].n_shades)
+		    {
+		      if (cchild->type == STP_MXML_TEXT)
+			{
+			  double val =
+			    strtod(cchild->value.text.string, &endptr);
+			  if (endptr)
+			    ikl->shades[count].shades[nshades++] = val;
+			}
+		      cchild = cchild->next;
+		    }
+		}
+	    }
+	  count++;
+	}
+      child = child->next;
+    }
+}
 
-typedef struct
+static void
+load_inklist(stp_mxml_node_t *node, stp_mxml_node_t *root, inklist_t *ikl)
 {
   const char *name;
-  const inkgroup_t *inkgroup;
-} ink_t;
-
-static const ink_t the_inks[] =
-{
-  { "cmy", &cmy_inkgroup },
-  { "standard", &standard_inkgroup },
-  { "c120", &c120_inkgroup },
-  { "c80", &c80_inkgroup },
-  { "c82", &c82_inkgroup },
-  { "c64", &c64_inkgroup },
-  { "f360", &f360_inkgroup },
-  { "cx3650", &cx3650_inkgroup },
-  { "x80", &x80_inkgroup },
-  { "photo_gen1", &photo_gen1_inkgroup },
-  { "photo_gen2", &photo_gen2_inkgroup },
-  { "photo_gen3", &photo_gen3_inkgroup },
-  { "photo_gen3_4", &photo_gen3_4_inkgroup },
-  { "photo_pigment", &photo_pigment_inkgroup },
-  { "ultrachrome", &ultrachrome_inkgroup },
-  { "f360_photo", &f360_photo_inkgroup },
-  { "f360_photo7_japan", &f360_photo7_japan_inkgroup },
-  { "f360_ultrachrome", &f360_ultrachrome_inkgroup },
-  { "f360_ultrachrome_k3", &f360_ultrachrome_k3_inkgroup },
-  { "cmykrb", &cmykrb_inkgroup },
-  { "picturemate_6", &picturemate_6_inkgroup },
-  { "picturemate_4", &picturemate_4_inkgroup },
-  { "claria", &claria_inkgroup },
-};
-
-const inkgroup_t *
-stpi_escp2_get_inkgroup_named(const char *n)
-{
-  int i;
-  if (n)
-    for (i = 0; i < sizeof(the_inks) / sizeof(ink_t); i++)
-      {
-	if (strcmp(n, the_inks[i].name) == 0)
-	  return the_inks[i].inkgroup;
-      }
-  return NULL;
+  stp_mxml_node_t *child = node->child;
+  int count = 0;
+
+  while (child)
+    {
+      if (child->type == STP_MXML_ELEMENT &&
+	  !strcmp(child->value.element.name, "InkName"))
+	count++;
+      child = child->next;
+    }
+  name = stp_mxmlElementGetAttr(node, "name");
+  if (name)
+    ikl->name = stp_strdup(name);
+  name = stp_mxmlElementGetAttr(node, "text");
+  if (name)
+    ikl->text = stp_strdup(name);
+  ikl->n_inks = count;
+  ikl->inknames = stp_zalloc(sizeof(inkname_t) * count);
+  count = 0;
+  child = node->child;
+  while (child)
+    {
+      if (child->type == STP_MXML_ELEMENT)
+	{
+	  if (!strcmp(child->value.element.name, "InkName"))
+	    load_inkname(child, root, &(ikl->inknames[count++]));
+	  else if (!strcmp(child->value.element.name, "Shades"))
+	    load_shades(child, root, ikl);
+	}
+      child = child->next;
+    }
 }
 
-const escp2_inkname_t *
-stpi_escp2_get_default_black_inkset(void)
-{
-  return &stpi_escp2_default_black_inkset;
+static inkgroup_t *
+load_inkgroup(const char *name)
+{
+  stp_list_t *dirlist = stpi_data_path();
+  stp_list_item_t *item;
+  inkgroup_t *igl = NULL;
+  item = stp_list_get_start(dirlist);
+  while (item)
+    {
+      const char *dn = (const char *) stp_list_item_get_data(item);
+      char *ffn = stpi_path_merge(dn, name);
+      stp_mxml_node_t *inkgroup =
+	stp_mxmlLoadFromFile(NULL, ffn, STP_MXML_NO_CALLBACK);
+      stp_free(ffn);
+      if (inkgroup)
+	{
+	  int count = 0;
+	  stp_mxml_node_t *node = stp_mxmlFindElement(inkgroup, inkgroup,
+						      "escp2:InkGroup", NULL,
+						      NULL, STP_MXML_DESCEND);
+	  if (node)
+	    {
+	      stp_mxml_node_t *child = node->child;
+	      igl = stp_zalloc(sizeof(inkgroup_t));
+	      while (child)
+		{
+		  if (child->type == STP_MXML_ELEMENT &&
+		      !strcmp(child->value.element.name, "InkList"))
+		    count++;
+		  child = child->next;
+		}
+	      igl->n_inklists = count;
+	      if (stp_mxmlElementGetAttr(node, "name"))
+		igl->name = stp_strdup(stp_mxmlElementGetAttr(node, "name"));
+	      else
+		igl->name = stp_strdup(name);
+	      igl->inklists = stp_zalloc(sizeof(inklist_t) * count);
+	      child = node->child;
+	      count = 0;
+	      while (child)
+		{
+		  if (child->type == STP_MXML_ELEMENT &&
+		      !strcmp(child->value.element.name, "InkList"))
+		    load_inklist(child, node, &(igl->inklists[count++]));
+		  child = child->next;
+		}
+	    }
+	  stp_mxmlDelete(inkgroup);
+	  break;
+	}
+      item = stp_list_item_next(item);
+    }
+  stp_list_destroy(dirlist);
+  return igl;
 }
 
-
-#define DECLARE_CHANNEL_LIST(name)			\
-static const channel_name_t name##_channel_name_list =	\
-{							\
-  #name,						\
-  sizeof(name##_channel_names) / sizeof(const char *),	\
-  name##_channel_names					\
+int
+stp_escp2_load_inkgroup(const stp_vars_t *v, const char *name)
+{
+  stpi_escp2_printer_t *printdef = stp_escp2_get_printer(v);
+  inkgroup_t *igl = load_inkgroup(name);
+  if (igl)
+    printdef->inkgroup = igl;
+  else
+    {
+      stp_erprintf("Unable to load ink definitions from %s!\n", name);
+      stp_abort();
+    }
+  return (igl != NULL);
 }
 
-static const char *standard_channel_names[] =
-{
-  N_("Black"),
-  N_("Cyan"),
-  N_("Magenta"),
-  N_("Yellow")
-};
-
-DECLARE_CHANNEL_LIST(standard);
-
-static const char *c120_channel_names[] =
-{
-  N_("Black"),
-  N_("Black"),
-  N_("Magenta"),
-  N_("Cyan"),
-  N_("Yellow")
-};
-
-DECLARE_CHANNEL_LIST(c120);
-
-static const char *cx3800_channel_names[] =
-{
-  N_("Cyan"),
-  N_("Yellow"),
-  N_("Magenta"),
-  N_("Black")
-};
-
-DECLARE_CHANNEL_LIST(cx3800);
-
-static const char *mfp2005_channel_names[] =
-{
-  N_("Cyan"),
-  N_("Magenta"),
-  N_("Yellow"),
-  N_("Black")
-};
-
-DECLARE_CHANNEL_LIST(mfp2005);
-
-static const char *photo_channel_names[] =
-{
-  N_("Black"),
-  N_("Cyan"),
-  N_("Magenta"),
-  N_("Yellow"),
-  N_("Light Cyan"),
-  N_("Light Magenta"),
-};
-
-DECLARE_CHANNEL_LIST(photo);
-
-static const char *rx700_channel_names[] =
-{
-  N_("Black"),
-  N_("Cyan"),
-  N_("Light Cyan"),
-  N_("Magenta"),
-  N_("Light Magenta"),
-  N_("Yellow"),
-};
-
-DECLARE_CHANNEL_LIST(rx700);
-
-static const char *sp1400_channel_names[] =
-{
-  N_("Yellow"),
-  N_("Black"),
-  N_("Light Cyan"),
-  N_("Light Magenta"),
-  N_("Magenta"),
-  N_("Cyan"),
-};
-
-DECLARE_CHANNEL_LIST(sp1400);
-
-static const char *sp2200_channel_names[] =
-{
-  N_("Black"),
-  N_("Cyan"),
-  N_("Magenta"),
-  N_("Yellow"),
-  N_("Light Cyan"),
-  N_("Light Magenta"),
-  N_("Light Black"),
-};
-
-DECLARE_CHANNEL_LIST(sp2200);
-
-static const char *pm_950c_channel_names[] =
-{
-  N_("Black"),
-  N_("Cyan"),
-  N_("Magenta"),
-  N_("Yellow"),
-  N_("Light Cyan"),
-  N_("Light Magenta"),
-  N_("Dark Yellow"),
-};
-
-DECLARE_CHANNEL_LIST(pm_950c);
-
-static const char *sp960_channel_names[] =
-{
-  N_("Black"),
-  N_("Cyan"),
-  N_("Magenta"),
-  N_("Yellow"),
-  N_("Light Cyan"),
-  N_("Light Magenta"),
-  N_("Black"),
-};
-
-DECLARE_CHANNEL_LIST(sp960);
-
-static const char *r800_channel_names[] =
-{
-  N_("Yellow"),
-  N_("Magenta"),
-  N_("Cyan"),
-  N_("Matte Black"),
-  N_("Photo Black"),
-  N_("Red"),
-  N_("Blue"),
-  N_("Gloss Optimizer"),
-};
-
-DECLARE_CHANNEL_LIST(r800);
-
-static const char *picturemate_6_channel_names[] =
-{
-  N_("Yellow"),
-  N_("Magenta"),
-  N_("Cyan"),
-  N_("Black"),
-  N_("Red"),
-  N_("Blue"),
-};
-
-DECLARE_CHANNEL_LIST(picturemate_6);
-
-static const char *picturemate_4_channel_names[] =
-{
-  N_("Yellow"),
-  N_("Magenta"),
-  N_("Cyan"),
-  N_("Black"),
-};
-
-DECLARE_CHANNEL_LIST(picturemate_4);
-
-static const char *r2400_channel_names[] =
-{
-  N_("Light Light Black"),
-  N_("Light Magenta"),
-  N_("Light Cyan"),
-  N_("Light Black"),
-  N_("Black"),
-  N_("Cyan"),
-  N_("Magenta"),
-  N_("Yellow"),
-};
-
-DECLARE_CHANNEL_LIST(r2400);
-
-typedef struct
-{
-  const char *name;
-  const channel_name_t *channel_name;
-} channel_t;
-
-static const channel_t the_channels[] =
-{
-  { "cx3800", &cx3800_channel_name_list },
-  { "mfp2005", &mfp2005_channel_name_list },
-  { "photo", &photo_channel_name_list },
-  { "picturemate_6", &picturemate_6_channel_name_list },
-  { "picturemate_4", &picturemate_4_channel_name_list },
-  { "pm_950c", &pm_950c_channel_name_list },
-  { "r2400", &r2400_channel_name_list },
-  { "sp1400", &sp1400_channel_name_list },
-  { "r800", &r800_channel_name_list },
-  { "rx700", &rx700_channel_name_list },
-  { "sp2200", &sp2200_channel_name_list },
-  { "sp960", &sp960_channel_name_list },
-  { "standard", &standard_channel_name_list },
-  { "c120", &c120_channel_name_list },
-};
-
-const channel_name_t *
-stpi_escp2_get_channel_names_named(const char *n)
+const inkname_t *
+stpi_escp2_get_default_black_inkset(void)
 {
-  int i;
-  if (n)
-    for (i = 0; i < sizeof(the_channels) / sizeof(channel_t); i++)
-      {
-	if (strcmp(n, the_channels[i].name) == 0)
-	  return the_channels[i].channel_name;
-      }
-  return NULL;
+  if (! default_black_inkgroup)
+    {
+      default_black_inkgroup = load_inkgroup("escp2/inks/defaultblack.xml");
+      if (! default_black_inkgroup ||
+	  default_black_inkgroup->n_inklists < 1 ||
+	  default_black_inkgroup->inklists[0].n_inks < 1)
+	{
+	  stp_erprintf("Default black inkgroup: %x\n", (int) default_black_inkgroup);
+	  stp_erprintf("Unable to load default black ink definition!\n");
+	  stp_abort();
+	}
+    }
+  return &(default_black_inkgroup->inklists[0].inknames[0]);
 }
diff --git a/src/main/escp2-driver.c b/src/main/escp2-driver.c
index af8e005..abaac0f 100644
--- a/src/main/escp2-driver.c
+++ b/src/main/escp2-driver.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: escp2-driver.c,v 1.38 2007/12/30 05:38:44 rlk Exp $"
+ * "$Id: escp2-driver.c,v 1.54 2008/07/26 23:15:47 rlk Exp $"
  *
  *   Print plug-in EPSON ESC/P2 driver for the GIMP.
  *
@@ -53,8 +53,8 @@ escp2_reset_printer(stp_vars_t *v)
    * Magic initialization string that's needed to take printer out of
    * packet mode.
    */
-  if (pd->init_sequence)
-    stp_zfwrite(pd->init_sequence->data, pd->init_sequence->bytes, 1, v);
+  if (pd->preinit_sequence)
+    stp_zfwrite(pd->preinit_sequence->data, pd->preinit_sequence->bytes, 1, v);
 
   stp_send_command(v, "\033@", "");
 }
@@ -103,9 +103,12 @@ print_debug_params(stp_vars_t *v)
   print_remote_int_param(v, "Xdpi", pd->res->hres);
   print_remote_int_param(v, "Printed_ydpi", pd->res->printed_vres);
   print_remote_int_param(v, "Printed_xdpi", pd->res->printed_hres);
+/*
   print_remote_int_param(v, "Use_softweave", pd->res->softweave);
-  print_remote_int_param(v, "Use_printer_weave", pd->res->printer_weave);
+  print_remote_int_param(v, "Printer_weave", pd->res->printer_weave);
+*/
   print_remote_int_param(v, "Use_printer_weave", pd->use_printer_weave);
+  print_remote_int_param(v, "Duplex", pd->duplex);
   print_remote_int_param(v, "Page_left", pd->page_left);
   print_remote_int_param(v, "Page_right", pd->page_right);
   print_remote_int_param(v, "Page_top", pd->page_top);
@@ -136,7 +139,6 @@ print_debug_params(stp_vars_t *v)
   print_remote_int_param(v, "Unit_scale", pd->unit_scale);
   print_remote_int_param(v, "Zero_advance", pd->send_zero_pass_advance);
   print_remote_int_param(v, "Bits", pd->bitwidth);
-  print_remote_int_param(v, "Resid", pd->ink_resid);
   print_remote_int_param(v, "Drop Size", pd->drop_size);
   print_remote_int_param(v, "Initial_vertical_offset", pd->initial_vertical_offset);
   print_remote_int_param(v, "Channels_in_use", pd->channels_in_use);
@@ -146,17 +148,18 @@ print_debug_params(stp_vars_t *v)
   print_remote_int_param(v, "Use_fast_360", pd->use_fast_360);
   print_remote_int_param(v, "Command_set", pd->command_set);
   print_remote_int_param(v, "Variable_dots", pd->variable_dots);
-  print_remote_int_param(v, "Has_vacuum", pd->has_vacuum);
   print_remote_int_param(v, "Has_graymode", pd->has_graymode);
   print_remote_int_param(v, "Base_separation", pd->base_separation);
   print_remote_int_param(v, "Resolution_scale", pd->resolution_scale);
+#if 0
   print_remote_int_param(v, "Printing_resolution", pd->printing_resolution);
+#endif
   print_remote_int_param(v, "Separation_rows", pd->separation_rows);
   print_remote_int_param(v, "Pseudo_separation_rows", pd->pseudo_separation_rows);
   print_remote_int_param(v, "Extra_720dpi_separation", pd->extra_720dpi_separation);
   print_remote_int_param(v, "Use_aux_channels", pd->use_aux_channels);
   print_remote_param(v, "Ink name", pd->inkname->name);
-  print_remote_int_param(v, "  channels", pd->inkname->channel_set->channel_count);
+  print_remote_int_param(v, "  channels", pd->inkname->channel_count);
   print_remote_int_param(v, "  inkset", pd->inkname->inkset);
   for (i = 0; i < count; i++)
     {
@@ -210,56 +213,50 @@ escp2_set_remote_sequence(stp_vars_t *v)
 {
   /* Magic remote mode commands, whatever they do */
   escp2_privdata_t *pd = get_privdata(v);
+  const stp_vars_t *pv = pd->media_settings;
 
   if (stp_get_debug_level() & STP_DBG_MARK_FILE)
     print_debug_params(v);
   if (pd->advanced_command_set || pd->input_slot)
     {
-      int feed_sequence = 0;
       /* Enter remote mode */
       stp_send_command(v, "\033(R", "bcs", 0, "REMOTE1");
-      if (pd->command_set == MODEL_COMMAND_PRO)
-	{
-	  if (pd->paper_type)
-	    {
-	      stp_send_command(v, "PH", "bcc", 0,
-			       pd->paper_type->paper_thickness);
-	      if (pd->has_vacuum)
-		stp_send_command(v, "SN", "bccc", 0, 5,
-				 pd->paper_type->vacuum_intensity);
-	      stp_send_command(v, "SN", "bccc", 0, 4,
-			       pd->paper_type->feed_adjustment);
-	    }
-	}
-      else if (pd->advanced_command_set)
+      /* Per the manual, job setup comes first, then SN command */
+      if (pd->input_slot &&
+	  pd->input_slot->roll_feed_cut_flags == ROLL_FEED_CUT_ALL)
+	      stp_send_command(v, "JS", "bh", 0);
+      if (pd->preinit_remote_sequence)
+	stp_zfwrite(pd->preinit_remote_sequence->data,
+		    pd->preinit_remote_sequence->bytes, 1, v);
+      if (stp_check_int_parameter(pv, "FeedAdjustment", STP_PARAMETER_ACTIVE))
+	stp_send_command(v, "SN", "bccc", 0, 4,
+			 stp_get_int_parameter(pv, "FeedAdjustment"));
+      if (stp_check_int_parameter(pv, "VacuumIntensity", STP_PARAMETER_ACTIVE))
+	stp_send_command(v, "SN", "bccc", 0, 5,
+			 stp_get_int_parameter(pv, "VacuumIntensity"));
+      if (stp_check_int_parameter(pv, "ScanDryTime", STP_PARAMETER_ACTIVE))
+	stp_send_command(v, "DR", "bcch", 0, 1,
+			 (int) stp_get_float_parameter(pv, "ScanDryTime") * 1000);
+      if (stp_check_int_parameter(pv, "ScanMinDryTime", STP_PARAMETER_ACTIVE))
 	{
-	  if (pd->paper_type)
-	    feed_sequence = pd->paper_type->paper_feed_sequence;
-	  /* Function unknown */
-	  stp_send_command(v, "PM", "bh", 0);
-	  /* Set mechanism sequence */
-	  stp_send_command(v, "SN", "bccc", 0, 0, feed_sequence);
-	  if (stp_get_boolean_parameter(v, "FullBleed"))
-	    {
-	      stp_send_command(v, "FP", "bch", 0,
-			       (unsigned short) -pd->zero_margin_offset);
-	      if (pd->borderless_sequence)
-		stp_zfwrite(pd->borderless_sequence->data,
-			    pd->borderless_sequence->bytes,
-			    1, v);
-	    }
+	  stp_send_command(v, "DR", "bcccc", 0, 0x41, 0xff, 0xff);
+	  stp_send_command(v, "DR", "bcch", 0, 1,
+			   (int) stp_get_float_parameter(pv, "ScanMinDryTime") * 1000);
 	}
+      if (stp_check_int_parameter(pv, "PageDryTime", STP_PARAMETER_ACTIVE))
+	stp_send_command(v, "DR", "bcch", 0, 1,
+			 (int) stp_get_float_parameter(pv, "PageDryTime"));
+      /* Next comes paper path */
       if (pd->input_slot)
 	{
 	  int divisor = pd->base_separation / 360;
 	  int height = pd->page_true_height * 5 / divisor;
-	  if (pd->input_slot->init_sequence.bytes)
-	    stp_zfwrite(pd->input_slot->init_sequence.data,
-			pd->input_slot->init_sequence.bytes, 1, v);
+	  if (pd->input_slot->init_sequence)
+	    stp_zfwrite(pd->input_slot->init_sequence->data,
+			pd->input_slot->init_sequence->bytes, 1, v);
 	  switch (pd->input_slot->roll_feed_cut_flags)
 	    {
 	    case ROLL_FEED_CUT_ALL:
-	      stp_send_command(v, "JS", "bh", 0);
 	      stp_send_command(v, "CO", "bccccl", 0, 0, 1, 0, 0);
 	      stp_send_command(v, "CO", "bccccl", 0, 0, 0, 0, height);
 	      break;
@@ -271,7 +268,39 @@ escp2_set_remote_sequence(stp_vars_t *v)
 	      break;
 	    }
 	}
-
+      if (stp_check_int_parameter(pv, "PaperMedia", STP_PARAMETER_ACTIVE))
+	stp_send_command(v, "MI", "bcccc", 0, 1,
+			 stp_get_int_parameter(pv, "PaperMedia"),
+			 (stp_check_int_parameter(pv, "PaperMediaSize", STP_PARAMETER_ACTIVE) ?
+			  stp_get_int_parameter(pv, "PaperMediaSize") :
+			  99));	/* User-defined size (for now!) */
+      if (pd->duplex)
+	{
+	  /* If there's ever duplex no tumble, we'll need to special
+	     case it, too */
+	  if (pd->duplex == DUPLEX_TUMBLE && (pd->input_slot->duplex & DUPLEX_TUMBLE))
+	    stp_send_command(v, "DP", "bcc", 0, 2); /* Auto duplex */
+	  else
+	    stp_send_command(v, "DP", "bcc", 0, 2); /* Auto duplex */
+	}
+      if (stp_check_int_parameter(pv, "PaperThickness", STP_PARAMETER_ACTIVE))
+	stp_send_command(v, "PH", "bcc", 0,
+			 stp_get_int_parameter(pv, "PaperThickness"));
+      if (stp_check_int_parameter(pv, "FeedSequence", STP_PARAMETER_ACTIVE))
+	stp_send_command(v, "SN", "bccc", 0, 0,
+			 stp_get_int_parameter(pv, "FeedSequence"));
+      if (stp_check_int_parameter(pv, "PlatenGap", STP_PARAMETER_ACTIVE))
+	stp_send_command(v, "US", "bccc", 0, 1,
+			 stp_get_int_parameter(pv, "PlatenGap"));
+      if (stp_get_boolean_parameter(v, "FullBleed"))
+	{
+	  stp_send_command(v, "FP", "bch", 0,
+			   (unsigned short) -pd->zero_margin_offset);
+	  if (pd->borderless_sequence)
+	    stp_zfwrite(pd->borderless_sequence->data,
+			pd->borderless_sequence->bytes,
+			1, v);
+	}
       /* Exit remote mode */
 
       stp_send_command(v, "\033", "ccc", 0, 0, 0);
@@ -314,12 +343,10 @@ static void
 escp2_set_printer_weave(stp_vars_t *v)
 {
   escp2_privdata_t *pd = get_privdata(v);
-  int printer_weave_parm = 0;
   if (pd->printer_weave)
-    printer_weave_parm = pd->printer_weave->value;
-  else if (pd->res->printer_weave)
-    printer_weave_parm = pd->res->printer_weave;
-  stp_send_command(v, "\033(i", "bc", printer_weave_parm);
+    stp_zfwrite(pd->printer_weave->data, pd->printer_weave->bytes, 1, v);
+  else
+    stp_send_command(v, "\033(i", "bc", 0);
 }
 
 static void
@@ -327,12 +354,13 @@ escp2_set_printhead_speed(stp_vars_t *v)
 {
   escp2_privdata_t *pd = get_privdata(v);
   const char *direction = stp_get_string_parameter(v, "PrintingDirection");
-  int unidirectional;
+  int unidirectional = -1;
   if (direction && strcmp(direction, "Unidirectional") == 0)
     unidirectional = 1;
   else if (direction && strcmp(direction, "Bidirectional") == 0)
     unidirectional = 0;
-  else if (pd->res->printed_hres * pd->res->printed_vres *
+  else if (pd->bidirectional_upper_limit >= 0 &&
+	   pd->res->printed_hres * pd->res->printed_vres *
 	   pd->res->vertical_passes >= pd->bidirectional_upper_limit)
     {
       stp_dprintf(STP_DBG_ESCP2, v,
@@ -344,7 +372,7 @@ escp2_set_printhead_speed(stp_vars_t *v)
 		  pd->bidirectional_upper_limit);
       unidirectional = 1;
     }
-  else
+  else if (pd->bidirectional_upper_limit >= 0)
     {
       stp_dprintf(STP_DBG_ESCP2, v,
 		  "Setting bidirectional: hres %d vres %d passes %d total %d limit %d\n",
@@ -355,13 +383,13 @@ escp2_set_printhead_speed(stp_vars_t *v)
 		  pd->bidirectional_upper_limit);
       unidirectional = 0;
     }
-  if (unidirectional)
+  if (unidirectional == 1)
     {
       stp_send_command(v, "\033U", "c", 1);
-      if (pd->res->hres > pd->printing_resolution)
+      if (pd->res->hres > pd->physical_xdpi)
 	stp_send_command(v, "\033(s", "bc", 2);
     }
-  else
+  else if (unidirectional == 0)
     stp_send_command(v, "\033U", "c", 0);
 }
 
@@ -410,10 +438,14 @@ escp2_set_paper_dimensions(stp_vars_t *v)
   escp2_privdata_t *pd = get_privdata(v);
   if (pd->advanced_command_set)
     {
+      const stp_vars_t *pv = pd->media_settings;
       int w = pd->page_true_width * pd->page_management_units / 72;
       int h = (pd->page_true_height + pd->paper_extra_bottom) *
 	pd->page_management_units / 72;
       stp_send_command(v, "\033(S", "bll", w, h);
+      if (stp_check_int_parameter(pv, "PrintMethod", STP_PARAMETER_ACTIVE))
+	stp_send_command(v, "\033(m", "bc", 
+			 stp_get_int_parameter(pv, "PrintMethod"));
     }
 }
 
@@ -428,7 +460,7 @@ escp2_set_printhead_resolution(stp_vars_t *v)
 
       xres = pd->resolution_scale / pd->physical_xdpi;
 
-      if (pd->command_set == MODEL_COMMAND_PRO && !pd->res->softweave)
+      if (pd->command_set == MODEL_COMMAND_PRO && pd->printer_weave)
 	yres = yres /  pd->res->vres;
       else if (pd->split_channel_count > 1)
 	yres = yres * pd->nozzle_separation / pd->base_separation *
@@ -507,7 +539,8 @@ send_print_command(stp_vars_t *v, stp_pass_t *pass, int ncolor, int nlines)
   if (pd->command_set == MODEL_COMMAND_PRO || pd->variable_dots)
     {
       int nwidth = pd->bitwidth * ((lwidth + 7) / 8);
-      stp_send_command(v, "\033i", "ccchh", ncolor, COMPRESSION,
+      stp_send_command(v, "\033i", "ccchh", ncolor,
+		       (stp_get_debug_level() & STP_DBG_NO_COMPRESSION) ? 0 : 1,
 		       pd->bitwidth, nwidth, nlines);
     }
   else
@@ -525,8 +558,9 @@ send_print_command(stp_vars_t *v, stp_pass_t *pass, int ncolor, int nlines)
 	ygap *= pd->pseudo_separation_rows;
       else
 	ygap *= pd->separation_rows;
-      stp_send_command(v, "\033.", "cccch", COMPRESSION, ygap, xgap, nlines,
-		       lwidth);
+      stp_send_command(v, "\033.", "cccch",
+		       (stp_get_debug_level() & STP_DBG_NO_COMPRESSION) ? 0 : 1,
+		       ygap, xgap, nlines, lwidth);
     }
 }
 
@@ -536,39 +570,43 @@ send_extra_data(stp_vars_t *v, int extralines)
   escp2_privdata_t *pd = get_privdata(v);
   int lwidth = (pd->image_printed_width + (pd->horizontal_passes - 1)) /
     pd->horizontal_passes;
-#ifdef TEST_UNCOMPRESSED
-  int i;
-  for (i = 0; i < pd->bitwidth * (lwidth + 7) / 8; i++)
-    stp_putc(0, v);
-#else  /* !TEST_UNCOMPRESSED */
-  int k, l;
-  int bytes_to_fill = pd->bitwidth * ((lwidth + 7) / 8);
-  int full_blocks = bytes_to_fill / 128;
-  int leftover = bytes_to_fill % 128;
-  int total_bytes = extralines * (full_blocks + 1) * 2;
-  unsigned char *buf = stp_malloc(total_bytes);
-  total_bytes = 0;
-  for (k = 0; k < extralines; k++)
+  if (stp_get_debug_level() & STP_DBG_NO_COMPRESSION)
     {
-      for (l = 0; l < full_blocks; l++)
-	{
-	  buf[total_bytes++] = 129;
-	  buf[total_bytes++] = 0;
-	}
-      if (leftover == 1)
-	{
-	  buf[total_bytes++] = 1;
-	  buf[total_bytes++] = 0;
-	}
-      else if (leftover > 0)
+      int i, k;
+      for (k = 0; k < extralines; k++)
+	for (i = 0; i < pd->bitwidth * (lwidth + 7) / 8; i++)
+	  stp_putc(0, v);
+    }
+  else
+    {
+      int k, l;
+      int bytes_to_fill = pd->bitwidth * ((lwidth + 7) / 8);
+      int full_blocks = bytes_to_fill / 128;
+      int leftover = bytes_to_fill % 128;
+      int total_bytes = extralines * (full_blocks + 1) * 2;
+      unsigned char *buf = stp_malloc(total_bytes);
+      total_bytes = 0;
+      for (k = 0; k < extralines; k++)
 	{
-	  buf[total_bytes++] = 257 - leftover;
-	  buf[total_bytes++] = 0;
+	  for (l = 0; l < full_blocks; l++)
+	    {
+	      buf[total_bytes++] = 129;
+	      buf[total_bytes++] = 0;
+	    }
+	  if (leftover == 1)
+	    {
+	      buf[total_bytes++] = 1;
+	      buf[total_bytes++] = 0;
+	    }
+	  else if (leftover > 0)
+	    {
+	      buf[total_bytes++] = 257 - leftover;
+	      buf[total_bytes++] = 0;
+	    }
 	}
+      stp_zfwrite((const char *) buf, total_bytes, 1, v);
+      stp_free(buf);
     }
-  stp_zfwrite((const char *) buf, total_bytes, 1, v);
-  stp_free(buf);
-#endif /* TEST_UNCOMPRESSED */
 }
 
 void
@@ -596,16 +634,16 @@ stpi_escp2_deinit_printer(stp_vars_t *v)
   if (pd->advanced_command_set || pd->input_slot)
     {
       stp_send_command(v, "\033(R", "bcs", 0, "REMOTE1");
-      if (pd->input_slot && pd->input_slot->deinit_sequence.bytes)
-	stp_zfwrite(pd->input_slot->deinit_sequence.data,
-		    pd->input_slot->deinit_sequence.bytes, 1, v);
+      if (pd->input_slot && pd->input_slot->deinit_sequence)
+	stp_zfwrite(pd->input_slot->deinit_sequence->data,
+		    pd->input_slot->deinit_sequence->bytes, 1, v);
       /* Load settings from NVRAM */
       stp_send_command(v, "LD", "b");
 
       /* Magic deinit sequence reported by Simone Falsini */
-      if (pd->deinit_sequence)
-	stp_zfwrite(pd->deinit_sequence->data, pd->deinit_sequence->bytes,
-		    1, v);
+      if (pd->deinit_remote_sequence)
+	stp_zfwrite(pd->deinit_remote_sequence->data,
+		    pd->deinit_remote_sequence->bytes, 1, v);
       /* Exit remote mode */
       stp_send_command(v, "\033", "ccc", 0, 0, 0);
     }
@@ -622,6 +660,7 @@ stpi_escp2_flush_pass(stp_vars_t *v, int passno, int vertical_subpass)
   stp_pass_t *pass = stp_get_pass_by_pass(v, passno);
   stp_linecount_t *linecount = stp_get_linecount_by_pass(v, passno);
   int minlines = pd->min_nozzles;
+  int nozzle_start = pd->nozzle_start;
 
   for (j = 0; j < pd->channels_in_use; j++)
     {
@@ -640,23 +679,37 @@ stpi_escp2_flush_pass(stp_vars_t *v, int passno, int vertical_subpass)
 	    {
 	      int sc = pd->split_channel_count;
 	      int k, l;
+	      int minlines_lo, nozzle_start_lo;
+	      minlines /= sc;
+	      nozzle_start /= sc;
+	      minlines_lo = pd->min_nozzles - (minlines * sc);
+	      nozzle_start_lo = pd->nozzle_start - (nozzle_start * sc);
 	      for (k = 0; k < sc; k++)
 		{
+		  int ml = minlines + (k < minlines_lo ? 1 : 0);
+		  int ns = nozzle_start + (k < nozzle_start_lo ? 1 : 0);
 		  int lc = ((nlines + (sc - k - 1)) / sc);
-		  if (lc < minlines)
-		    {
-		      extralines = minlines - lc;
-		    }
+		  int base = (pd->nozzle_start + k) % sc;
+		  if (lc < ml)
+		    extralines = ml - lc;
+		  else
+		    extralines = 0;
+		  extralines -= ns;
+		  if (extralines < 0)
+		    extralines = 0;
 		  if (lc + extralines > 0)
 		    {
+		      int sc_off = k + j * sc;
 		      set_horizontal_position(v, pass, vertical_subpass);
-		      send_print_command(v, pass, pd->split_channels[k],
-					 lc + extralines);
+		      send_print_command(v, pass, pd->split_channels[sc_off],
+					 lc + extralines + ns);
+		      if (ns > 0)
+			send_extra_data(v, ns);
 		      for (l = 0; l < lc; l++)
 			{
-			  int sp = (l * sc) + k;
+			  int sp = (l * sc) + base;
 			  unsigned long offset = sp * pd->split_channel_width;
-			  if (COMPRESSION)
+			  if (!(stp_get_debug_level() & STP_DBG_NO_COMPRESSION))
 			    {
 			      unsigned char *comp_ptr;
 			      stp_pack_tiff(v, bufs->v[j] + offset,
@@ -669,7 +722,7 @@ stpi_escp2_flush_pass(stp_vars_t *v, int passno, int vertical_subpass)
 			    stp_zfwrite((const char *) bufs->v[j] + offset,
 					pd->split_channel_width, 1, v);
 			}
-		      if (extralines)
+		      if (extralines > 0)
 			send_extra_data(v, extralines);
 		      stp_send_command(v, "\r", "");
 		    }
@@ -684,12 +737,14 @@ stpi_escp2_flush_pass(stp_vars_t *v, int passno, int vertical_subpass)
 		  nlines = minlines;
 		}
 	      send_print_command(v, pass, ncolor, nlines);
-
+	      extralines -= nozzle_start;
 	      /*
 	       * Send the data
 	       */
+	      if (nozzle_start)
+		send_extra_data(v, nozzle_start);
 	      stp_zfwrite((const char *)bufs->v[j], lineoffs->v[j], 1, v);
-	      if (extralines)
+	      if (extralines > 0)
 		send_extra_data(v, extralines);
 	      stp_send_command(v, "\r", "");
 	    }
@@ -705,7 +760,7 @@ stpi_escp2_terminate_page(stp_vars_t *v)
 {
   escp2_privdata_t *pd = get_privdata(v);
   if (!pd->input_slot ||
-      pd->input_slot->roll_feed_cut_flags != ROLL_FEED_DONT_EJECT)
+      !(pd->input_slot->roll_feed_cut_flags & ROLL_FEED_DONT_EJECT))
     {
       if (!pd->printed_something)
 	stp_send_command(v, "\n", "");
diff --git a/src/main/escp2-inks.c b/src/main/escp2-inks.c
deleted file mode 100644
index b772744..0000000
--- a/src/main/escp2-inks.c
+++ /dev/null
@@ -1,556 +0,0 @@
-/*
- * "$Id: escp2-inks.c,v 1.62 2008/02/03 03:41:43 rlk Exp $"
- *
- *   Print plug-in EPSON ESC/P2 driver for the GIMP.
- *
- *   Copyright 1997-2000 Michael Sweet (mike@easysw.com) and
- *	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.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include <gutenprint/gutenprint.h>
-#include "gutenprint-internal.h"
-#include <gutenprint/gutenprint-intl-internal.h>
-#include "print-escp2.h"
-
-/* Single drop size printers */
-static const escp2_dropsize_t escp2_single_dropsizes =
-  { "single", 1, { 1.0 } };
-
-/* 6 pl printers */
-static const escp2_dropsize_t escp2_low_dropsizes =
-  { "low", 3, { 0.28, 0.58, 1.0 } };
-static const escp2_dropsize_t escp2_6pl_dropsizes =
-  { "6pl", 3, { 0.25, 0.5, 1.0 } };
-static const escp2_dropsize_t escp2_6pl_1440_dropsizes =
-  { "6pl_1440", 2, { 0.5, 1.0 } };
-static const escp2_dropsize_t escp2_6pl_2880_dropsizes =
-  { "6pl_2880", 1, { 1.0 } };
-
-/* Stylus Color 480/580/C40/C50 */
-static const escp2_dropsize_t escp2_x80_low_dropsizes =
-  { "x80_low", 3, { 0.325, 0.5, 1.0 } };
-static const escp2_dropsize_t escp2_x80_6pl_dropsizes =
-  { "x80_6pl", 3, { 0.325, 0.5, 1.0 } };
-static const escp2_dropsize_t escp2_x80_1440_6pl_dropsizes =
-  { "x80_1440_6pl", 2, { 0.65, 1.0 } };
-static const escp2_dropsize_t escp2_x80_2880_6pl_dropsizes =
-  { "x80_2880_6pl", 1, { 1.0 } };
-
-/* 2880 DPI capable 4 picolitre printers */
-static const escp2_dropsize_t escp2_new_low_dropsizes =
-  { "680_low", 3, { 0.375, 0.75, 1.0 } };
-static const escp2_dropsize_t escp2_new_6pl_dropsizes =
-  { "680_6pl", 3, { 0.375, 0.50, 1.0 } };
-static const escp2_dropsize_t escp2_new_4pl_dropsizes =
-  { "680_4pl", 3, { 0.50, 0.75, 1.0 } };
-static const escp2_dropsize_t escp2_4pl_2880_dropsizes =
-  { "4pl_2880", 1, { 1.0 } };
-
-/* 1440 DPI capable printers */
-static const escp2_dropsize_t escp2_4pl_dropsizes =
-  { "4pl", 3, { 0.33, 0.50, 1.0 } };
-
-/* Stylus Color 900/980 */
-static const escp2_dropsize_t escp2_3pl_dropsizes =
-  { "3pl", 3, { 0.25, 0.61, 1.0 } };
-static const escp2_dropsize_t escp2_3pl_1440_dropsizes =
-  { "3pl_1440", 2, { 0.39, 1.0 } };
-static const escp2_dropsize_t escp2_3pl_2880_dropsizes =
-  { "3pl_2880", 1, { 1.0 } };
-static const escp2_dropsize_t escp2_980_6pl_dropsizes =
-  { "980_6pl", 3, { 0.40, 0.675, 1.0 } };
-
-/* Stylus Photo 960 */
-static const escp2_dropsize_t escp2_2pl_360_dropsizes =
-  { "2pl_360", 3, { 0.25, 0.5, 1.0 } };
-static const escp2_dropsize_t escp2_2pl_720_dropsizes =
-  { "2pl_720", 3, { 0.25, 0.5, 1.0 } };
-static const escp2_dropsize_t escp2_2pl_1440_dropsizes =
-  { "2pl_1440", 2, { 0.5, 1.0 } };
-static const escp2_dropsize_t escp2_2pl_2880_dropsizes =
-  { "2pl_2880", 1, { 1.0 } };
-
-/* PM-G800 */
-/* Guess */
-static const escp2_dropsize_t escp2_1_5pl_360_dropsizes =
-  { "1_5pl_360", 1, { 1, 0, 1.0 } };
-/* 7, 14, 20 pl */
-static const escp2_dropsize_t escp2_1_5pl_720_dropsizes =
-  { "1_5pl_720", 3, { 0.35, 0.70, 1.0 } };
-/*
- * Note that the site
- * (http://www.i-love-epson.co.jp/products/printer/inkjet/pmg800/pmg8002.htm)
- * is unclear: it says 3 pl MSDT, but the diagram reads 2 pl
- */
-/* 3, 6, 13 pl */
-/* Looks like 3, 7.5, 15 */
-static const escp2_dropsize_t escp2_1_5pl_1440_dropsizes =
-  { "1_5pl_1440", 3, { 0.2, 0.5, 1.0 } };
-/*
- * See above comment.  3 pl makes more sense than 2 pl
- */
-/* 1.5, 3, 6 pl */
-/* Looks like 1.5, 3.25, 6 */
-static const escp2_dropsize_t escp2_1_5pl_2880_dropsizes =
-  { "1_5pl_2880", 3, { 0.25, 0.47, 1.0 } };
-static const escp2_dropsize_t escp2_1_5pl_2880_2880_dropsizes =
-  { "1_5pl_2880_2880", 2, { 0.53, 1.0 } };
-static const escp2_dropsize_t escp2_1_5pl_5760_dropsizes =
-  { "1_5pl_5760", 1, { 1.0 } };
-
-/* E-100/Picturemate */
-static const escp2_dropsize_t escp2_picturemate_1440_dropsizes =
-  { "picturemate_1440", 3, { 0.4, 0.65, 1.0 } };
-static const escp2_dropsize_t escp2_picturemate_2880_dropsizes =
-  { "picturemate_2880", 2, { 0.615, 1.0 } };
-static const escp2_dropsize_t escp2_picturemate_5760_dropsizes =
-  { "picturemate_5760", 1, { 1.0 } };
-
-/* Stylus Photo R300 */
-static const escp2_dropsize_t escp2_r300_360_dropsizes =
-  { "r300_360", 3, { 0.15, 0.3, 1.0 } };
-static const escp2_dropsize_t escp2_r300_720_dropsizes =
-  { "r300_720", 3, { 0.15, 0.5, 1.0 } };
-static const escp2_dropsize_t escp2_r300_1440_dropsizes =
-  { "r300_1440", 3, { 0.29, 0.48, 1.0 } };
-static const escp2_dropsize_t escp2_r300_2880_dropsizes =
-  { "r300_2880", 2, { 0.604, 1.0 } };
-static const escp2_dropsize_t escp2_r300_2880_1440_dropsizes =
-  { "r300_2880_1440", 1, { 1.0 } };
-
-/* Claria inks */
-
-/*
- * Tested relative drop sizes:
- *      S       M       L
- *
- * 0x21 3       4       5
- * 0x23 2       3       4
- * 0x24 1       3       5
- * 0x25 1       2       3
- * 0x26 2       3       5
- * 0x33 1       3       5
- *
- * Therefore, there's no real point to use drop sizes other than 0x24
- * and 0x25.  The economy settings (0x10 and 0x0) don't provide any
- * bigger drops.  We get quite smooth output at 720x360 and 360 DPI, and
- * even 360x180 is surprisingly smooth.
- * Roy Harrington's estimates in first column; my remeasurements in second:
- *
- * 1  1.5 pl			1.5 pl
- * 2  2.4 pl			1.8 pl
- * 3  6.3 pl			4.5 pl
- * 4 12   pl (rlk estimate)	8.0 pl
- * 5 21   pl		       11   pl (+/- 1 pl)
- */
-
-static const escp2_dropsize_t escp2_claria_720_dropsizes =
-  { "claria_720", 3, { 0.125, 0.42, 1.0 } };
-static const escp2_dropsize_t escp2_claria_1440_dropsizes =
-  { "claria_1440", 3, { 0.338, 0.40, 1.0 } };
-static const escp2_dropsize_t escp2_claria_2880_dropsizes =
-  { "claria_2880", 2, { 0.833, 1.0 } };
-static const escp2_dropsize_t escp2_claria_5760_dropsizes =
-  { "claria_5760", 1, { 1.0 } };
-
-/* Stylus Photo 1400 */
-
-/*
- * Tested relative drop sizes:
-* 	S	M	L
-*
-* 0x21	3	4	5
-* 0x25	1	2	3
-* 0x33	1	3	5
-* 0x34	2	3	5
-*/
-
-static const escp2_dropsize_t escp2_claria_1400_720_dropsizes =
-  { "claria_1400_720", 3, { 0.42, 0.67, 1.0 } };
-static const escp2_dropsize_t escp2_claria_1400_1440_720_dropsizes =
-  { "claria_1400_1440_720", 3, { 0.125, 0.42, 1.0 } };
-static const escp2_dropsize_t escp2_claria_1400_1440_dropsizes =
-  { "claria_1400_1440", 3, { 0.338, 0.40, 1.0 } };
-static const escp2_dropsize_t escp2_claria_1400_2880_dropsizes =
-  { "claria_1400_2880", 2, { 0.833, 1.0 } };
-static const escp2_dropsize_t escp2_claria_1400_5760_dropsizes =
-  { "claria_1400_5760", 1, { 1.0 } };
-
-/* Stylus Photo R2400 */
-static const escp2_dropsize_t escp2_r2400_360_dropsizes =
-  { "r2400_360", 1, { 1 } };
-static const escp2_dropsize_t escp2_r2400_720_dropsizes =
-  { "r2400_720", 3, { 0.180, 0.44, 1 } };
-static const escp2_dropsize_t escp2_r2400_1440_dropsizes =
-  { "r2400_1440", 3, { 0.180, 0.44, 1 } };
-static const escp2_dropsize_t escp2_r2400_2880_dropsizes =
-  { "r2400_2880", 3, { 0.180, 0.44, 1 } };
-static const escp2_dropsize_t escp2_r2400_2880_1440_dropsizes =
-  { "r2400_2880_1440", 2, { 0.41, 1 } };
-static const escp2_dropsize_t escp2_r2400_2880_2880_dropsizes =
-  { "r2400_2880_2880", 1, { 1.0 } };
-
-/* Stylus C80 */
-static const escp2_dropsize_t escp2_economy_pigment_dropsizes =
-  { "economy_pigment", 3, { 0, 0, 1.0 } };
-static const escp2_dropsize_t escp2_low_pigment_dropsizes =
-  { "low_pigment", 3, { 0.28, 0, 1.0 } };
-static const escp2_dropsize_t escp2_6pl_pigment_dropsizes =
-  { "6pl_pigment", 3, { 0.28, 0, 1.0 } };
-static const escp2_dropsize_t escp2_3pl_pigment_dropsizes =
-  { "3pl_pigment", 3, { 0.25, 0.5, 1.0 } };
-static const escp2_dropsize_t escp2_3pl_pigment_2880_dropsizes =
-  { "3pl_pigment_2880", 2, { 0.5, 1.0 } };
-static const escp2_dropsize_t escp2_3pl_pigment_5760_dropsizes =
-  { "3pl_pigment_5760", 1, { 1.0 } };
-
-/* Stylus C66 */
-static const escp2_dropsize_t escp2_economy_pigment_c66_dropsizes =
-  { "economy_pigment_c66", 3, { 0, 0, 1.0 } };
-static const escp2_dropsize_t escp2_low_pigment_c66_dropsizes =
-  { "low_pigment_c66", 3, { 0.125, 0.25, 1.0 } };
-static const escp2_dropsize_t escp2_6pl_pigment_c66_dropsizes =
-  { "6pl_pigment_c66", 3, { 0.28, 0, 1.0 } };
-static const escp2_dropsize_t escp2_3pl_pigment_c66_dropsizes =
-  { "3pl_pigment_c66", 3, { 0.25, 0.5, 1.0 } };
-static const escp2_dropsize_t escp2_3pl_pigment_c66_2880_dropsizes =
-  { "3pl_pigment_c66_2880", 2, { 0.5, 1.0 } };
-static const escp2_dropsize_t escp2_3pl_pigment_c66_5760_dropsizes =
-  { "3pl_pigment_c66_5760", 1, { 1.0 } };
-
-/* Stylus C120 */
-static const escp2_dropsize_t escp2_low_pigment_c120_dropsizes =
-  { "low_pigment_c120", 3, { 0.25, 0.5, 1.0 } };
-static const escp2_dropsize_t escp2_6pl_pigment_c120_dropsizes =
-  { "6pl_pigment_c120", 3, { 0.12, 0.3, 1.0 } };
-/*  { "6pl_pigment_c120", 3, { 0.15, 0.3, 1.0 } }; */
-/*  { "6pl_pigment_c120", 3, { 0.18, 0.333, 1.0 } }; */
-static const escp2_dropsize_t escp2_3pl_pigment_c120_dropsizes =
-  { "3pl_pigment_c120", 3, { 0.25, 0.5, 1.0 } };
-static const escp2_dropsize_t escp2_3pl_pigment_c120_2880_dropsizes =
-  { "3pl_pigment_c120_2880", 2, { 0.5, 1.0 } };
-static const escp2_dropsize_t escp2_3pl_pigment_c120_5760_dropsizes =
-  { "3pl_pigment_c120_5760", 1, { 1.0 } };
-
-/* Stylus Photo 2000P */
-static const escp2_dropsize_t escp2_2000p_dropsizes =
-  { "2000p", 2, { 0.55, 1.0 } };
-
-/* Stylus Photo 2200, Stylus Pro 7600 */
-static const escp2_dropsize_t escp2_ultrachrome_low_dropsizes =
-  { "ultrachrome_low", 3, { 0.16, 0.4, 1.0 } };
-static const escp2_dropsize_t escp2_ultrachrome_720_dropsizes =
-  { "ultrachrome_720", 3, { 0.2, 0.45, 1.0 } };
-static const escp2_dropsize_t escp2_ultrachrome_2880_dropsizes =
-  { "ultrachrome_2880", 1, { 1.0 } };
-
-/* Stylus Pro 10000 */
-static const escp2_dropsize_t escp2_spro10000_dropsizes =
-  { "spro10000", 2, { 0.661, 1.0 } };
-
-static const escp2_drop_list_t simple_drops =
-{
-  &escp2_single_dropsizes,
-  &escp2_single_dropsizes,
-  &escp2_single_dropsizes,
-  &escp2_single_dropsizes,
-  &escp2_single_dropsizes,
-  &escp2_single_dropsizes,
-  &escp2_single_dropsizes,
-  &escp2_single_dropsizes,
-  &escp2_single_dropsizes,
-};
-
-static const escp2_drop_list_t variable_6pl_drops =
-{
-  &escp2_6pl_dropsizes,
-  &escp2_6pl_dropsizes,
-  &escp2_6pl_dropsizes,
-  &escp2_6pl_dropsizes,
-  &escp2_6pl_1440_dropsizes,
-  &escp2_6pl_2880_dropsizes,
-  &escp2_6pl_2880_dropsizes,
-  &escp2_6pl_2880_dropsizes,
-  &escp2_6pl_2880_dropsizes,
-};
-
-static const escp2_drop_list_t variable_x80_6pl_drops =
-{
-  &escp2_x80_low_dropsizes,
-  &escp2_x80_low_dropsizes,
-  &escp2_x80_low_dropsizes,
-  &escp2_x80_6pl_dropsizes,
-  &escp2_x80_1440_6pl_dropsizes,
-  &escp2_x80_2880_6pl_dropsizes,
-  &escp2_x80_2880_6pl_dropsizes,
-  &escp2_x80_2880_6pl_dropsizes,
-  &escp2_x80_2880_6pl_dropsizes,
-};
-
-static const escp2_drop_list_t variable_1440_4pl_drops =
-{
-  &escp2_low_dropsizes,
-  &escp2_low_dropsizes,
-  &escp2_low_dropsizes,
-  &escp2_6pl_dropsizes,
-  &escp2_4pl_dropsizes,
-  &escp2_4pl_2880_dropsizes,
-  &escp2_4pl_2880_dropsizes,
-  &escp2_4pl_2880_dropsizes,
-  &escp2_4pl_2880_dropsizes,
-};
-
-static const escp2_drop_list_t variable_2880_4pl_drops =
-{
-  &escp2_new_low_dropsizes,
-  &escp2_new_low_dropsizes,
-  &escp2_new_low_dropsizes,
-  &escp2_new_6pl_dropsizes,
-  &escp2_new_4pl_dropsizes,
-  &escp2_4pl_2880_dropsizes,
-  &escp2_4pl_2880_dropsizes,
-  &escp2_4pl_2880_dropsizes,
-  &escp2_4pl_2880_dropsizes,
-};
-
-static const escp2_drop_list_t variable_3pl_drops =
-{
-  &escp2_low_dropsizes,
-  &escp2_low_dropsizes,
-  &escp2_980_6pl_dropsizes,
-  &escp2_3pl_dropsizes,
-  &escp2_3pl_1440_dropsizes,
-  &escp2_3pl_2880_dropsizes,
-  &escp2_3pl_2880_dropsizes,
-  &escp2_3pl_2880_dropsizes,
-  &escp2_3pl_2880_dropsizes,
-};
-
-static const escp2_drop_list_t variable_2pl_drops =
-{
-  &escp2_2pl_360_dropsizes,
-  &escp2_2pl_360_dropsizes,
-  &escp2_2pl_360_dropsizes,
-  &escp2_2pl_720_dropsizes,
-  &escp2_2pl_1440_dropsizes,
-  &escp2_2pl_2880_dropsizes,
-  &escp2_2pl_2880_dropsizes,
-  &escp2_2pl_2880_dropsizes,
-  &escp2_2pl_2880_dropsizes,
-};
-
-static const escp2_drop_list_t variable_3pl_pmg_drops =
-{
-  &escp2_r300_360_dropsizes,
-  &escp2_r300_360_dropsizes,
-  &escp2_r300_360_dropsizes,
-  &escp2_r300_720_dropsizes,
-  &escp2_r300_1440_dropsizes,
-  &escp2_r300_2880_dropsizes,
-  &escp2_r300_2880_1440_dropsizes,
-  &escp2_r300_2880_1440_dropsizes,
-  &escp2_r300_2880_1440_dropsizes,
-};
-
-static const escp2_drop_list_t claria_drops =
-{
-  &escp2_claria_720_dropsizes,
-  &escp2_claria_720_dropsizes,
-  &escp2_claria_720_dropsizes,
-  &escp2_claria_720_dropsizes,
-  &escp2_claria_720_dropsizes,
-  &escp2_claria_720_dropsizes,
-  &escp2_claria_1440_dropsizes,
-  &escp2_claria_2880_dropsizes,
-  &escp2_claria_5760_dropsizes,
-};
-
-static const escp2_drop_list_t claria_1400_drops =
-{
-  &escp2_claria_1400_1440_720_dropsizes,
-  &escp2_claria_1400_1440_720_dropsizes,
-  &escp2_claria_1400_720_dropsizes,
-  &escp2_claria_1400_720_dropsizes,
-  &escp2_claria_1400_1440_720_dropsizes,
-  &escp2_claria_1400_1440_720_dropsizes,
-  &escp2_claria_1400_1440_dropsizes,
-  &escp2_claria_1400_2880_dropsizes,
-  &escp2_claria_1400_5760_dropsizes,
-};
-
-static const escp2_drop_list_t variable_r2400_drops =
-{
-  &escp2_r2400_360_dropsizes,
-  &escp2_r2400_360_dropsizes,
-  &escp2_r2400_720_dropsizes,
-  &escp2_r2400_720_dropsizes,
-  &escp2_r2400_1440_dropsizes,
-  &escp2_r2400_2880_dropsizes,
-  &escp2_r2400_2880_1440_dropsizes,
-  &escp2_r2400_2880_2880_dropsizes,
-  &escp2_r2400_2880_2880_dropsizes,
-};
-
-static const escp2_drop_list_t variable_picturemate_drops =
-{
-  &escp2_picturemate_1440_dropsizes,
-  &escp2_picturemate_1440_dropsizes,
-  &escp2_picturemate_1440_dropsizes,
-  &escp2_picturemate_1440_dropsizes,
-  &escp2_picturemate_1440_dropsizes,
-  &escp2_picturemate_1440_dropsizes,
-  &escp2_picturemate_2880_dropsizes,
-  &escp2_picturemate_5760_dropsizes,
-  &escp2_picturemate_5760_dropsizes,
-};
-
-static const escp2_drop_list_t variable_1_5pl_drops =
-{
-  &escp2_1_5pl_360_dropsizes,
-  &escp2_1_5pl_360_dropsizes,
-  &escp2_1_5pl_720_dropsizes,	/* Even though we use 0x10 drop size */
-  &escp2_1_5pl_720_dropsizes,
-  &escp2_1_5pl_1440_dropsizes,
-  &escp2_1_5pl_2880_dropsizes,
-  &escp2_1_5pl_2880_dropsizes,
-  &escp2_1_5pl_2880_2880_dropsizes,
-  &escp2_1_5pl_5760_dropsizes,
-};
-
-static const escp2_drop_list_t variable_2000p_drops =
-{
-  &escp2_2000p_dropsizes,
-  &escp2_2000p_dropsizes,
-  &escp2_2000p_dropsizes,
-  &escp2_2000p_dropsizes,
-  &escp2_2000p_dropsizes,
-  &escp2_2000p_dropsizes,
-  &escp2_2000p_dropsizes,
-  &escp2_2000p_dropsizes,
-  &escp2_2000p_dropsizes
-};
-
-static const escp2_drop_list_t variable_ultrachrome_drops =
-{
-  &escp2_ultrachrome_low_dropsizes,
-  &escp2_ultrachrome_low_dropsizes,
-  &escp2_ultrachrome_low_dropsizes,
-  &escp2_ultrachrome_720_dropsizes,
-  &escp2_ultrachrome_720_dropsizes,
-  &escp2_ultrachrome_2880_dropsizes,
-  &escp2_ultrachrome_2880_dropsizes,
-  &escp2_ultrachrome_2880_dropsizes,
-  &escp2_ultrachrome_2880_dropsizes,
-};
-
-static const escp2_drop_list_t variable_3pl_pigment_drops =
-{
-  &escp2_economy_pigment_dropsizes,
-  &escp2_low_pigment_dropsizes,
-  &escp2_low_pigment_dropsizes,
-  &escp2_6pl_pigment_dropsizes,
-  &escp2_3pl_pigment_dropsizes,
-  &escp2_3pl_pigment_2880_dropsizes,
-  &escp2_3pl_pigment_5760_dropsizes,
-  &escp2_3pl_pigment_5760_dropsizes,
-  &escp2_3pl_pigment_5760_dropsizes,
-};
-
-static const escp2_drop_list_t variable_3pl_pigment_c66_drops =
-{
-  &escp2_economy_pigment_c66_dropsizes,
-  &escp2_low_pigment_c66_dropsizes,
-  &escp2_low_pigment_c66_dropsizes,
-  &escp2_6pl_pigment_c66_dropsizes,
-  &escp2_3pl_pigment_c66_dropsizes,
-  &escp2_3pl_pigment_c66_2880_dropsizes,
-  &escp2_3pl_pigment_c66_5760_dropsizes,
-  &escp2_3pl_pigment_c66_5760_dropsizes,
-  &escp2_3pl_pigment_c66_5760_dropsizes,
-};
-
-static const escp2_drop_list_t variable_3pl_pigment_c120_drops =
-{
-  &escp2_low_pigment_c120_dropsizes,
-  &escp2_low_pigment_c120_dropsizes,
-  &escp2_6pl_pigment_c120_dropsizes,
-  &escp2_6pl_pigment_c120_dropsizes,
-  &escp2_3pl_pigment_c120_dropsizes,
-  &escp2_3pl_pigment_c120_2880_dropsizes,
-  &escp2_3pl_pigment_c120_5760_dropsizes,
-  &escp2_3pl_pigment_c120_5760_dropsizes,
-  &escp2_3pl_pigment_c120_5760_dropsizes,
-};
-
-static const escp2_drop_list_t spro10000_drops =
-{
-  &escp2_spro10000_dropsizes,
-  &escp2_spro10000_dropsizes,
-  &escp2_spro10000_dropsizes,
-  &escp2_spro10000_dropsizes,
-  &escp2_spro10000_dropsizes,
-  &escp2_spro10000_dropsizes,
-  &escp2_spro10000_dropsizes,
-  &escp2_spro10000_dropsizes,
-  &escp2_spro10000_dropsizes
-};
-
-
-typedef struct
-{
-  const char *name;
-  const escp2_drop_list_t *const drop_list;
-} drop_list_t;
-
-static const drop_list_t the_drop_lists[] =
-{
-  { "simple", &simple_drops },
-  { "spro10000", &spro10000_drops },
-  { "variable_1_5pl", &variable_1_5pl_drops },
-  { "variable_2pl", &variable_2pl_drops },
-  { "variable_3pl", &variable_3pl_drops },
-  { "variable_3pl_pigment", &variable_3pl_pigment_drops },
-  { "variable_3pl_pigment_c66", &variable_3pl_pigment_c66_drops },
-  { "variable_3pl_pigment_c120", &variable_3pl_pigment_c120_drops },
-  { "variable_3pl_pmg", &variable_3pl_pmg_drops },
-  { "variable_claria", &claria_drops },
-  { "variable_claria_1400", &claria_1400_drops },
-  { "variable_r2400", &variable_r2400_drops },
-  { "variable_picturemate", &variable_picturemate_drops },
-  { "variable_1440_4pl", &variable_1440_4pl_drops },
-  { "variable_ultrachrome", &variable_ultrachrome_drops },
-  { "variable_2880_4pl", &variable_2880_4pl_drops },
-  { "variable_6pl", &variable_6pl_drops },
-  { "variable_2000p", &variable_2000p_drops },
-  { "variable_x80_6pl", &variable_x80_6pl_drops },
-};
-
-const escp2_drop_list_t *
-stpi_escp2_get_drop_list_named(const char *n)
-{
-  int i;
-  if (n)
-    for (i = 0; i < sizeof(the_drop_lists) / sizeof(drop_list_t); i++)
-      {
-	if (strcmp(n, the_drop_lists[i].name) == 0)
-	  return the_drop_lists[i].drop_list;
-      }
-  return NULL;
-}
diff --git a/src/main/escp2-papers.c b/src/main/escp2-papers.c
index 42a9fe5..457aa0c 100644
--- a/src/main/escp2-papers.c
+++ b/src/main/escp2-papers.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: escp2-papers.c,v 1.108 2008/02/27 00:43:37 rlk Exp $"
+ * "$Id: escp2-papers.c,v 1.117 2008/07/06 02:17:43 rlk Exp $"
  *
  *   Print plug-in EPSON ESC/P2 driver for the GIMP.
  *
@@ -29,2075 +29,505 @@
 #include <gutenprint/gutenprint-intl-internal.h>
 #include "print-escp2.h"
 
-static const char standard_sat_adj[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<gutenprint>\n"
-"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-"<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
-/* C */  "1.20 1.20 1.30 1.50 1.70 1.90 2.00 2.00 "  /* B */
-/* B */  "2.00 2.00 2.00 2.00 2.00 2.00 2.00 2.00 "  /* M */
-/* M */  "2.00 1.80 1.60 1.40 1.20 1.00 1.00 1.00 "  /* R */
-/* R */  "1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 "  /* Y */
-/* Y */  "1.00 1.15 1.40 1.70 2.00 2.30 2.40 2.40 "  /* G */
-/* G */  "2.40 2.40 2.40 2.30 2.00 1.70 1.40 1.15 "  /* C */
-"</sequence>\n"
-"</curve>\n"
-"</gutenprint>\n";
-
-static const char standard_lum_adj[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<gutenprint>\n"
-"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-"<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
-/* C */  "0.56 0.58 0.62 0.68 0.73 0.78 0.82 0.85 "  /* B */
-/* B */  "0.85 0.82 0.78 0.78 0.79 0.80 0.82 0.85 "  /* M */
-/* M */  "0.87 0.90 0.94 0.97 1.00 1.00 1.00 1.00 "  /* R */
-/* R */  "1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 "  /* Y */
-/* Y */  "1.00 1.00 1.00 0.99 0.98 0.97 0.95 0.93 "  /* G */
-/* G */  "0.90 0.76 0.65 0.58 0.58 0.57 0.56 0.56 "  /* C */
-"</sequence>\n"
-"</curve>\n"
-"</gutenprint>\n";
-
-static const char standard_hue_adj[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<gutenprint>\n"
-"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-"<sequence count=\"48\" lower-bound=\"-6\" upper-bound=\"6\">\n"
-/* C */  "0.00 0.00 0.00 -.02 -.04 -.08 -.12 -.16 "  /* B */
-/* B */  "-.20 -.24 -.28 -.32 -.32 -.32 -.32 -.32 "  /* M */
-/* M */  "-.36 -.40 -.44 -.48 -.50 -.45 -.40 -.30 "  /* R */
-/* R */  "-.12 -.07 -.04 -.02 0.00 0.00 0.00 0.00 "  /* Y */
-/* Y */  "0.00 -.00 -.03 -.06 -.09 -.13 -.17 -.21 "  /* G */
-/* G */  "-.25 -.22 -.19 -.16 -.13 -.10 -.07 -.03 "  /* C */
-"</sequence>\n"
-"</curve>\n"
-"</gutenprint>\n";
-
-
-static const char photo2_sat_adj[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<gutenprint>\n"
-"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-"<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
-/* C */  "1.20 1.20 1.30 1.50 1.70 1.90 2.00 2.00 "  /* B */
-/* B */  "2.00 2.00 2.00 2.00 2.00 2.00 2.00 2.00 "  /* M */
-/* M */  "2.00 1.80 1.60 1.40 1.20 1.00 1.00 1.00 "  /* R */
-/* R */  "1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 "  /* Y */
-/* Y */  "1.00 1.15 1.40 1.70 2.00 2.30 2.40 2.40 "  /* G */
-/* G */  "2.40 2.40 2.40 2.30 2.00 1.70 1.40 1.15 "  /* C */
-"</sequence>\n"
-"</curve>\n"
-"</gutenprint>\n";
-
-static const char photo2_lum_adj[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<gutenprint>\n"
-"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-"<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
-/* C */  "0.56 0.58 0.62 0.68 0.73 0.78 0.82 0.85 "  /* B */
-/* B */  "0.85 0.82 0.78 0.78 0.79 0.80 0.82 0.85 "  /* M */
-/* M */  "0.87 0.90 0.94 0.97 1.00 1.00 1.00 1.00 "  /* R */
-/* R */  "1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 "  /* Y */
-/* Y */  "1.00 1.00 1.00 0.99 0.98 0.97 0.95 0.93 "  /* G */
-/* G */  "0.90 0.76 0.65 0.58 0.58 0.57 0.56 0.56 "  /* C */
-"</sequence>\n"
-"</curve>\n"
-"</gutenprint>\n";
-
-static const char photo2_hue_adj[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<gutenprint>\n"
-"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-"<sequence count=\"48\" lower-bound=\"-6\" upper-bound=\"6\">\n"
-/* C */  "0.00 0.00 0.00 -.02 -.04 -.08 -.12 -.16 "  /* B */
-/* B */  "-.20 -.24 -.28 -.32 -.32 -.32 -.32 -.32 "  /* M */
-/* M */  "-.36 -.40 -.44 -.48 -.50 -.45 -.40 -.30 "  /* R */
-/* R */  "-.12 -.07 -.04 -.02 0.00 0.00 0.00 0.00 "  /* Y */
-/* Y */  "0.00 -.00 -.03 -.06 -.09 -.13 -.17 -.21 "  /* G */
-/* G */  "-.25 -.22 -.19 -.16 -.13 -.10 -.07 -.03 "  /* C */
-"</sequence>\n"
-"</curve>\n"
-"</gutenprint>\n";
-
-
-static const char photo3_sat_adj[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<gutenprint>\n"
-"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-"<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
-/* C */  "1.00 1.05 1.15 1.25 1.35 1.45 1.50 1.50 "  /* B */
-/* B */  "1.50 1.50 1.50 1.50 1.50 1.50 1.50 1.50 "  /* M */
-/* M */  "1.50 1.40 1.30 1.20 1.10 1.00 1.00 1.00 "  /* R */
-/* R */  "1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 "  /* Y */
-/* Y */  "1.00 1.10 1.30 1.55 1.80 1.95 2.00 2.00 "  /* G */
-/* G */  "2.00 2.00 2.00 1.95 1.80 1.55 1.30 1.10 "  /* C */
-"</sequence>\n"
-"</curve>\n"
-"</gutenprint>\n";
-
-static const char photo3_lum_adj[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<gutenprint>\n"
-"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-"<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
-/* C */  "0.66 0.67 0.69 0.73 0.77 0.83 0.87 0.89 "  /* B */
-/* B */  "0.91 0.88 0.82 0.78 0.78 0.80 0.82 0.85 "  /* M */
-/* M */  "0.87 0.90 0.94 0.97 1.00 1.00 1.00 1.00 "  /* R */
-/* R */  "1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 "  /* Y */
-/* Y */  "1.00 1.00 0.99 0.98 0.96 0.94 0.92 0.88 "  /* G */
-/* G */  "0.84 0.72 0.69 0.67 0.66 0.66 0.66 0.66 "  /* C */
-"</sequence>\n"
-"</curve>\n"
-"</gutenprint>\n";
-
-static const char photo3_hue_adj[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<gutenprint>\n"
-"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-"<sequence count=\"48\" lower-bound=\"-6\" upper-bound=\"6\">\n"
-/* C */  "0.00 -.01 -.03 -.06 -.10 -.15 -.20 -.25 "  /* B */
-/* B */  "-.28 -.30 -.34 -.35 -.35 -.34 -.33 -.33 "  /* M */
-/* M */  "-.36 -.40 -.44 -.48 -.50 -.45 -.40 -.30 "  /* R */
-/* R */  "-.12 -.07 -.04 -.02 0.00 0.00 0.00 0.00 "  /* Y */
-/* Y */  "0.00 -.00 -.00 -.00 -.02 -.04 -.08 -.13 "  /* G */
-/* G */  "-.18 -.18 -.19 -.16 -.13 -.10 -.07 -.03 "  /* C */
-"</sequence>\n"
-"</curve>\n"
-"</gutenprint>\n";
-
-
-
-static const char claria_sat_adj[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<gutenprint>\n"
-"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-"<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
-/* C */  "1.00 1.05 1.15 1.25 1.35 1.45 1.50 1.50 "  /* B */
-/* B */  "1.50 1.50 1.50 1.50 1.50 1.50 1.50 1.50 "  /* M */
-/* M */  "1.50 1.40 1.30 1.20 1.10 1.00 1.00 1.00 "  /* R */
-/* R */  "1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 "  /* Y */
-/* Y */  "1.00 1.10 1.30 1.55 1.80 1.95 2.00 2.00 "  /* G */
-/* G */  "2.00 2.00 2.00 1.95 1.80 1.55 1.30 1.10 "  /* C */
-"</sequence>\n"
-"</curve>\n"
-"</gutenprint>\n";
-
-static const char claria_lum_adj[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<gutenprint>\n"
-"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-"<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
-/* C */  "0.66 0.67 0.69 0.73 0.77 0.83 0.87 0.89 "  /* B */
-/* B */  "0.91 0.88 0.84 0.78 0.78 0.80 0.82 0.85 "  /* M */
-/* M */  "0.87 0.90 0.94 0.97 1.00 1.00 1.00 1.00 "  /* R */
-/* R */  "1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 "  /* Y */
-/* Y */  "1.00 1.00 0.99 0.98 0.96 0.94 0.92 0.88 "  /* G */
-/* G */  "0.84 0.72 0.69 0.67 0.66 0.66 0.66 0.66 "  /* C */
-"</sequence>\n"
-"</curve>\n"
-"</gutenprint>\n";
-
-static const char claria_hue_adj[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<gutenprint>\n"
-"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-"<sequence count=\"48\" lower-bound=\"-6\" upper-bound=\"6\">\n"
-/* C */  "0.00 -.01 -.03 -.06 -.10 -.15 -.20 -.25 "  /* B */
-/* B */  "-.30 -.35 -.38 -.40 -.42 -.46 -.49 -.52 "  /* M */
-/* M */  "-.55 -.57 -.57 -.55 -.52 -.48 -.40 -.30 "  /* R */
-/* R */  "-.12 -.07 -.04 -.02 0.00 0.00 0.00 0.00 "  /* Y */
-/* Y */  "0.00 -.00 -.00 -.00 -.02 -.04 -.08 -.13 "  /* G */
-/* G */  "-.18 -.18 -.19 -.16 -.13 -.10 -.07 -.03 "  /* C */
-"</sequence>\n"
-"</curve>\n"
-"</gutenprint>\n";
-
-
-static const char sp960_sat_adj[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<gutenprint>\n"
-"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-"<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
-/* C */  "1.00 1.05 1.15 1.25 1.35 1.45 1.50 1.50 "  /* B */
-/* B */  "1.50 1.50 1.50 1.50 1.50 1.50 1.50 1.50 "  /* M */
-/* M */  "1.50 1.40 1.30 1.20 1.10 1.00 1.00 1.00 "  /* R */
-/* R */  "1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 "  /* Y */
-/* Y */  "1.00 1.10 1.30 1.55 1.80 1.95 2.00 2.00 "  /* G */
-/* G */  "2.00 2.00 2.00 1.95 1.80 1.55 1.30 1.10 "  /* C */
-"</sequence>\n"
-"</curve>\n"
-"</gutenprint>\n";
-
-static const char sp960_lum_adj[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<gutenprint>\n"
-"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-"<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
-/* C */  "0.58 0.60 0.65 0.69 0.74 0.79 0.82 0.84 "  /* B */
-/* B */  "0.86 0.81 0.76 0.76 0.78 0.79 0.83 0.86 "  /* M */
-/* M */  "0.93 0.95 0.97 0.98 1.00 1.00 1.00 1.00 "  /* R */
-/* R */  "1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 "  /* Y */
-/* Y */  "1.00 0.99 0.98 0.97 0.96 0.94 0.93 0.89 "  /* G */
-/* G */  "0.86 0.73 0.65 0.58 0.59 0.59 0.58 0.58 "  /* C */
-"</sequence>\n"
-"</curve>\n"
-"</gutenprint>\n";
-
-static const char sp960_hue_adj[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<gutenprint>\n"
-"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-"<sequence count=\"48\" lower-bound=\"-6\" upper-bound=\"6\">\n"
-/* C */  "0.00 0.06 0.10 0.10 0.06 0.00 -.06 -.12 "  /* B */
-/* B */  "-.18 -.21 -.22 -.23 -.24 -.25 -.26 -.27 "  /* M */
-/* M */  "-.28 -.33 -.38 -.45 -.50 -.40 -.30 -.20 "  /* R */
-/* R */  "-.12 -.07 -.04 -.02 0.00 0.00 0.00 0.00 "  /* Y */
-/* Y */  "0.00 -.00 -.00 -.00 -.00 -.00 -.00 -.00 "  /* G */
-/* G */  "-.00 -.00 -.00 -.00 -.00 -.00 -.00 -.00 "  /* C */
-"</sequence>\n"
-"</curve>\n"
-"</gutenprint>\n";
-
-static const char sp960_matte_sat_adj[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<gutenprint>\n"
-"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-"<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
-/* C */  "1.00 1.05 1.15 1.25 1.35 1.45 1.50 1.50 "  /* B */
-/* B */  "1.50 1.50 1.50 1.50 1.50 1.50 1.50 1.50 "  /* M */
-/* M */  "1.50 1.40 1.30 1.20 1.10 1.00 1.00 1.00 "  /* R */
-/* R */  "1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 "  /* Y */
-/* Y */  "1.00 1.10 1.30 1.55 1.80 1.95 2.00 2.00 "  /* G */
-/* G */  "2.00 2.00 2.00 1.95 1.80 1.55 1.30 1.10 "  /* C */
-"</sequence>\n"
-"</curve>\n"
-"</gutenprint>\n";
-
-static const char sp960_matte_lum_adj[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<gutenprint>\n"
-"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-"<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
-/* C */  "0.58 0.63 0.70 0.75 0.80 0.86 0.88 0.90 "  /* B */
-/* B */  "0.90 0.83 0.78 0.78 0.78 0.79 0.83 0.86 "  /* M */
-/* M */  "0.93 0.95 0.97 0.98 1.00 1.00 1.00 1.00 "  /* R */
-/* R */  "1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 "  /* Y */
-/* Y */  "1.00 0.99 0.98 0.97 0.96 0.94 0.93 0.89 "  /* G */
-/* G */  "0.86 0.73 0.65 0.58 0.59 0.59 0.58 0.58 "  /* C */
-"</sequence>\n"
-"</curve>\n"
-"</gutenprint>\n";
-
-static const char sp960_matte_hue_adj[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<gutenprint>\n"
-"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-"<sequence count=\"48\" lower-bound=\"-6\" upper-bound=\"6\">\n"
-/* C */  "0.00 0.06 0.10 0.10 0.06 0.00 -.06 -.12 "  /* B */
-/* B */  "-.18 -.21 -.22 -.23 -.24 -.25 -.26 -.27 "  /* M */
-/* M */  "-.28 -.33 -.38 -.45 -.50 -.40 -.30 -.20 "  /* R */
-/* R */  "-.12 -.07 -.04 -.02 0.00 0.00 0.00 0.00 "  /* Y */
-/* Y */  "0.00 -.00 -.00 -.00 -.00 -.00 -.00 -.00 "  /* G */
-/* G */  "-.00 -.00 -.00 -.00 -.00 -.00 -.00 -.00 "  /* C */
-"</sequence>\n"
-"</curve>\n"
-"</gutenprint>\n";
-
-
-static const char ultra_matte_sat_adj[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<gutenprint>\n"
-"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-"<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
-/* C */  "1.00 1.00 1.00 1.05 1.10 1.15 1.15 1.15 "  /* B */
-/* B */  "1.15 1.15 1.15 1.10 1.10 1.05 1.05 1.00 "  /* M */
-/* M */  "1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 "  /* R */
-/* R */  "1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 "  /* Y */
-/* Y */  "1.00 1.05 1.15 1.25 1.35 1.45 1.50 1.50 "  /* G */
-/* G */  "1.50 1.50 1.50 1.45 1.35 1.25 1.15 1.05 "  /* C */
-"</sequence>\n"
-"</curve>\n"
-"</gutenprint>\n";
-
-static const char ultra_matte_lum_adj[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<gutenprint>\n"
-"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-"<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
-/* C */  "0.49 0.51 0.55 0.61 0.67 0.71 0.76 0.79 "  /* B */
-/* B */  "0.83 0.80 0.76 0.76 0.78 0.79 0.83 0.86 "  /* M */
-/* M */  "0.93 0.95 0.97 0.97 0.97 0.97 0.96 0.96 "  /* R */
-/* R */  "0.96 0.97 0.97 0.98 0.99 1.00 1.00 1.00 "  /* Y */
-/* Y */  "1.00 0.98 0.97 0.95 0.94 0.93 0.90 0.86 "  /* G */
-/* G */  "0.82 0.69 0.60 0.54 0.52 0.51 0.50 0.49 "  /* C */
-"</sequence>\n"
-"</curve>\n"
-"</gutenprint>\n";
-
-static const char ultra_matte_hue_adj[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<gutenprint>\n"
-"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-"<sequence count=\"48\" lower-bound=\"-6\" upper-bound=\"6\">\n"
-/* C */  "0.00 0.06 0.10 0.10 0.06 0.00 -.06 -.12 "  /* B */
-/* B */  "-.18 -.21 -.22 -.22 -.22 -.22 -.22 -.22 "  /* M */
-/* M */  "-.22 -.28 -.34 -.40 -.50 -.40 -.30 -.20 "  /* R */
-/* R */  "-.12 -.07 -.04 -.02 0.00 0.00 0.00 0.00 "  /* Y */
-/* Y */  "0.00 -.00 -.03 -.07 -.11 -.15 -.19 -.22 "  /* G */
-/* G */  "-.25 -.22 -.19 -.15 -.12 -.10 -.06 -.03 "  /* C */
-"</sequence>\n"
-"</curve>\n"
-"</gutenprint>\n";
-
-static const char ultra_glossy_sat_adj[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<gutenprint>\n"
-"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-"<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
-/* C */  "1.00 1.00 1.00 1.05 1.10 1.15 1.15 1.15 "  /* B */
-/* B */  "1.15 1.15 1.15 1.10 1.10 1.05 1.05 1.00 "  /* M */
-/* M */  "1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 "  /* R */
-/* R */  "1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 "  /* Y */
-/* Y */  "1.00 1.05 1.15 1.25 1.35 1.45 1.50 1.50 "  /* G */
-/* G */  "1.50 1.50 1.50 1.45 1.35 1.25 1.15 1.05 "  /* C */
-"</sequence>\n"
-"</curve>\n"
-"</gutenprint>\n";
-
-static const char ultra_glossy_lum_adj[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<gutenprint>\n"
-"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-"<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
-/* C */  "0.49 0.53 0.60 0.64 0.69 0.73 0.77 0.80 "  /* B */
-/* B */  "0.84 0.81 0.77 0.77 0.78 0.80 0.84 0.87 "  /* M */
-/* M */  "0.93 0.95 0.97 0.98 0.98 0.97 0.96 0.96 "  /* R */
-/* R */  "0.96 0.97 0.98 0.98 0.99 1.00 1.00 1.00 "  /* Y */
-/* Y */  "1.00 0.98 0.97 0.96 0.95 0.93 0.90 0.87 "  /* G */
-/* G */  "0.83 0.69 0.61 0.55 0.53 0.52 0.50 0.49 "  /* C */
-"</sequence>\n"
-"</curve>\n"
-"</gutenprint>\n";
-
-static const char ultra_glossy_hue_adj[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<gutenprint>\n"
-"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-"<sequence count=\"48\" lower-bound=\"-6\" upper-bound=\"6\">\n"
-/* C */  "0.00 0.06 0.10 0.10 0.06 0.00 -.06 -.12 "  /* B */
-/* B */  "-.18 -.21 -.22 -.22 -.22 -.22 -.22 -.22 "  /* M */
-/* M */  "-.22 -.28 -.34 -.40 -.50 -.40 -.30 -.20 "  /* R */
-/* R */  "-.12 -.07 -.04 -.02 0.00 0.00 0.00 0.00 "  /* Y */
-/* Y */  "0.00 -.00 -.03 -.07 -.11 -.15 -.19 -.22 "  /* G */
-/* G */  "-.25 -.22 -.19 -.15 -.12 -.10 -.06 -.03 "  /* C */
-"</sequence>\n"
-"</curve>\n"
-"</gutenprint>\n";
-
-
-static const char ultra_k3_matte_sat_adj[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<gutenprint>\n"
-"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-"<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
-/* C */  "1.00 1.00 1.00 1.05 1.10 1.15 1.15 1.15 "  /* B */
-/* B */  "1.15 1.15 1.15 1.10 1.10 1.05 1.05 1.00 "  /* M */
-/* M */  "1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 "  /* R */
-/* R */  "1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 "  /* Y */
-/* Y */  "1.00 1.05 1.15 1.25 1.35 1.45 1.50 1.50 "  /* G */
-/* G */  "1.50 1.50 1.50 1.45 1.35 1.25 1.15 1.05 "  /* C */
-"</sequence>\n"
-"</curve>\n"
-"</gutenprint>\n";
-
-static const char ultra_k3_matte_lum_adj[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<gutenprint>\n"
-"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-"<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
-/* C */  "0.55 0.57 0.61 0.64 0.67 0.69 0.72 0.75 "  /* B */
-/* B */  "0.83 0.80 0.76 0.76 0.78 0.79 0.83 0.86 "  /* M */
-/* M */  "0.93 0.95 0.97 0.97 0.97 0.97 0.96 0.96 "  /* R */
-/* R */  "0.96 0.97 0.97 0.98 0.99 1.00 1.00 1.00 "  /* Y */
-/* Y */  "1.00 0.98 0.97 0.95 0.93 0.91 0.88 0.83 "  /* G */
-/* G */  "0.83 0.71 0.65 0.61 0.58 0.56 0.55 0.55 "  /* C */
-"</sequence>\n"
-"</curve>\n"
-"</gutenprint>\n";
-
-static const char ultra_k3_matte_hue_adj[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<gutenprint>\n"
-"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-"<sequence count=\"48\" lower-bound=\"-6\" upper-bound=\"6\">\n"
-/* C */  "0.00 0.06 0.10 0.10 0.06 0.00 -.06 -.12 "  /* B */
-/* B */  "-.18 -.21 -.22 -.22 -.22 -.22 -.22 -.22 "  /* M */
-/* M */  "-.22 -.28 -.34 -.40 -.50 -.40 -.30 -.20 "  /* R */
-/* R */  "-.12 -.07 -.04 -.02 0.00 0.00 0.00 0.00 "  /* Y */
-/* Y */  "0.00 -.00 -.03 -.07 -.11 -.15 -.17 -.18 "  /* G */
-/* G */  "-.19 -.20 -.19 -.18 -.16 -.12 -.08 -.04 "  /* C */
-"</sequence>\n"
-"</curve>\n"
-"</gutenprint>\n";
-
-static const char ultra_k3_glossy_sat_adj[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<gutenprint>\n"
-"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-"<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
-/* C */  "1.00 1.00 1.00 1.05 1.10 1.15 1.15 1.15 "  /* B */
-/* B */  "1.15 1.15 1.15 1.10 1.10 1.05 1.05 1.00 "  /* M */
-/* M */  "1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 "  /* R */
-/* R */  "1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 "  /* Y */
-/* Y */  "1.00 1.05 1.15 1.25 1.35 1.45 1.50 1.50 "  /* G */
-/* G */  "1.50 1.50 1.50 1.45 1.35 1.25 1.15 1.05 "  /* C */
-"</sequence>\n"
-"</curve>\n"
-"</gutenprint>\n";
-
-static const char ultra_k3_glossy_lum_adj[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<gutenprint>\n"
-"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-"<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
-/* C */  "0.55 0.57 0.61 0.64 0.67 0.69 0.72 0.75 "  /* B */
-/* B */  "0.75 0.71 0.70 0.70 0.72 0.76 0.81 0.87 "  /* M */
-/* M */  "0.93 0.95 0.97 0.98 0.98 0.97 0.96 0.96 "  /* R */
-/* R */  "0.96 0.97 0.98 0.98 0.99 1.00 1.00 1.00 "  /* Y */
-/* Y */  "1.00 0.98 0.97 0.96 0.95 0.93 0.90 0.87 "  /* G */
-/* G */  "0.83 0.71 0.65 0.61 0.58 0.56 0.55 0.55 "  /* C */
-"</sequence>\n"
-"</curve>\n"
-"</gutenprint>\n";
-
-static const char ultra_k3_glossy_hue_adj[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<gutenprint>\n"
-"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-"<sequence count=\"48\" lower-bound=\"-6\" upper-bound=\"6\">\n"
-/* C */  "0.00 0.06 0.10 0.10 0.06 0.00 -.06 -.12 "  /* B */
-/* B */  "-.18 -.21 -.22 -.22 -.22 -.22 -.22 -.22 "  /* M */
-/* M */  "-.22 -.28 -.34 -.40 -.50 -.40 -.30 -.20 "  /* R */
-/* R */  "-.12 -.07 -.04 -.02 0.00 0.00 0.00 0.00 "  /* Y */
-/* Y */  "0.00 -.00 -.03 -.07 -.11 -.15 -.19 -.22 "  /* G */
-/* G */  "-.25 -.22 -.19 -.15 -.12 -.10 -.06 -.03 "  /* C */
-"</sequence>\n"
-"</curve>\n"
-"</gutenprint>\n";
-
-
-static const char r800_matte_sat_adj[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<gutenprint>\n"
-"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-"<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
-/* C */  "1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 "  /* B */
-/* B */  "1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 "  /* M */
-/* M */  "1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 "  /* R */
-/* R */  "1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 "  /* Y */
-/* Y */  "1.00 1.03 1.06 1.09 1.12 1.15 1.18 1.20 "  /* G */
-/* G */  "1.20 1.15 1.10 1.05 1.00 1.00 1.00 1.00 "  /* C */
-"</sequence>\n"
-"</curve>\n"
-"</gutenprint>\n";
-
-static const char r800_matte_lum_adj[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<gutenprint>\n"
-"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-"<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
-/* C */  "0.75 0.75 0.75 0.75 0.76 0.80 0.85 0.90 "  /* B */
-/* B */  "0.90 0.88 0.82 0.78 0.78 0.82 0.85 0.92 "  /* M */
-/* M */  "0.98 0.98 0.97 0.97 0.96 0.96 0.96 0.96 "  /* R */
-/* R */  "0.96 0.97 0.98 0.98 0.99 1.00 1.00 1.00 "  /* Y */
-/* Y */  "1.00 1.00 1.00 0.99 0.98 0.97 0.96 0.93 "  /* G */
-/* G */  "0.88 0.87 0.86 0.85 0.82 0.79 0.76 0.75 "  /* C */
-"</sequence>\n"
-"</curve>\n"
-"</gutenprint>\n";
-
-static const char r800_matte_hue_adj[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<gutenprint>\n"
-"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-"<sequence count=\"48\" lower-bound=\"-6\" upper-bound=\"6\">\n"
-/* C */  "0.00 -.07 -.10 -.15 -.19 -.25 -.30 -.35 "  /* B */
-/* B */  "-.38 -.38 -.30 -.20 -.10 -.00 0.02 0.02 "  /* M */
-/* M */  "-.00 -.00 -.00 -.00 -.00 -.00 -.00 0.00 "  /* R */
-/* R */  "0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 "  /* Y */
-/* Y */  "0.00 0.02 0.05 0.09 0.13 0.15 0.16 0.17 "  /* G */
-/* G */  "0.17 0.17 0.16 0.15 0.13 0.09 0.05 0.02 "  /* C */
-"</sequence>\n"
-"</curve>\n"
-"</gutenprint>\n";
-
-static const char r800_glossy_sat_adj[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<gutenprint>\n"
-"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-"<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
-/* C */  "1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 "  /* B */
-/* B */  "1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 "  /* M */
-/* M */  "1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 "  /* R */
-/* R */  "1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 "  /* Y */
-/* Y */  "1.00 1.03 1.06 1.09 1.12 1.15 1.18 1.20 "  /* G */
-/* G */  "1.20 1.15 1.10 1.05 1.00 1.00 1.00 1.00 "  /* C */
-"</sequence>\n"
-"</curve>\n"
-"</gutenprint>\n";
-
-
-static const char r800_glossy_lum_adj[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<gutenprint>\n"
-"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-"<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
-/* C */  "0.75 0.75 0.75 0.75 0.76 0.80 0.85 0.90 "  /* B */
-/* B */  "0.90 0.88 0.82 0.85 0.87 0.89 0.91 0.95 "  /* M */
-/* M */  "0.98 0.98 0.97 0.97 0.96 0.96 0.96 0.96 "  /* R */
-/* R */  "0.96 0.97 0.98 0.98 0.99 1.00 1.00 1.00 "  /* Y */
-/* Y */  "1.00 1.00 1.00 0.99 0.98 0.97 0.96 0.93 "  /* G */
-/* G */  "0.88 0.87 0.86 0.85 0.82 0.79 0.76 0.75 "  /* C */
-"</sequence>\n"
-"</curve>\n"
-"</gutenprint>\n";
-
-static const char r800_glossy_hue_adj[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<gutenprint>\n"
-"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-"<sequence count=\"48\" lower-bound=\"-6\" upper-bound=\"6\">\n"
-/* C */  "0.00 -.07 -.10 -.15 -.19 -.25 -.30 -.35 "  /* B */
-/* B */  "-.38 -.38 -.30 -.20 -.10 -.00 0.00 0.00 "  /* M */
-/* M */  "-.00 -.00 -.00 -.00 -.00 -.00 -.00 0.00 "  /* R */
-/* R */  "0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 "  /* Y */
-/* Y */  "0.00 0.02 0.05 0.09 0.13 0.15 0.16 0.17 "  /* G */
-/* G */  "0.17 0.17 0.16 0.15 0.13 0.09 0.05 0.02 "  /* C */
-"</sequence>\n"
-"</curve>\n"
-"</gutenprint>\n";
-
-static const char durabrite3_sat_adj[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<gutenprint>\n"
-"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-"<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
-/* C */  "1.20 1.20 1.30 1.50 1.70 1.90 2.00 2.00 "  /* B */
-/* B */  "2.00 2.00 2.00 2.00 2.00 2.00 2.00 2.00 "  /* M */
-/* M */  "2.00 1.80 1.60 1.40 1.20 1.00 1.00 1.00 "  /* R */
-/* R */  "1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 "  /* Y */
-/* Y */  "1.00 1.15 1.40 1.70 2.00 2.30 2.40 2.40 "  /* G */
-/* G */  "2.40 2.40 2.40 2.30 2.00 1.70 1.40 1.15 "  /* C */
-"</sequence>\n"
-"</curve>\n"
-"</gutenprint>\n";
-
-static const char durabrite3_lum_adj[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<gutenprint>\n"
-"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-"<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
-/* C */  "0.63 0.64 0.66 0.69 0.73 0.78 0.82 0.85 "  /* B */
-/* B */  "0.85 0.82 0.78 0.78 0.79 0.80 0.82 0.85 "  /* M */
-/* M */  "0.87 0.90 0.94 0.97 1.00 1.00 1.00 1.00 "  /* R */
-/* R */  "1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 "  /* Y */
-/* Y */  "1.00 1.00 1.00 0.99 0.98 0.97 0.95 0.93 "  /* G */
-/* G */  "0.90 0.76 0.68 0.65 0.64 0.63 0.63 0.63 "  /* C */
-"</sequence>\n"
-"</curve>\n"
-"</gutenprint>\n";
-
-static const char durabrite3_hue_adj[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<gutenprint>\n"
-"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-"<sequence count=\"48\" lower-bound=\"-6\" upper-bound=\"6\">\n"
-/* C */  "0.00 0.00 0.00 -.02 -.04 -.08 -.12 -.16 "  /* B */
-/* B */  "-.20 -.24 -.28 -.32 -.36 -.37 -.38 -.39 "  /* M */
-/* M */  "-.40 -.45 -.50 -.52 -.52 -.50 -.45 -.40 "  /* R */
-/* R */  "-.35 -.27 -.15 -.06 0.00 0.00 0.00 0.00 "  /* Y */
-/* Y */  "0.00 -.00 -.03 -.06 -.09 -.13 -.17 -.21 "  /* G */
-/* G */  "-.25 -.22 -.19 -.16 -.13 -.10 -.07 -.03 "  /* C */
-"</sequence>\n"
-"</curve>\n"
-"</gutenprint>\n";
-
-
-#define DECLARE_PAPERS(name)			\
-static const paperlist_t name##_paper_list =	\
-{						\
-  #name,					\
-  sizeof(name##_papers) / sizeof(paper_t),	\
-  name##_papers					\
+static stp_mxml_node_t *
+get_media_size_xml(const stp_vars_t *v)
+{
+  stpi_escp2_printer_t *printdef = stp_escp2_get_printer(v);
+  return printdef->media_sizes;
 }
 
-#define DECLARE_PAPER_ADJUSTMENTS(name)					\
-static const paper_adjustment_list_t name##_paper_adjustment_list =	\
-{									\
-  #name,								\
-  sizeof(name##_adjustments) / sizeof(paper_adjustment_t),		\
-  name##_adjustments							\
+int
+stp_escp2_load_media_sizes(const stp_vars_t *v, const char *name)
+{
+  stpi_escp2_printer_t *printdef = stp_escp2_get_printer(v);
+  stp_list_t *dirlist = stpi_data_path();
+  stp_list_item_t *item;
+  int found = 0;
+  item = stp_list_get_start(dirlist);
+  while (item)
+    {
+      const char *dn = (const char *) stp_list_item_get_data(item);
+      char *ffn = stpi_path_merge(dn, name);
+      stp_mxml_node_t *sizes =
+	stp_mxmlLoadFromFile(NULL, ffn, STP_MXML_NO_CALLBACK);
+      stp_free(ffn);
+      if (sizes)
+	{
+	  stp_mxml_node_t **xnode =
+	    (stp_mxml_node_t **) &(printdef->media_sizes);
+	  *xnode = sizes;
+	  found = 1;
+	  break;
+	}
+      item = stp_list_item_next(item);
+    }
+  stp_list_destroy(dirlist);
+  if (! found)
+    {
+      stp_erprintf("Unable to load media sizes from %s!\n", name);
+      stp_abort();
+    }
+  return found;
 }
 
-static const paper_adjustment_t standard_adjustments[] =
-{
-  { "Plain", 0.615, .5, 1, .075, .9, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "PlainFast", 0.615, .5, 1, .075, .9, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Postcard", 0.83, .5, 1, .075, .9, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "GlossyFilm", 1.00, 1.0, 1, .15, .999, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Transparency", 1.00, .75, 1, .15, .999, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Envelope", 0.615, .5, 1, .075, .9, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "BackFilm", 1.00, .75, 1, .15, .999, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Matte", 0.85, .8, 1.0, .15, .999, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "MatteHeavy", 1.0, 1.0, 1, .15, .999, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Inkjet", 0.85, .5, 1, .10, .9, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Coated", 1.10, 1.0, 1, .15, .999, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Photo", 1.00, 1.0, 1, .15, .999, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "GlossyPhoto", 1.10, 1.0, 1, .15, .999, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Semigloss", 1.00, 1.0, 1, .15, .999, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Luster", 1.00, 1.0, 1, .15, .999, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "GlossyPaper", 1.00, 1.0, 1, .15, .999, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Ilford", 1.0, 1.0, 1, .15, 1.35, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj  },
-  { "ColorLife", 1.00, 1.0, 1, .15, .9, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Other", 0.615, .5, 1, .075, .9, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-};
-
-DECLARE_PAPER_ADJUSTMENTS(standard);
-
-static const paper_adjustment_t photo_adjustments[] =
-{
-  { "Plain", 0.615, .25, 1, .15, .9, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "PlainFast", 0.615, .25, 1, .15, .9, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Postcard", 0.83, .25, 1, .15, .9, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "GlossyFilm", 1.00, 1.0, 1, .2, .999, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Transparency", 1.00, .75, 1, .2, .999, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Envelope", 0.615, .25, 1, .15, .9, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "BackFilm", 1.00, .75, 1, .2, .999, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Matte", 0.85, .8, 1.0, .2, .999, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "MatteHeavy", 1.0, 1.0, 1, .35, .999, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Inkjet", 0.85, .375, 1, .2, .9, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Coated", 1.10, 1.0, 1, .35, .999, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Photo", 1.00, 1.00, 1, .35, .999, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "GlossyPhoto", 1.10, 1.0, 1, .35, .999, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Semigloss", 1.00, 1.0, 1, .35, .999, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Luster", 1.00, 1.0, 1, .35, .999, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "GlossyPaper", 1.00, 1.0, 1, .35, .999, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Ilford", 1.0, 1.0, 1, .35, 1.35, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj  },
-  { "ColorLife", 1.00, 1.0, 1, .35, .9, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Other", 0.615, .25, 1, .15, .9, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-};
-
-DECLARE_PAPER_ADJUSTMENTS(photo);
-
-static const paper_adjustment_t photo2_adjustments[] =
-{
-  { "Plain", 0.738, 1.0, 0.5, .1, .9, 1, 1, 1, 1, 1, 1.0,
-    photo2_hue_adj, photo2_lum_adj, photo2_sat_adj },
-  { "PlainFast", 0.738, 1.0, 0.5, .1, .9, 1, 1, 1, 1, 1, 1.0,
-    photo2_hue_adj, photo2_lum_adj, photo2_sat_adj },
-  { "Postcard", 0.83, 1.0, 0.5, .1, .9, 1, 1, 1, 1, 1, 1.0,
-    photo2_hue_adj, photo2_lum_adj, photo2_sat_adj },
-  { "GlossyFilm", 1.00, 1.0, 0.5, .2, .999, 1, 1, 1, 1, 1, 1,
-    photo2_hue_adj, photo2_lum_adj, photo2_sat_adj },
-  { "Transparency", 1.00, 1.0, 0.25, .2, .999, 1, 1, 1, 1, 1, 1,
-    photo2_hue_adj, photo2_lum_adj, photo2_sat_adj },
-  { "Envelope", 0.738, 1.0, 0.5, .1, .9, 1, 1, 1, 1, 1, 1,
-    photo2_hue_adj, photo2_lum_adj, photo2_sat_adj },
-  { "BackFilm", 1.00, 1.0, 0.25, .2, .999, 1, 1, 1, 1, 1, 1,
-    photo2_hue_adj, photo2_lum_adj, photo2_sat_adj },
-  { "Matte", 0.85, 1.0, 0.4, .3, .999, 1, 1, 1, 1, 1, 1,
-    photo2_hue_adj, photo2_lum_adj, photo2_sat_adj },
-  { "MatteHeavy", 0.85, 1.0, .3, .2, .999, 1, 1, 1, 1, 1, 1,
-    photo2_hue_adj, photo2_lum_adj, photo2_sat_adj },
-  { "Inkjet", 0.85, 1.0, 0.5, .15, .9, 1, 1, 1, 1, 1, 1,
-    photo2_hue_adj, photo2_lum_adj, photo2_sat_adj },
-  { "Coated", 1.2, 1.0, .25, .15, .999, .89, 1, 1, .9, 1, 1.,
-    photo2_hue_adj, photo2_lum_adj, photo2_sat_adj },
-  { "Photo", 1.00, 1.0, 0.25, .2, .999, 1, 1, 1, 1, 1, 1,
-    photo2_hue_adj, photo2_lum_adj, photo2_sat_adj },
-  { "GlossyPhoto", 1.0, 1.0, 0.5, .3, .999, .9, .98, 1, .9, 1, 0.92,
-    photo2_hue_adj, photo2_lum_adj, photo2_sat_adj },
-  { "Semigloss", 1.0, 1.0, 0.5, .3, .999, .9, .98, 1, .9, 1, 0.92,
-    photo2_hue_adj, photo2_lum_adj, photo2_sat_adj },
-  { "Luster", 1.0, 1.0, 0.5, .3, .999, .9, .98, 1, .9, 1, 0.92,
-    photo2_hue_adj, photo2_lum_adj, photo2_sat_adj },
-  { "GlossyPaper", 1.00, 1.0, 0.25, .2, .999, 1, 1, 1, 1, 1, 1,
-    photo2_hue_adj, photo2_lum_adj, photo2_sat_adj },
-  { "Ilford", .85, 1.0, 0.25, .2, .999, 1, 1, 1, 1, 1, 1,
-    photo2_hue_adj, photo2_lum_adj, photo2_sat_adj  },
-  { "ColorLife", 1.00, 1.0, 0.25, .2, .9, 1, 1, 1, 1, 1, 1,
-    photo2_hue_adj, photo2_lum_adj, photo2_sat_adj },
-  { "Other", 0.738, 1.0, 0.5, .1, .9, 1, 1, 1, 1, 1, 1,
-    photo2_hue_adj, photo2_lum_adj, photo2_sat_adj },
-};
-
-DECLARE_PAPER_ADJUSTMENTS(photo2);
-
-static const paper_adjustment_t photo3_adjustments[] =
-{
-  { "Plain",        0.615, .35, 0.75, .15, .9, 1, .85, .85, .9, 1, 1.0,
-    photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
-  { "PlainFast",    0.615, .35, 0.75, .15, .9, 1, .85, .85, .9, 1, 1.0,
-    photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
-  { "Postcard",     0.692, .35, 0.5, .2, .9, 1, .85, .85, .9, 1, 1.0,
-    photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
-  { "GlossyFilm",   0.833, .5, 0.75, .2, .999, 1, .7, .8, .9, 1, 1,
-    photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
-  { "Transparency", 0.833, .35, 0.75, .2, .999, 1, .59, .7, .9, 1, 1,
-    photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
-  { "Envelope",     0.615, .35, 0.75, .15, .9, 1, .85, .85, .9, 1, 1.0,
-    photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
-  { "BackFilm",     0.833, .5, 0.75, .2, .999, 1, .59, .7, .9, 1, 1,
-    photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
-  { "Matte",        0.833, .35, 0.5, .25, .999, 1, .67, .72, .9, 1, 1,
-    photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
-  { "MatteHeavy",   0.833, .35, 0.5, .25, .999, 1, .85, .85, .9, 1, 1,
-    photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
-  { "Inkjet",       0.709, .5, 0.75, .2, .9, 1, .85, .85, .9, 1, 1,
-    photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
-  { "Coated",       0.833, .45, 0.5, .25, .999, 1, .76, .84, .66, 1, 1,
-    photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
-  { "Photo",        0.833, .5, 0.5, .25, .999, 1, .59, .7, .9, 1, 1,
-    photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
-  { "GlossyPhoto",  0.75, .5, 0.3, .25, 1.05, 1, .85, .85, .66, 1, 0.92,
-    photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
-  { "Semigloss",    0.75, .5, 0.3, .25, .999, 1, .85, .85, .66, 1, 0.92,
-    photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
-  { "Luster",       0.75, .5, 0.3, .25, .999, 1, .85, .85, .66, 1, 0.92,
-    photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
-  { "GlossyPaper",  0.833, .5, 0.75, .2, .999, 1, .59, .7, .9, 1, 1,
-    photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
-  { "Ilford",       0.833, .5, 0.75, .2, .999, 1, .59, .7, .9, 1, 1,
-    photo3_hue_adj, photo3_lum_adj, photo3_sat_adj  },
-  { "ColorLife",    0.833, .5, 0.75, .2, .9, 1, .59, .7, .9, 1, 1,
-    photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
-  { "Other",        0.615, .35, 0.5, .5, .9, 1, .85, .85, .9, 1, 1,
-    photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
-};
-
-DECLARE_PAPER_ADJUSTMENTS(photo3);
-
-static const paper_adjustment_t claria_adjustments[] =
-{
-  { "Plain",        0.540, .25, 0.75, .1, .5, 1, .7, .7, 1, 1, 1.0,
-    claria_hue_adj, claria_lum_adj, claria_sat_adj },
-  { "PlainFast",    0.540, .25, 0.75, .1, .5, 1, .7, .7, 1, 1, 1.0,
-    claria_hue_adj, claria_lum_adj, claria_sat_adj },
-  { "Postcard",     0.692, .25, 0.5, .1, .5, 1, .7, .7, 1, 1, 1.0,
-    claria_hue_adj, claria_lum_adj, claria_sat_adj },
-  { "GlossyFilm",   0.833, .25, 0.75, .2, .999, 1, .7, .7, 1, 1, 1,
-    claria_hue_adj, claria_lum_adj, claria_sat_adj },
-  { "Transparency", 0.833, .25, 0.75, .2, .999, 1, .7, .7, 1, 1, 1,
-    claria_hue_adj, claria_lum_adj, claria_sat_adj },
-  { "Envelope",     0.540, .25, 0.75, .1, .5, 1, .7, .7, 1, 1, 1.0,
-    claria_hue_adj, claria_lum_adj, claria_sat_adj },
-  { "BackFilm",     0.833, .25, 0.75, .2, .999, 1, .7, .7, 1, 1, 1,
-    claria_hue_adj, claria_lum_adj, claria_sat_adj },
-  { "Matte",        0.833, .25, 0.6, .15, .999, 1, .7, .7, 1, 1, 1,
-    claria_hue_adj, claria_lum_adj, claria_sat_adj },
-  { "MatteHeavy",   0.833, .25, 0.5, .25, .999, 1, .7, .7, 1, 1, 1,
-    claria_hue_adj, claria_lum_adj, claria_sat_adj },
-  { "Inkjet",       0.709, .25, 0.75, .15, .75, 1, .7, .7, 1, 1, 1,
-    claria_hue_adj, claria_lum_adj, claria_sat_adj },
-  { "Coated",       0.833, .25, 0.5, .25, .999, 1, .7, .7, 1, 1, 1,
-    claria_hue_adj, claria_lum_adj, claria_sat_adj },
-  { "Photo",        0.833, .25, 0.5, .25, .999, 1, .7, .7, 1, 1, 1,
-    claria_hue_adj, claria_lum_adj, claria_sat_adj },
-  { "GlossyPhoto",  0.75, .25, 0.3, .25, .999, 1, .7, .7, 1, 1, 0.92,
-    claria_hue_adj, claria_lum_adj, claria_sat_adj },
-  { "Semigloss",    0.75, .25, 0.3, .25, .999, 1, .7, .7, 1, 1, 0.92,
-    claria_hue_adj, claria_lum_adj, claria_sat_adj },
-  { "Luster",       0.75, .25, 0.3, .25, .999, 1, .7, .7, 1, 1, 0.92,
-    claria_hue_adj, claria_lum_adj, claria_sat_adj },
-  { "GlossyPaper",  0.833, .25, 0.75, .2, .999, 1, .7, .7, 1, 1, 1,
-    claria_hue_adj, claria_lum_adj, claria_sat_adj },
-  { "Ilford",       0.833, .25, 0.75, .2, .999, 1, .7, .7, 1, 1, 1,
-    claria_hue_adj, claria_lum_adj, claria_sat_adj  },
-  { "ColorLife",    0.833, .25, 0.75, .2, .9, 1, .7, .7, 1, 1, 1,
-    claria_hue_adj, claria_lum_adj, claria_sat_adj },
-  { "Other",        0.540, .25, 0.5, .1, .5, 1, .7, .7, 1, 1, 1,
-    claria_hue_adj, claria_lum_adj, claria_sat_adj },
-};
-
-DECLARE_PAPER_ADJUSTMENTS(claria);
-
-static const paper_adjustment_t sp960_adjustments[] =
-{
-  { "Plain",        0.86, .2,  0.4, .1,   .9,   .9, 1, 1, 1, 1, 1,
-    sp960_matte_hue_adj, sp960_matte_lum_adj, sp960_matte_sat_adj },
-  { "PlainFast",    0.86, .2,  0.4, .1,   .9,   1, 1, 1, 1, 1, 1,
-    sp960_matte_hue_adj, sp960_matte_lum_adj, sp960_matte_sat_adj },
-  { "Postcard",     0.90, .2,  0.4, .1,   .9,   .9, 1, 1, 1, 1, 1,
-    sp960_matte_hue_adj, sp960_matte_lum_adj, sp960_matte_sat_adj },
-  { "GlossyFilm",   0.9,  .3,  0.4, .2,   .999, 1, 1, 1, 1, 1, 1,
-    sp960_matte_hue_adj, sp960_matte_lum_adj, sp960_matte_sat_adj },
-  { "Transparency", 0.9,  .2,  0.4, .1,   .9,   1, 1, 1, 1, 1, 1,
-    sp960_matte_hue_adj, sp960_matte_lum_adj, sp960_matte_sat_adj },
-  { "Envelope",     0.86, .2,  0.4, .1,   .9,   1, 1, 1, 1, 1, 1,
-    sp960_matte_hue_adj, sp960_matte_lum_adj, sp960_matte_sat_adj },
-  { "BackFilm",     0.9,  .2,  0.4, .1,   .9,   1, 1, 1, 1, 1, 1,
-    sp960_matte_hue_adj, sp960_matte_lum_adj, sp960_matte_sat_adj },
-  { "Matte",        0.9,  .25, 0.4, .2,   .9,   1, 1, 1, 1, 1, 1,
-    sp960_matte_hue_adj, sp960_matte_lum_adj, sp960_matte_sat_adj },
-  { "MatteHeavy",   0.9,  .3,  0.4, .2,   .999, 1, 1, 1, 1, 1, 1,
-    sp960_matte_hue_adj, sp960_matte_lum_adj, sp960_matte_sat_adj },
-  { "Inkjet",       0.9,  .2,  0.4, .15,  .9,   1, 1, 1, 1, 1, 1,
-    sp960_matte_hue_adj, sp960_matte_lum_adj, sp960_matte_sat_adj },
-  { "Coated",       0.9,  .3,  0.4, .2,   .999, 1, 1, 1, 1, 1, 1,
-    sp960_matte_hue_adj, sp960_matte_lum_adj, sp960_matte_sat_adj },
-  { "Photo",        0.9,  .3,  0.4, .2,   .999, 1, 1, 1, 1, 1, 1,
-    sp960_matte_hue_adj, sp960_matte_lum_adj, sp960_matte_sat_adj },
-  { "GlossyPhoto",  0.9,  .3,  0.4, .2,   .999, 1, 1, 1, 1, 1, 1,
-    sp960_hue_adj, sp960_lum_adj, sp960_sat_adj },
-  { "Semigloss",    0.9,  .3,  0.4, .2,   .999, 1, 1, 1, 1, 1, 1,
-    sp960_hue_adj, sp960_lum_adj, sp960_sat_adj },
-  { "Luster",       0.9,  .3,  0.4, .2,   .999, 1, 1, 1, 1, 1, 1,
-    sp960_hue_adj, sp960_lum_adj, sp960_sat_adj },
-  { "GlossyPaper",  0.9,  .3,  0.4, .15,  .9,   1, 1, 1, 1, 1, 1,
-    sp960_matte_hue_adj, sp960_matte_lum_adj, sp960_matte_sat_adj },
-  { "Ilford",       0.85, .3,  0.4, .15, 1.35,  1, 1, 1, 1, 1, 1,
-    sp960_matte_hue_adj, sp960_matte_lum_adj, sp960_matte_sat_adj  },
-  { "ColorLife",    0.9,  .3,  0.4, .15,  .9,   1, 1, 1, 1, 1, 1,
-    sp960_matte_hue_adj, sp960_matte_lum_adj, sp960_matte_sat_adj },
-  { "Other",        0.86, .2,  0.4, .1,   .9,   1, 1, 1, 1, 1, 1,
-    sp960_matte_hue_adj, sp960_matte_lum_adj, sp960_matte_sat_adj },
-};
-
-DECLARE_PAPER_ADJUSTMENTS(sp960);
-
-static const paper_adjustment_t ultrachrome_photo_adjustments[] =
-{
-  { "Plain", 0.72, .1, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
-    ultra_matte_hue_adj, ultra_matte_lum_adj, ultra_matte_sat_adj },
-  { "PlainFast", 0.72, .1, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
-    ultra_matte_hue_adj, ultra_matte_lum_adj, ultra_matte_sat_adj },
-  { "Postcard", 0.72, .1, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
-    ultra_matte_hue_adj, ultra_matte_lum_adj, ultra_matte_sat_adj },
-  { "GlossyFilm", 0.83, 1.0, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
-    ultra_matte_hue_adj, ultra_matte_lum_adj, ultra_matte_sat_adj },
-  { "Transparency", 0.83, .75, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
-    ultra_matte_hue_adj, ultra_matte_lum_adj, ultra_matte_sat_adj },
-  { "Envelope", 0.72, .1, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
-    ultra_matte_hue_adj, ultra_matte_lum_adj, ultra_matte_sat_adj },
-  { "BackFilm", 0.83, .75, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
-    ultra_matte_hue_adj, ultra_matte_lum_adj, ultra_matte_sat_adj },
-  { "Matte", 0.92, 0.4, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
-    ultra_matte_hue_adj, ultra_matte_lum_adj, ultra_matte_sat_adj },
-  { "MatteHeavy", 0.92, 0.4, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
-    ultra_matte_hue_adj, ultra_matte_lum_adj, ultra_matte_sat_adj },
-  { "Inkjet", 0.72, .5, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
-    ultra_matte_hue_adj, ultra_matte_lum_adj, ultra_matte_sat_adj },
-  { "Coated", 0.83, .5, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
-    ultra_matte_hue_adj, ultra_matte_lum_adj, ultra_matte_sat_adj },
-  { "Photo", 1.0, .75, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
-    ultra_matte_hue_adj, ultra_matte_lum_adj, ultra_matte_sat_adj },
-  { "GlossyPhoto", 0.72, 1, 1, .01, 1.8, 1, 1, 1, 1, 1, .92,
-    ultra_glossy_hue_adj, ultra_glossy_lum_adj, ultra_glossy_sat_adj },
-  { "Semigloss", 0.72, .8, 1, .01, 1.8, 1, 1, 1, 1, 1, .92,
-    ultra_glossy_hue_adj, ultra_glossy_lum_adj, ultra_glossy_sat_adj },
-  { "Luster", 0.72, .8, 1, .01, 1.8, 1, 1, 1, 1, 1, .92,
-    ultra_glossy_hue_adj, ultra_glossy_lum_adj, ultra_glossy_sat_adj },
-  { "ArchivalMatte", 0.92, .4, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
-    ultra_matte_hue_adj, ultra_matte_lum_adj, ultra_matte_sat_adj },
-  { "WaterColorRadiant", 0.92, .4, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
-    ultra_matte_hue_adj, ultra_matte_lum_adj, ultra_matte_sat_adj },
-  { "GlossyPaper", 0.83, 1.0, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
-    ultra_matte_hue_adj, ultra_matte_lum_adj, ultra_matte_sat_adj },
-  { "Ilford", 0.83, 1.0, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
-    ultra_matte_hue_adj, ultra_matte_lum_adj, ultra_matte_sat_adj  },
-  { "ColorLife", 0.83, 1.0, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
-    ultra_matte_hue_adj, ultra_matte_lum_adj, ultra_matte_sat_adj },
-  { "Other", 0.72, .1, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
-    ultra_matte_hue_adj, ultra_matte_lum_adj, ultra_matte_sat_adj },
-};
-
-DECLARE_PAPER_ADJUSTMENTS(ultrachrome_photo);
-
-static const paper_adjustment_t ultrachrome_matte_adjustments[] =
-{
-  { "Plain", 0.72, .1, 1, 0, 0.5, 1, 1, 1, .6, 1, 1.0,
-    ultra_matte_hue_adj, ultra_matte_lum_adj, ultra_matte_sat_adj },
-  { "PlainFast", 0.72, .1, 1, 0, 0.5, 1, 1, 1, .6, 1, 1.0,
-    ultra_matte_hue_adj, ultra_matte_lum_adj, ultra_matte_sat_adj },
-  { "Postcard", 0.72, .1, 1, 0, 0.5, 1, 1, 1, .6, 1, 1.0,
-    ultra_matte_hue_adj, ultra_matte_lum_adj, ultra_matte_sat_adj },
-  { "GlossyFilm", 0.83, .5, 1, 0.01, 0.5, 1, 1, 1, .6, 1, 1.0,
-    ultra_matte_hue_adj, ultra_matte_lum_adj, ultra_matte_sat_adj },
-  { "Transparency", 0.83, .5, 1, 0.01, 0.5, 1, 1, 1, .6, 1, 1.0,
-    ultra_matte_hue_adj, ultra_matte_lum_adj, ultra_matte_sat_adj },
-  { "Envelope", 0.72, .1, 1, 0, 0.5, 1, 1, 1, .6, 1, 1.0,
-    ultra_matte_hue_adj, ultra_matte_lum_adj, ultra_matte_sat_adj },
-  { "BackFilm", 0.83, .5, 1, 0.01, 0.5, 1, 1, 1, .6, 1, 1.0,
-    ultra_matte_hue_adj, ultra_matte_lum_adj, ultra_matte_sat_adj },
-  { "Matte", 0.92, 0.4, 1, 0.00, 1.25, 1, 1, 1, .6, 1, 1.0,
-    ultra_matte_hue_adj, ultra_matte_lum_adj, ultra_matte_sat_adj },
-  { "MatteHeavy", 0.92, 0.4, .4, .01, 0.5, 1, 1, 1, .6, 1, 1.0,
-    ultra_matte_hue_adj, ultra_matte_lum_adj, ultra_matte_sat_adj },
-  { "Inkjet", 0.72, .3, 1, .01, 0.5, 1, 1, 1, .6, 1, 1.0,
-    ultra_matte_hue_adj, ultra_matte_lum_adj, ultra_matte_sat_adj },
-  { "Coated", 0.83, .4, 1, .01, 0.5, 1, 1, 1, .6, 1, 1.0,
-    ultra_matte_hue_adj, ultra_matte_lum_adj, ultra_matte_sat_adj },
-  { "Photo", 1.0, 0.5, 1, 0.01, 0.5, 1, 1, 1, .6, 1, 1.0,
-    ultra_matte_hue_adj, ultra_matte_lum_adj, ultra_matte_sat_adj },
-  { "GlossyPhoto", 0.72, 1, 1, .01, 0.5, 1, 1, 1, .6, 1, .92,
-    ultra_glossy_hue_adj, ultra_glossy_lum_adj, ultra_glossy_sat_adj },
-  { "Semigloss", 0.72, .8, 1, .01, 0.5, 1, 1, 1, .6, 1, .92,
-    ultra_glossy_hue_adj, ultra_glossy_lum_adj, ultra_glossy_sat_adj },
-  { "Luster", 0.72, .8, 1, .01, 0.5, 1, 1, 1, 1, 1, .92,
-    ultra_glossy_hue_adj, ultra_glossy_lum_adj, ultra_glossy_sat_adj },
-  { "WaterColorRadiant", 0.92, 0.4, 1, .01, 0.5, 1, 1, 1, .6, 1, 1.0,
-    ultra_matte_hue_adj, ultra_matte_lum_adj, ultra_matte_sat_adj },
-  { "GlossyPaper", 0.83, 0.5, 1, 0.01, 0.5, 1, 1, 1, .6, 1, 1.0,
-    ultra_matte_hue_adj, ultra_matte_lum_adj, ultra_matte_sat_adj },
-  { "Ilford", 0.83, 0.5, 1, 0.01, 0.5, 1, 1, 1, .6, 1, 1.0,
-    ultra_matte_hue_adj, ultra_matte_lum_adj, ultra_matte_sat_adj  },
-  { "ColorLife", 0.83, 0.5, 1, 0.01, 0.5, 1, 1, 1, .6, 1, 1.0,
-    ultra_matte_hue_adj, ultra_matte_lum_adj, ultra_matte_sat_adj },
-  { "Other", 0.72, .1, .4, 0, 0.5, 1, 1, 1, .6, 1, 1.0,
-    ultra_matte_hue_adj, ultra_matte_lum_adj, ultra_matte_sat_adj },
-};
-
-DECLARE_PAPER_ADJUSTMENTS(ultrachrome_matte);
-
-static const paper_adjustment_t ultrachrome_k3_photo_adjustments[] =
-{
-  { "Plain", 0.72, .8, 1, .01, 1.5, 1, .95, .9, 1, 1, 1.0,
-    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "PlainFast", 0.72, .8, 1, .01, 1.5, 1, .95, .9, 1, 1, 1.0,
-    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "Postcard", 0.72, .8, 1, .01, 1.5, 1, .95, .9, 1, 1, 1.0,
-    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "GlossyFilm", 0.83, 1.0, 1, .01, 1.5, 1, .95, .9, 1, 1, 1.0,
-    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "Transparency", 0.83, .75, 1, .01, 1.5, 1, .95, .9, 1, 1, 1.0,
-    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "Envelope", 0.72, .8, 1, .01, 1.5, 1, .95, .9, 1, 1, 1.0,
-    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "BackFilm", 0.83, .75, 1, .01, 1.5, 1, .95, .9, 1, 1, 1.0,
-    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "Matte", 0.92, 0.8, 1, .01, 1.5, 1, .95, .9, 1, 1, 1.0,
-    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "MatteHeavy", 0.92, 0.8, 1, .01, 1.5, 1, .95, .9, 1, 1, 1.0,
-    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "Inkjet", 0.72, .8, 1, .01, 1.5, 1, .95, .9, 1, 1, 1.0,
-    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "Coated", 0.83, .8, 1, .01, 1.5, 1, .95, .9, 1, 1, 1.0,
-    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "Photo", 1.0, .5, 1, .01, 1.5, 1, .95, .9, 1, 1, 1.0,
-    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "GlossyPhoto", 0.72, .8, 1, .01, 1.8, 1, .95, .9, 1, 1, .92,
-    ultra_k3_glossy_hue_adj, ultra_k3_glossy_lum_adj, ultra_k3_glossy_sat_adj },
-  { "Semigloss", 0.72, .8, 1, .01, 1.8, 1, .95, .9, 1, 1, .92,
-    ultra_k3_glossy_hue_adj, ultra_k3_glossy_lum_adj, ultra_k3_glossy_sat_adj },
-  { "Luster", 0.72, .8, 1, .01, 1.8, 1, .95, .9, 1, 1, .92,
-    ultra_k3_glossy_hue_adj, ultra_k3_glossy_lum_adj, ultra_k3_glossy_sat_adj },
-  { "ArchivalMatte", 0.92, .8, 1, .01, 1.5, 1, .95, .9, 1, 1, 1.0,
-    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "WaterColorRadiant", 0.92, .8, 1, .01, 1.5, 1, .95, .9, 1, 1, 1.0,
-    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "GlossyPaper", 0.83, 1.0, 1, .01, 1.5, 1, .95, .9, 1, 1, 1.0,
-    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "Ilford", 0.83, 1.0, 1, .01, 1.5, 1, .95, .9, 1, 1, 1.0,
-    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj  },
-  { "ColorLife", 0.83, 1.0, 1, .01, 1.5, 1, .95, .9, 1, 1, 1.0,
-    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "Other", 0.72, .1, 1, .01, 1.5, 1, .95, .9, 1, 1, 1.0,
-    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-};
-
-DECLARE_PAPER_ADJUSTMENTS(ultrachrome_k3_photo);
-
-static const paper_adjustment_t ultrachrome_k3_matte_adjustments[] =
-{
-  { "Plain", 0.72, .1, 1, 0, 1.25, 1, .95, .9, 1, 1, 1.0,
-    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "PlainFast", 0.72, .1, 1, 0, 1.25, 1, .95, .9, 1, 1, 1.0,
-    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "Postcard", 0.72, .1, 1, 0, 1.25, 1, .95, .9, 1, 1, 1.0,
-    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "GlossyFilm", 0.83, .5, 1, 0.00, 1.25, 1, .95, .9, 1, 1, 1.0,
-    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "Transparency", 0.83, .5, 1, 0.00, 1.25, 1, .95, .9, 1, 1, 1.0,
-    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "Envelope", 0.72, .1, 1, 0, 1.25, 1, .95, .9, 1, 1, 1.0,
-    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "BackFilm", 0.83, .5, 1, 0.00, 1.25, 1, .95, .9, 1, 1, 1.0,
-    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "Matte", 0.92, 0.5, 1, 0.00, 1.25, 1, .95, .9, 1, 1, 1.0,
-    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "MatteHeavy", 0.92, 0.5, 1, .00, 1.25, 1, .95, .9, 1, 1, 1.0,
-    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "Inkjet", 0.72, .3, 1, .00, 1.25, 1, .95, .9, 1, 1, 1.0,
-    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "Coated", 0.83, .4, 1, .00, 1.25, 1, .95, .9, 1, 1, 1.0,
-    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "Photo", 1.0, 0.5, 1, 0.00, 1.25, 1, .95, .9, 1, 1, 1.0,
-    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "GlossyPhoto", 0.72, 1, 1, .00, 1.25, 1, .95, .9, 1, 1, .92,
-    ultra_k3_glossy_hue_adj, ultra_k3_glossy_lum_adj, ultra_k3_glossy_sat_adj },
-  { "Semigloss", 0.72, .8, 1, .00, 1.25, 1, .95, .9, 1, 1, .92,
-    ultra_k3_glossy_hue_adj, ultra_k3_glossy_lum_adj, ultra_k3_glossy_sat_adj },
-  { "Luster", 0.72, .8, 1, .00, 1.25, 1, .95, .9, 1, 1, .92,
-    ultra_k3_glossy_hue_adj, ultra_k3_glossy_lum_adj, ultra_k3_glossy_sat_adj },
-  { "WaterColorRadiant", 0.92, 0.4, 1, .00, 1.25, 1, .95, .9, 1, 1, 1.0,
-    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "GlossyPaper", 0.83, 0.5, 1, 0.00, 1.25, 1, .95, .9, 1, 1, 1.0,
-    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "Ilford", 0.83, 0.5, 1, 0.00, 1.25, 1, .95, .9, 1, 1, 1.0,
-    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj  },
-  { "ColorLife", 0.83, 0.5, 1, 0.00, 1.25, 1, .95, .9, 1, 1, 1.0,
-    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "Other", 0.72, .1, .4, 0, 1.25, 1, .95, .9, 1, 1, 1.0,
-    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-};
-
-DECLARE_PAPER_ADJUSTMENTS(ultrachrome_k3_matte);
-
-static const paper_adjustment_t r800_photo_adjustments[] =
-{
-  { "Plain", 0.72, .1, 1, .02, 1.4, .882, 1, .250, 1, 1, 1.0,
-    r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "PlainFast", 0.72, .1, 1, .02, 1.4, .882, 1, .250, 1, 1, 1.0,
-    r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "Postcard", 0.72, .1, 1, .02, 1.4, .882, 1, .250, 1, 1, 1.0,
-    r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "GlossyFilm", 0.83, 1.0, 1, .02, 1.4, .882, 1, .250, 1, 1, 1.0,
-    r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "Transparency", 0.83, .75, 1, .02, 1.4, .882, 1, .250, 1, 1, 1.0,
-    r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "Envelope", 0.72, .1, 1, .02, 1.4, .882, 1, .250, 1, 1, 1.0,
-    r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "BackFilm", 0.83, .75, 1, .02, 1.4, .882, 1, .250, 1, 1, 1.0,
-    r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "Matte", 0.92, .4, 1, .02, 1.4, .882, 1, .250, 1, 1, 1.0,
-    r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "MatteHeavy", 0.92, .4, 1, .02, 1.4, .882, 1, .250, 1, 1, 1.0,
-    r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "Glossy", 0.92, 0.4, 1, .02, 1.4, .882, 1, .250, 1, 1, 1.0,
-    r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "GlossyHeavy", 0.92, 0.4, 1, .02, 1.4, .882, 1, .250, 1, 1, 1.0,
-    r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "Inkjet", 0.72, .5, 1, .02, 1.4, .882, 1, .250, 1, 1, 1.0,
-    r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "Coated", 0.83, .5, 1, .02, 1.4, .882, 1, .250, 1, 1, 1.0,
-    r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "Photo", 1.0, .75, 1, .02, 1.4, .882, 1, .250, 1, 1, 1.0,
-    r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "GlossyPhoto", 0.600, 1, 1, .02, 2.0, .882, 1, .250, 1, 1, 0.92,
-    r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "Semigloss", 0.600, .8, 1, .02, 2.0, .882, 1, .250, 1, 1, 0.92,
-    r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "Luster", 0.600, .8, 1, .02, 2.0, .882, 1, .250, 1, 1, 0.92,
-    r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "ArchivalGlossy", 0.92, .4, 1, .02, 1.4, .882, 1, .250, 1, 1, 1.0,
-    r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "WaterColorRadiant", 0.92, .4, 1, .02, 1.4, .882, 1, .250, 1, 1, 1.0,
-    r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "ArchivalMatte", 0.92, .4, 1, .02, 1.4, .882, 1, .250, 1, 1, 1.0,
-    r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "GlossyPaper", 0.83, 1.0, 1, .02, 1.4, .882, 1, .250, 1, 1, 1.0,
-    r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "Ilford", 0.83, 1.0, 1, .02, 1.4, .882, 1, .250, 1, 1, 1.0,
-    r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj  },
-  { "ColorLife", 0.83, 1.0, 1, .02, 1.4, .882, 1, .250, 1, 1, 1.0,
-    r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "Other", 0.72, .1, 1, .02, 1.4, .882, 1, .250, 1, 1, 1.0,
-    r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-};
-
-DECLARE_PAPER_ADJUSTMENTS(r800_photo);
-
-static const paper_adjustment_t r800_matte_adjustments[] =
-{
-  { "Plain", 0.72, .1, .5, .025, .999, .882, 1, .250, 1, 1, 1.0,
-    r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj },
-  { "PlainFast", 0.72, .1, .5, .025, .999, .882, 1, .250, 1, 1, 1.0,
-    r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj },
-  { "Postcard", 0.72, .1, .5, .025, .999, .882, 1, .250, 1, 1, 1.0,
-    r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj },
-  { "GlossyFilm", 0.83, .5, .5, .025, .999, .882, 1, .250, 1, 1, 1.0,
-    r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj },
-  { "Transparency", 0.83, .5, .5, .025, .999, .882, 1, .250, 1, 1, 1.0,
-    r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj },
-  { "Envelope", 0.72, .1, .5, .025, .999, .882, 1, .250, 1, 1, 1.0,
-    r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj },
-  { "BackFilm", 0.83, .5, .5, .025, .999, .882, 1, .250, 1, 1, 1.0,
-    r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj },
-  { "Matte", 0.92, 0.4, .5, .025, .999, .882, 1, .250, 1, 1, 1.0,
-    r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj },
-  { "MatteHeavy", 0.92, 0.4, .5, .025, .999, .882, 1, .250, 1, 1, 1.0,
-    r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj },
-  { "Inkjet", 0.72, .3, .5, .025, .999, .882, 1, .250, 1, 1, 1.0,
-    r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj },
-  { "Coated", 0.83, .4, .5, .025, .999, .882, 1, .250, 1, 1, 1.0,
-    r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj },
-  { "Photo", 1.0, 0.5, .5, .025, .999, .882, 1, .250, 1, 1, 1.0,
-    r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj },
-  { "GlossyPhoto", 0.546, 1, .5, .025, .999, .882, 1, .250, 1, 1, 0.92,
-    r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "Semigloss", 0.546, .8, .5, .025, .999, .882, 1, .250, 1, 1, 0.92,
-    r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "Luster", 0.546, .8, .5, .025, .999, .882, 1, .250, 1, 1, 0.92,
-    r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "ArchivalMatte", 0.92, 0.4, .5, .025, .999, .882, 1, .250, 1, 1, 1.0,
-    r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj },
-  { "WaterColorRadiant", 0.92, 0.4, .5, .025, .999, .882, 1, .250, 1, 1, 1.0,
-    r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj },
-  { "GlossyPaper", 0.83, 0.5, .5, .025, .999, .882, 1, .250, 1, 1, 1.0,
-    r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj },
-  { "Ilford", 0.83, 0.5, .5, .025, .999, .882, 1, .250, 1, 1, 1.0,
-    r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj  },
-  { "ColorLife", 0.83, 0.5, .5, .025, .999, .882, 1, .250, 1, 1, 1.0,
-    r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj },
-  { "Other", 0.72, .1, .5, .025, .999, .882, 1, .250, 1, 1, 1.0,
-    r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj },
-};
-
-DECLARE_PAPER_ADJUSTMENTS(r800_matte);
-
-static const paper_adjustment_t picturemate_6_adjustments[] =
-{
-  { "GlossyPhoto", 1.00, 1, 1, .02, 2.0, .882, 1, .250, 1, 1, 0.92,
-    r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "Other", 0.878, .1, 1, .02, 2.0, .882, 1, .250, 1, 1, 1.0,
-    r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-};
-
-DECLARE_PAPER_ADJUSTMENTS(picturemate_6);
-
-static const paper_adjustment_t picturemate_4_adjustments[] =
-{
-  { "GlossyPhoto", 1.00, 1, 1, .02, 2.0, .882, 1, .250, 1, 1, 0.92,
-    r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "Other", 0.878, .1, 1, .02, 2.0, .882, 1, .250, 1, 1, 1.0,
-    r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-};
-
-DECLARE_PAPER_ADJUSTMENTS(picturemate_4);
-
-static const paper_adjustment_t durabrite_adjustments[] =
-{
-  { "Plain", 1.0, .5, .5, .05, .9, 1, 1, 1, 1, 1, 1.0,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "PlainFast", 1.0, .5, .5, .05, .9, 1, 1, 1, 1, 1, 1.0,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Postcard", 1.0, .5, 1, .05, .9, 1, 1, 1, 1, 1, 1.0,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "GlossyFilm", 0.8, 1.0, 1, .05, .999, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Transparency", 0.8, .75, 1, .05, .999, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Envelope", 1.0, .5, 1, .05, .9, 1, 1, 1, 1, 1, 1.0,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "BackFilm", 0.8, .75, 1, .05, .999, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Matte", 0.9, .5, .5, .075, .999, 1, .975, .975, 1, 1, 1.1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "MatteHeavy", 0.9, .5, .5, .075, .999, 1, .975, .975, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Inkjet", 1.0, .5, .5, .05, .9, 1, 1, 1, 1, 1, 1.0,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Coated", 1.0, .5, .5, .075, .999, 1, 1, 1, 1, 1, 1.1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Photo", .833, .5, .5, .075, .999, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "GlossyPhoto", .833, 1.0, 1, .15, .999, 1, 1, 1, 1, 1, .92,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Semigloss", .833, 1.0, 1, .15, .999, 1, 1, 1, 1, 1, .92,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Luster", .833, 1.0, 1, .15, .999, 1, 1, 1, 1, 1, .92,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "GlossyPaper", .833, 1.0, 1, .15, .999, 1, 1, 1, 1, 1, 1.0,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Ilford", .833, 1.0, 1, .15, 1.35, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj  },
-  { "ColorLife", .833, 1.0, 1, .15, .9, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Other", 1.0, .5, 1, .05, .9, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-};
-
-DECLARE_PAPER_ADJUSTMENTS(durabrite);
-
-static const paper_adjustment_t durabrite2_adjustments[] =
-{
-  { "Plain", 1.0, .5, .5, .05, .9, 1, 1, 1, 1, 1, 1.0,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "PlainFast", 1.0, .5, .5, .05, .9, 1, 1, 1, 1, 1, 1.0,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Postcard", 1.0, .5, 1, .05, .9, 1, 1, 1, 1, 1, 1.0,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "GlossyFilm", 0.8, 1.0, 1, .05, .999, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Transparency", 0.8, .75, 1, .05, .999, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Envelope", 1.0, .5, 1, .05, .9, 1, 1, 1, 1, 1, 1.0,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "BackFilm", 0.8, .75, 1, .05, .999, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Matte", 0.9, .5, .5, .075, .999, 1, .975, .975, 1, 1, 1.0,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "MatteHeavy", 0.9, .5, .5, .075, .999, 1, .975, .975, 1, 1, 1.0,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Inkjet", 1.0, .5, .5, .05, .9, 1, 1, 1, 1, 1, 1.0,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Coated", 1.0, .5, .5, .075, .999, 1, 1, 1, 1, 1, 1.0,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Photo", .833, .5, .5, .075, .999, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "GlossyPhoto", .833, 1.0, 1, .15, .999, 1, 1, 1, 1, 1, .92,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Semigloss", .833, 1.0, 1, .15, .999, 1, 1, 1, 1, 1, .92,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Luster", .833, 1.0, 1, .15, .999, 1, 1, 1, 1, 1, .92,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "GlossyPaper", .833, 1.0, 1, .15, .999, 1, 1, 1, 1, 1, 1.0,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Ilford", .833, 1.0, 1, .15, 1.35, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj  },
-  { "ColorLife", .833, 1.0, 1, .15, .9, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Other", 1.0, .5, 1, .05, .9, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-};
-
-DECLARE_PAPER_ADJUSTMENTS(durabrite2);
-
-static const paper_adjustment_t durabrite3_adjustments[] =
-{
-  { "Plain", 0.72, .5, .75, .05, .9, 1, 1, 1, 1, 1, 1.0,
-    durabrite3_hue_adj, durabrite3_lum_adj, durabrite3_sat_adj },
-  { "PlainFast", 0.72, .75, .5, .05, .9, 1, 1, 1, 1, 1, 1.0,
-    durabrite3_hue_adj, durabrite3_lum_adj, durabrite3_sat_adj },
-  { "Postcard", 0.72, .75, 1, .05, .9, 1, 1, 1, 1, 1, 1.0,
-    durabrite3_hue_adj, durabrite3_lum_adj, durabrite3_sat_adj },
-  { "GlossyFilm", 0.83, 1.0, 1, .05, .999, 1, 1, 1, 1, 1, 1,
-    durabrite3_hue_adj, durabrite3_lum_adj, durabrite3_sat_adj },
-  { "Transparency", 0.83, .75, 1, .05, .999, 1, 1, 1, 1, 1, 1,
-    durabrite3_hue_adj, durabrite3_lum_adj, durabrite3_sat_adj },
-  { "Envelope", 0.72, .75, 1, .05, .9, 1, 1, 1, 1, 1, 1.0,
-    durabrite3_hue_adj, durabrite3_lum_adj, durabrite3_sat_adj },
-  { "BackFilm", 0.83, .75, 1, .05, .999, 1, 1, 1, 1, 1, 1,
-    durabrite3_hue_adj, durabrite3_lum_adj, durabrite3_sat_adj },
-  { "Matte", 0.92, .5, .85, .075, .999, 1, .975, .975, 1, 1, 1.0,
-    durabrite3_hue_adj, durabrite3_lum_adj, durabrite3_sat_adj },
-  { "MatteHeavy", 0.92, .85, .5, .075, .999, 1, .975, .975, 1, 1, 1.0,
-    durabrite3_hue_adj, durabrite3_lum_adj, durabrite3_sat_adj },
-  { "Inkjet", 0.72, .5, .85, .05, .9, 1, 1, 1, 1, 1, 1.0,
-    durabrite3_hue_adj, durabrite3_lum_adj, durabrite3_sat_adj },
-  { "Coated", 0.83, .5, .85, .075, .999, 1, 1, 1, 1, 1, 1.0,
-    durabrite3_hue_adj, durabrite3_lum_adj, durabrite3_sat_adj },
-  { "Photo", 1.0, .5, .85, .075, .999, 1, .8, .8, 1, 1, 1,
-    durabrite3_hue_adj, durabrite3_lum_adj, durabrite3_sat_adj },
-  { "GlossyPhoto", 1.0, 1.0, 1, .15, .999, 1, .8, .8, 1, 1, 1.0,
-    durabrite3_hue_adj, durabrite3_lum_adj, durabrite3_sat_adj },
-  { "Semigloss", 1.0, 1.0, 1, .15, .999, 1, .8, .8, 1, 1, .92,
-    durabrite3_hue_adj, durabrite3_lum_adj, durabrite3_sat_adj },
-  { "Luster", 1.0, 1.0, 1, .15, .999, 1, .8, .8, 1, 1, .92,
-    durabrite3_hue_adj, durabrite3_lum_adj, durabrite3_sat_adj },
-  { "GlossyPaper", .83, 1.0, 1, .15, .999, 1, 1, 1, 1, 1, 1.0,
-    durabrite3_hue_adj, durabrite3_lum_adj, durabrite3_sat_adj },
-  { "Ilford", .83, 1.0, 1, .15, 1.35, 1, 1, 1, 1, 1, 1,
-    durabrite3_hue_adj, durabrite3_lum_adj, durabrite3_sat_adj  },
-  { "ColorLife", .83, 1.0, 1, .15, .9, 1, 1, 1, 1, 1, 1,
-    durabrite3_hue_adj, durabrite3_lum_adj, durabrite3_sat_adj },
-  { "Other", 0.72, .5, .75, .05, .9, 1, 1, 1, 1, 1, 1,
-    durabrite3_hue_adj, durabrite3_lum_adj, durabrite3_sat_adj },
-};
-
-DECLARE_PAPER_ADJUSTMENTS(durabrite3);
-
-static const paper_t standard_papers[] =
-{
-  { "Plain", N_("Plain Paper"), PAPER_PLAIN,
-    1, 0, 0x6b, 0x1a, 0x01, NULL, NULL },
-  { "PlainFast", N_("Plain Paper Fast Load"), PAPER_PLAIN,
-    5, 0, 0x6b, 0x1a, 0x01, NULL, NULL },
-  { "Postcard", N_("Postcard"), PAPER_PLAIN,
-    2, 0, 0x00, 0x00, 0x02, NULL, NULL },
-  { "GlossyFilm", N_("Glossy Film"), PAPER_PHOTO,
-    3, 0, 0x6d, 0x00, 0x01, NULL, NULL },
-  { "Transparency", N_("Transparencies"), PAPER_TRANSPARENCY,
-    3, 0, 0x6d, 0x00, 0x02, NULL, NULL },
-  { "Envelope", N_("Envelopes"), PAPER_PLAIN,
-    4, 0, 0x6b, 0x1a, 0x01, NULL, NULL },
-  { "BackFilm", N_("Back Light Film"), PAPER_TRANSPARENCY,
-    6, 0, 0x6d, 0x00, 0x01, NULL, NULL },
-  { "Matte", N_("Matte Paper"), PAPER_GOOD,
-    7, 0, 0x00, 0x00, 0x02, NULL, NULL },
-  { "MatteHeavy", N_("Matte Paper Heavyweight"), PAPER_GOOD,
-    7, 0, 0x00, 0x00, 0x02, NULL, NULL },
-  { "Inkjet", N_("Inkjet Paper"), PAPER_GOOD,
-    7, 0, 0x6b, 0x1a, 0x01, NULL, NULL },
-  { "Coated", N_("Photo Quality Inkjet Paper"), PAPER_GOOD,
-    7, 0, 0x6b, 0x1a, 0x01, NULL, NULL },
-  { "Photo", N_("Photo Paper"), PAPER_PHOTO,
-    8, 0, 0x67, 0x00, 0x02, NULL, NULL },
-  { "GlossyPhoto", N_("Premium Glossy Photo Paper"), PAPER_PREMIUM_PHOTO,
-    8, 0, 0x80, 0x00, 0x02, NULL, NULL },
-  { "Semigloss", N_("Premium Semigloss Photo Paper"), PAPER_PREMIUM_PHOTO,
-    8, 0, 0x80, 0x00, 0x02, NULL, NULL },
-  { "Luster", N_("Premium Luster Photo Paper"), PAPER_PREMIUM_PHOTO,
-    8, 0, 0x80, 0x00, 0x02, NULL, NULL },
-  { "GlossyPaper", N_("Photo Quality Glossy Paper"), PAPER_PREMIUM_PHOTO,
-    6, 0, 0x6b, 0x1a, 0x01, NULL, NULL },
-  { "Ilford", N_("Ilford Heavy Paper"), PAPER_PREMIUM_PHOTO,
-    8, 0, 0x80, 0x00, 0x02, NULL, NULL },
-  { "ColorLife", N_("ColorLife Paper"), PAPER_PREMIUM_PHOTO,
-    8, 0, 0x67, 0x00, 0x02, NULL, NULL },
-  { "Other", N_("Other"), PAPER_PLAIN,
-    0, 0, 0x6b, 0x1a, 0x01, NULL, NULL },
-};
-
-DECLARE_PAPERS(standard);
-
-static const paper_t durabrite_papers[] =
-{
-  { "Plain", N_("Plain Paper"), PAPER_PLAIN,
-    1, 0, 0x6b, 0x1a, 0x01, NULL, NULL },
-  { "PlainFast", N_("Plain Paper Fast Load"), PAPER_PLAIN,
-    5, 0, 0x6b, 0x1a, 0x01, NULL, NULL },
-  { "Postcard", N_("Postcard"), PAPER_PLAIN,
-    2, 0, 0x00, 0x00, 0x02, NULL, NULL },
-  { "GlossyFilm", N_("Glossy Film"), PAPER_PHOTO,
-    3, 0, 0x6d, 0x00, 0x01, NULL, NULL },
-  { "Transparency", N_("Transparencies"), PAPER_TRANSPARENCY,
-    3, 0, 0x6d, 0x00, 0x02, NULL, NULL },
-  { "Envelope", N_("Envelopes"), PAPER_PLAIN,
-    4, 0, 0x6b, 0x1a, 0x01, NULL, NULL },
-  { "BackFilm", N_("Back Light Film"), PAPER_TRANSPARENCY,
-    6, 0, 0x6d, 0x00, 0x01, NULL, NULL },
-  { "Matte", N_("Matte Paper"), PAPER_GOOD,
-    7, 0, 0x00, 0x00, 0x02, NULL, NULL },
-  { "MatteHeavy", N_("Matte Paper Heavyweight"), PAPER_GOOD,
-    7, 0, 0x00, 0x00, 0x02, NULL, NULL },
-  { "Inkjet", N_("Inkjet Paper"), PAPER_GOOD,
-    7, 0, 0x6b, 0x1a, 0x01, NULL, NULL },
-  { "Coated", N_("Photo Quality Inkjet Paper"), PAPER_GOOD,
-    7, 0, 0x6b, 0x1a, 0x01, NULL, NULL },
-  { "Photo", N_("Photo Paper"), PAPER_PHOTO,
-    8, 0, 0x67, 0x00, 0x02, "RGB", NULL },
-  { "GlossyPhoto", N_("Premium Glossy Photo Paper"), PAPER_PREMIUM_PHOTO,
-    8, 0, 0x80, 0x00, 0x02, "RGB", NULL },
-  { "Semigloss", N_("Premium Semigloss Photo Paper"), PAPER_PREMIUM_PHOTO,
-    8, 0, 0x80, 0x00, 0x02, "RGB", NULL },
-  { "Luster", N_("Premium Luster Photo Paper"), PAPER_PREMIUM_PHOTO,
-    8, 0, 0x80, 0x00, 0x02, "RGB", NULL },
-  { "GlossyPaper", N_("Photo Quality Glossy Paper"), PAPER_PHOTO,
-    6, 0, 0x6b, 0x1a, 0x01, "RGB", NULL },
-  { "Ilford", N_("Ilford Heavy Paper"), PAPER_PREMIUM_PHOTO,
-    8, 0, 0x80, 0x00, 0x02, NULL, NULL },
-  { "ColorLife", N_("ColorLife Paper"), PAPER_PREMIUM_PHOTO,
-    8, 0, 0x67, 0x00, 0x02, NULL, NULL },
-  { "Other", N_("Other"), PAPER_PLAIN,
-    0, 0, 0x6b, 0x1a, 0x01, NULL, NULL },
-};
-
-DECLARE_PAPERS(durabrite);
-
-static const paper_t ultrachrome_papers[] =
-{
-  { "Plain", N_("Plain Paper"), PAPER_PLAIN,
-    1, 0, 0x6b, 0x1a, 0x01, NULL, "UltraMatte" },
-  { "PlainFast", N_("Plain Paper Fast Load"), PAPER_PLAIN,
-    5, 0, 0x6b, 0x1a, 0x01, NULL, "UltraMatte" },
-  { "Postcard", N_("Postcard"), PAPER_PLAIN,
-    2, 0, 0x00, 0x00, 0x02, NULL, "UltraMatte" },
-  { "GlossyFilm", N_("Glossy Film"), PAPER_PHOTO,
-    3, 0, 0x6d, 0x00, 0x01, NULL, "UltraPhoto" },
-  { "Transparency", N_("Transparencies"), PAPER_TRANSPARENCY,
-    3, 0, 0x6d, 0x00, 0x02, NULL, "UltraPhoto" },
-  { "Envelope", N_("Envelopes"), PAPER_PLAIN,
-    4, 0, 0x6b, 0x1a, 0x01, NULL, "UltraMatte" },
-  { "BackFilm", N_("Back Light Film"), PAPER_TRANSPARENCY,
-    6, 0, 0x6d, 0x00, 0x01, NULL, "UltraPhoto" },
-  { "Matte", N_("Matte Paper"), PAPER_GOOD,
-    7, 0, 0x00, 0x00, 0x02, NULL, "UltraMatte" },
-  { "MatteHeavy", N_("Matte Paper Heavyweight"), PAPER_GOOD,
-    7, 0, 0x00, 0x00, 0x02, NULL, "UltraMatte" },
-  { "Inkjet", N_("Inkjet Paper"), PAPER_GOOD,
-    7, 0, 0x6b, 0x1a, 0x01, NULL, "UltraMatte" },
-  { "Coated", N_("Photo Quality Inkjet Paper"), PAPER_GOOD,
-    7, 0, 0x6b, 0x1a, 0x01, NULL, "UltraPhoto" },
-  { "Photo", N_("Photo Paper"), PAPER_PHOTO,
-    8, 0, 0x67, 0x00, 0x02, NULL, "UltraPhoto" },
-  { "GlossyPhoto", N_("Premium Glossy Photo Paper"), PAPER_PREMIUM_PHOTO,
-    8, 0, 0x80, 0x00, 0x02, NULL, "UltraPhoto" },
-  { "Semigloss", N_("Premium Semigloss Photo Paper"), PAPER_PREMIUM_PHOTO,
-    8, 0, 0x80, 0x00, 0x02, NULL, "UltraPhoto" },
-  { "Luster", N_("Premium Luster Photo Paper"), PAPER_PREMIUM_PHOTO,
-    8, 0, 0x80, 0x00, 0x02, NULL, "UltraPhoto" },
-  { "ArchivalMatte", N_("Archival Matte Paper"), PAPER_PREMIUM_PHOTO,
-    7, 0, 0x00, 0x00, 0x02, NULL, "UltraMatte" },
-  { "WaterColorRadiant", N_("Watercolor Paper - Radiant White"), PAPER_PREMIUM_PHOTO,
-    7, 0, 0x00, 0x00, 0x02, NULL, "UltraMatte" },
-  { "GlossyPaper", N_("Photo Quality Glossy Paper"), PAPER_PHOTO,
-    6, 0, 0x6b, 0x1a, 0x01, NULL, "UltraPhoto" },
-  { "Ilford", N_("Ilford Heavy Paper"), PAPER_PREMIUM_PHOTO,
-    8, 0, 0x80, 0x00, 0x02, NULL, "UltraMatte" },
-  { "ColorLife", N_("ColorLife Paper"), PAPER_PREMIUM_PHOTO,
-    8, 0, 0x67, 0x00, 0x02, NULL, "UltraPhoto" },
-  { "Other", N_("Other"), PAPER_PLAIN,
-    0, 0, 0x6b, 0x1a, 0x01, NULL, "UltraMatte" },
-};
-
-DECLARE_PAPERS(ultrachrome);
+void
+stp_escp2_set_media_size(stp_vars_t *v, const stp_vars_t *src)
+{
+  const char *name = stp_get_string_parameter(src, "PageSize");
+  if (name)
+    {
+      stp_mxml_node_t *node = get_media_size_xml(src);
+      stp_mxml_node_t *xnode = stp_mxmlFindElement(node, node, "MediaSize",
+						   "name", name, STP_MXML_DESCEND);
+      if (xnode)
+	{
+	  stp_vars_fill_from_xmltree_ref(xnode->child, node, v);
+	  return;
+	}
+      xnode = stp_mxmlFindElement(node, node, "MediaSize", "type", "default",
+				  STP_MXML_DESCEND);
+      if (xnode)
+	{
+	  stp_vars_fill_from_xmltree_ref(xnode->child, node, v);
+	  return;
+	}
+    }
+}
 
-static const paper_t ultrachrome_k3_papers[] =
+static const char *
+paper_namefunc(const void *item)
 {
-  { "Plain", N_("Plain Paper"), PAPER_PLAIN,
-    1, 0, 0x6b, 0x1a, 0x01, NULL, "UltraMatte" },
-  { "PlainFast", N_("Plain Paper Fast Load"), PAPER_PLAIN,
-    5, 0, 0x6b, 0x1a, 0x01, NULL, "UltraMatte" },
-  { "Postcard", N_("Postcard"), PAPER_PLAIN,
-    2, 0, 0x00, 0x00, 0x02, NULL, "UltraMatte" },
-  { "GlossyFilm", N_("Glossy Film"), PAPER_PHOTO,
-    3, 0, 0x6d, 0x00, 0x01, NULL, "UltraPhoto" },
-  { "Transparency", N_("Transparencies"), PAPER_TRANSPARENCY,
-    3, 0, 0x6d, 0x00, 0x02, NULL, "UltraPhoto" },
-  { "Envelope", N_("Envelopes"), PAPER_PLAIN,
-    4, 0, 0x6b, 0x1a, 0x01, NULL, "UltraMatte" },
-  { "BackFilm", N_("Back Light Film"), PAPER_TRANSPARENCY,
-    6, 0, 0x6d, 0x00, 0x01, NULL, "UltraPhoto" },
-  { "Matte", N_("Matte Paper"), PAPER_GOOD,
-    7, 0, 0x00, 0x00, 0x02, NULL, "UltraMatte" },
-  { "MatteHeavy", N_("Matte Paper Heavyweight"), PAPER_GOOD,
-    7, 0, 0x00, 0x00, 0x02, NULL, "UltraMatte" },
-  { "Inkjet", N_("Inkjet Paper"), PAPER_GOOD,
-    7, 0, 0x6b, 0x1a, 0x01, NULL, "UltraMatte" },
-  { "Coated", N_("Photo Quality Inkjet Paper"), PAPER_GOOD,
-    7, 0, 0x6b, 0x1a, 0x01, NULL, "UltraPhoto" },
-  { "Photo", N_("Photo Paper"), PAPER_PHOTO,
-    8, 0, 0x67, 0x00, 0x02, NULL, "UltraPhoto" },
-  { "GlossyPhoto", N_("Premium Glossy Photo Paper"), PAPER_PREMIUM_PHOTO,
-    8, 0, 0x80, 0x00, 0x02, NULL, "UltraPhoto" },
-  { "Semigloss", N_("Premium Semigloss Photo Paper"), PAPER_PREMIUM_PHOTO,
-    8, 0, 0x80, 0x00, 0x02, NULL, "UltraPhoto" },
-  { "Luster", N_("Premium Luster Photo Paper"), PAPER_PREMIUM_PHOTO,
-    8, 0, 0x80, 0x00, 0x02, NULL, "UltraPhoto" },
-  { "ArchivalMatte", N_("Archival Matte Paper"), PAPER_PREMIUM_PHOTO,
-    7, 0, 0x00, 0x00, 0x02, NULL, "UltraMatte" },
-  { "WaterColorRadiant", N_("Watercolor Paper - Radiant White"), PAPER_PREMIUM_PHOTO,
-    7, 0, 0x00, 0x00, 0x02, NULL, "UltraMatte" },
-  { "GlossyPaper", N_("Photo Quality Glossy Paper"), PAPER_PHOTO,
-    6, 0, 0x6b, 0x1a, 0x01, NULL, "UltraPhoto" },
-  { "Ilford", N_("Ilford Heavy Paper"), PAPER_PREMIUM_PHOTO,
-    8, 0, 0x80, 0x00, 0x02, NULL, "UltraMatte" },
-  { "ColorLife", N_("ColorLife Paper"), PAPER_PREMIUM_PHOTO,
-    8, 0, 0x67, 0x00, 0x02, NULL, "UltraPhoto" },
-  { "Other", N_("Other"), PAPER_PLAIN,
-    0, 0, 0x6b, 0x1a, 0x01, NULL, "UltraMatte" },
-};
+  const paper_t *p = (const paper_t *) (item);
+  return p->cname;
+}
 
-DECLARE_PAPERS(ultrachrome_k3);
+int
+stp_escp2_load_media(const stp_vars_t *v, const char *name)
+{
+  stpi_escp2_printer_t *printdef = stp_escp2_get_printer(v);
+  stp_list_t *dirlist = stpi_data_path();
+  stp_list_item_t *item;
+  int found = 0;
+  item = stp_list_get_start(dirlist);
+  while (item)
+    {
+      const char *dn = (const char *) stp_list_item_get_data(item);
+      char *ffn = stpi_path_merge(dn, name);
+      stp_mxml_node_t *media =
+	stp_mxmlLoadFromFile(NULL, ffn, STP_MXML_NO_CALLBACK);
+      stp_free(ffn);
+      if (media)
+	{
+	  stp_mxml_node_t **xnode =
+	    (stp_mxml_node_t **) &(printdef->media);
+	  stp_list_t **xlist =
+	    (stp_list_t **) &(printdef->media_cache);
+	  stp_string_list_t **xpapers =
+	    (stp_string_list_t **) &(printdef->papers);
+	  stp_mxml_node_t *node = stp_mxmlFindElement(media, media,
+						      "escp2:papers", NULL,
+						      NULL, STP_MXML_DESCEND);
+	  *xnode = media;
+	  *xlist = stp_list_create();
+	  stp_list_set_namefunc(*xlist, paper_namefunc);
+	  *xpapers = stp_string_list_create();
+	  if (node)
+	    {
+	      node = node->child;
+	      while (node)
+		{
+		  if (node->type == STP_MXML_ELEMENT &&
+		      strcmp(node->value.element.name, "paper") == 0)
+		    stp_string_list_add_string(*xpapers,
+					       stp_mxmlElementGetAttr(node, "name"),
+					       stp_mxmlElementGetAttr(node, "text"));
+		  node = node->next;
+		}
+	    }
+	  found = 1;
+	  break;
+	}
+      item = stp_list_item_next(item);
+    }
+  stp_list_destroy(dirlist);
+  if (! found)
+    {
+      stp_erprintf("Unable to load media from %s!\n", name);
+      stp_abort();
+    }
+  return found;
+}
 
-static const paper_t durabrite2_papers[] =
+static stp_mxml_node_t *
+get_media_xml(const stp_vars_t *v)
 {
-  { "Plain", N_("Plain Paper"), PAPER_PLAIN,
-    1, 0, 0x6b, 0x1a, 0x01, NULL, NULL },
-  { "PlainFast", N_("Plain Paper Fast Load"), PAPER_PLAIN,
-    5, 0, 0x6b, 0x1a, 0x01, NULL, NULL },
-  { "Postcard", N_("Postcard"), PAPER_PLAIN,
-    2, 0, 0x00, 0x00, 0x02, NULL, NULL },
-  { "GlossyFilm", N_("Glossy Film"), PAPER_PHOTO,
-    3, 0, 0x6d, 0x00, 0x01, NULL, NULL },
-  { "Transparency", N_("Transparencies"), PAPER_TRANSPARENCY,
-    3, 0, 0x6d, 0x00, 0x02, NULL, NULL },
-  { "Envelope", N_("Envelopes"), PAPER_PLAIN,
-    4, 0, 0x6b, 0x1a, 0x01, NULL, NULL },
-  { "BackFilm", N_("Back Light Film"), PAPER_TRANSPARENCY,
-    6, 0, 0x6d, 0x00, 0x01, NULL, NULL },
-  { "Matte", N_("Matte Paper"), PAPER_GOOD,
-    7, 0, 0x00, 0x00, 0x02, NULL, NULL },
-  { "MatteHeavy", N_("Matte Paper Heavyweight"), PAPER_GOOD,
-    7, 0, 0x00, 0x00, 0x02, NULL, NULL },
-  { "Inkjet", N_("Inkjet Paper"), PAPER_GOOD,
-    7, 0, 0x6b, 0x1a, 0x01, NULL, NULL },
-  { "Coated", N_("Photo Quality Inkjet Paper"), PAPER_GOOD,
-    7, 0, 0x6b, 0x1a, 0x01, NULL, NULL },
-  { "Photo", N_("Photo Paper"), PAPER_PHOTO,
-    8, 0, 0x67, 0x00, 0x02, NULL, NULL },
-  { "GlossyPhoto", N_("Premium Glossy Photo Paper"), PAPER_PREMIUM_PHOTO,
-    8, 0, 0x80, 0x00, 0x02, NULL, NULL },
-  { "Semigloss", N_("Premium Semigloss Photo Paper"), PAPER_PREMIUM_PHOTO,
-    8, 0, 0x80, 0x00, 0x02, NULL, NULL },
-  { "Luster", N_("Premium Luster Photo Paper"), PAPER_PREMIUM_PHOTO,
-    8, 0, 0x80, 0x00, 0x02, NULL, NULL },
-  { "GlossyPaper", N_("Photo Quality Glossy Paper"), PAPER_PHOTO,
-    6, 0, 0x6b, 0x1a, 0x01, NULL, NULL },
-  { "Ilford", N_("Ilford Heavy Paper"), PAPER_PREMIUM_PHOTO,
-    8, 0, 0x80, 0x00, 0x02, NULL, NULL },
-  { "ColorLife", N_("ColorLife Paper"), PAPER_PREMIUM_PHOTO,
-    8, 0, 0x67, 0x00, 0x02, NULL, NULL },
-  { "Other", N_("Other"), PAPER_PLAIN,
-    0, 0, 0x6b, 0x1a, 0x01, NULL, NULL },
-};
-
-DECLARE_PAPERS(durabrite2);
+  stpi_escp2_printer_t *printdef = stp_escp2_get_printer(v);
+  return printdef->media;
+}
 
-static const paper_t r800_papers[] =
+static stp_list_t *
+get_media_cache(const stp_vars_t *v)
 {
-  { "Plain", N_("Plain Paper"), PAPER_PLAIN,
-    1, 0, 0x6b, 0x1a, 0x01, NULL, "r800Matte" },
-  { "PlainFast", N_("Plain Paper Fast Load"), PAPER_PLAIN,
-    5, 0, 0x6b, 0x1a, 0x01, NULL, "r800Matte" },
-  { "Postcard", N_("Postcard"), PAPER_PLAIN,
-    2, 0, 0x00, 0x00, 0x02, NULL, "r800Matte" },
-  { "GlossyFilm", N_("Glossy Film"), PAPER_PHOTO,
-    3, 0, 0x6d, 0x00, 0x01, NULL, "r800Photo" },
-  { "Transparency", N_("Transparencies"), PAPER_TRANSPARENCY,
-    3, 0, 0x6d, 0x00, 0x02, NULL, "r800Photo" },
-  { "Envelope", N_("Envelopes"), PAPER_PLAIN,
-    4, 0, 0x6b, 0x1a, 0x01, NULL, "r800Matte" },
-  { "BackFilm", N_("Back Light Film"), PAPER_TRANSPARENCY,
-    6, 0, 0x6d, 0x00, 0x01, NULL, "r800Photo" },
-  { "Matte", N_("Matte Paper"), PAPER_GOOD,
-    7, 0, 0x00, 0x00, 0x02, NULL, "r800Matte" },
-  { "MatteHeavy", N_("Matte Paper Heavyweight"), PAPER_GOOD,
-    7, 0, 0x00, 0x00, 0x02, NULL, "r800Matte" },
-  { "Inkjet", N_("Inkjet Paper"), PAPER_GOOD,
-    7, 0, 0x6b, 0x1a, 0x01, NULL, "r800Matte" },
-  { "Coated", N_("Photo Quality Inkjet Paper"), PAPER_GOOD,
-    7, 0, 0x6b, 0x1a, 0x01, NULL, "r800Photo" },
-  { "Photo", N_("Photo Paper"), PAPER_PHOTO,
-    8, 0, 0x67, 0x00, 0x02, NULL, "r800Photo" },
-  { "GlossyPhoto", N_("Premium Glossy Photo Paper"), PAPER_PREMIUM_PHOTO,
-    8, 0, 0x80, 0x00, 0x02, NULL, "r800Photo" },
-  { "Semigloss", N_("Premium Semigloss Photo Paper"), PAPER_PREMIUM_PHOTO,
-    8, 0, 0x80, 0x00, 0x02, NULL, "r800Photo" },
-  { "Luster", N_("Premium Luster Photo Paper"), PAPER_PREMIUM_PHOTO,
-    8, 0, 0x80, 0x00, 0x02, NULL, "r800Photo" },
-  { "ArchivalMatte", N_("Archival Matte Paper"), PAPER_PREMIUM_PHOTO,
-    7, 0, 0x00, 0x00, 0x02, NULL, "r800Matte" },
-  { "WaterColorRadiant", N_("Watercolor Paper - Radiant White"), PAPER_PREMIUM_PHOTO,
-    7, 0, 0x00, 0x00, 0x02, NULL, "r800Matte" },
-  { "GlossyPaper", N_("Photo Quality Glossy Paper"), PAPER_PHOTO,
-    6, 0, 0x6b, 0x1a, 0x01, NULL, "r800Photo" },
-  { "Ilford", N_("Ilford Heavy Paper"), PAPER_PREMIUM_PHOTO,
-    8, 0, 0x80, 0x00, 0x02, NULL, "r800Matte" },
-  { "ColorLife", N_("ColorLife Paper"), PAPER_PREMIUM_PHOTO,
-    8, 0, 0x67, 0x00, 0x02, NULL, "r800Photo" },
-  { "Other", N_("Other"), PAPER_PLAIN,
-    0, 0, 0x6b, 0x1a, 0x01, NULL, "r800Matte" },
-};
-
-DECLARE_PAPERS(r800);
+  stpi_escp2_printer_t *printdef = stp_escp2_get_printer(v);
+  return printdef->media_cache;
+}
 
-static const paper_t picturemate_papers[] =
+int
+stp_escp2_has_media_feature(const stp_vars_t *v, const char *name)
 {
-  { "GlossyPhoto", N_("Premium Glossy Photo Paper"), PAPER_PREMIUM_PHOTO,
-    8, 0, 0x80, 0x00, 0x02, NULL, "picturematePhoto" },
-  { "Other", N_("Other"), PAPER_PLAIN,
-    0, 0, 0x6b, 0x1a, 0x01, NULL, "picturemateMatte" },
-};
+  stp_mxml_node_t *doc = get_media_xml(v);
+  if (doc)
+    return (stp_mxmlFindElement(doc, doc, "feature", "name", name,
+				STP_MXML_DESCEND) != NULL);
+  else
+    return 0;
+}
 
-DECLARE_PAPERS(picturemate);
 
-typedef struct
-{
-  const char *name;
-  const paperlist_t *paper_list;
-} paperl_t;
+static paper_t *
+build_media_type(const stp_vars_t *v, const char *name, const inklist_t *ink,
+		 const res_t *res)
+{
+  stp_mxml_node_t *node;
+  stp_mxml_node_t *doc = get_media_xml(v);
+  const char *pclass;
+  paper_t *answer;
+  stp_vars_t *vv = stp_vars_create();
+  if (!doc)
+    return NULL;
+  node = stp_mxmlFindElement(doc, doc, "paper", "name", name, STP_MXML_DESCEND);
+  if (!node)
+    return NULL;
+  answer = stp_zalloc(sizeof(paper_t));
+  answer->name = stp_mxmlElementGetAttr(node, "name");
+  answer->text = gettext(stp_mxmlElementGetAttr(node, "text"));
+  pclass = stp_mxmlElementGetAttr(node, "class");
+  answer->v = vv;
+  if (! pclass || strcasecmp(pclass, "plain") == 0)
+    answer->paper_class = PAPER_PLAIN;
+  else if (strcasecmp(pclass, "good") == 0)
+    answer->paper_class = PAPER_GOOD;
+  else if (strcasecmp(pclass, "photo") == 0)
+    answer->paper_class = PAPER_PHOTO;
+  else if (strcasecmp(pclass, "premium") == 0)
+    answer->paper_class = PAPER_PREMIUM_PHOTO;
+  else if (strcasecmp(pclass, "transparency") == 0)
+    answer->paper_class = PAPER_TRANSPARENCY;
+  else
+    answer->paper_class = PAPER_PLAIN;
+  answer->preferred_ink_type = stp_mxmlElementGetAttr(node, "PreferredInktype");
+  answer->preferred_ink_set = stp_mxmlElementGetAttr(node, "PreferredInkset");
+  stp_vars_fill_from_xmltree_ref(node->child, doc, vv);
+  if (ink && ink->name)
+    {
+      stp_mxml_node_t *inknode = stp_mxmlFindElement(node, node, "ink",
+						     "name", ink->name,
+						     STP_MXML_DESCEND);
+      if (inknode)
+	stp_vars_fill_from_xmltree_ref(inknode->child, doc, vv);
+      else
+	{
+	  stp_erprintf("Cannot find ink %s for media %s, model %s!\n",
+		       ink->name, name, stp_get_driver(v));
+	  stp_abort();
+	}
+    }
+  if (res && res->name)
+    {
+      stp_mxml_node_t *resnode = stp_mxmlFindElement(node, node, "resolution",
+						     "name", res->name,
+						     STP_MXML_DESCEND);
+      if (resnode)
+	stp_vars_fill_from_xmltree_ref(resnode->child, doc, vv);
+    }
+  return answer;
+}
 
-static const paperl_t the_papers[] =
+static char *
+build_media_id(const char *name, const inklist_t *ink, const res_t *res)
 {
-  { "standard", &standard_paper_list },
-  { "durabrite", &durabrite_paper_list },
-  { "durabrite2", &durabrite2_paper_list },
-  { "ultrachrome", &ultrachrome_paper_list },
-  { "ultrachrome_k3", &ultrachrome_k3_paper_list },
-  { "r800", &r800_paper_list },
-  { "picturemate", &picturemate_paper_list },
-};
+  char *answer;
+  stp_asprintf(&answer, "%s %s %s",
+	       name,
+	       ink ? ink->name : "",
+	       res ? res->name : "");
+  return answer;
+}
 
-const paperlist_t *
-stpi_escp2_get_paperlist_named(const char *n)
+static const paper_t *
+get_media_type_named(const stp_vars_t *v, const char *name,
+		     int ignore_res)
 {
+  paper_t *answer = NULL;
   int i;
-  if (n)
-    for (i = 0; i < sizeof(the_papers) / sizeof(paperl_t); i++)
-      {
-	if (strcmp(n, the_papers[i].name) == 0)
-	  return the_papers[i].paper_list;
-      }
-  return NULL;
+  stpi_escp2_printer_t *printdef = stp_escp2_get_printer(v);
+  const stp_string_list_t *p = printdef->papers;
+  const res_t *res = ignore_res ? NULL : stp_escp2_find_resolution(v);
+  const inklist_t *inklist = stp_escp2_inklist(v);
+  char *media_id = build_media_id(name, inklist, res);
+  stp_list_t *cache = get_media_cache(v);
+  stp_list_item_t *li = stp_list_get_item_by_name(cache, media_id);
+  if (li)
+    {
+      stp_free(media_id);
+      answer = (paper_t *) stp_list_item_get_data(li);
+    }
+  else
+    {
+      int paper_type_count = stp_string_list_count(p);
+      for (i = 0; i < paper_type_count; i++)
+	{
+	  if (!strcmp(name, stp_string_list_param(p, i)->name))
+	    {
+#ifdef HAVE_LOCALE_H
+	      char *locale = stp_strdup(setlocale(LC_ALL, NULL));
+	      setlocale(LC_ALL, "C");
+#endif
+	      answer = build_media_type(v, name, inklist, res);
+#ifdef HAVE_LOCALE_H
+	      setlocale(LC_ALL, locale);
+	      stp_free(locale);
+#endif
+	      break;
+	    }
+	}
+      if (answer)
+	{
+	  answer->cname = media_id;
+	  stp_list_item_create(cache, NULL, answer);
+	}
+    }
+  return answer;
 }
 
-typedef struct
-{
-  const char *name;
-  const paper_adjustment_list_t *paper_list;
-} paperadj_t;
-
-static const paperadj_t the_adjustments[] =
-{
-  { "standard", &standard_paper_adjustment_list },
-  { "durabrite", &durabrite_paper_adjustment_list },
-  { "durabrite2", &durabrite2_paper_adjustment_list },
-  { "durabrite3", &durabrite3_paper_adjustment_list },
-  { "photo", &photo_paper_adjustment_list },
-  { "photo2", &photo2_paper_adjustment_list },
-  { "photo3", &photo3_paper_adjustment_list },
-  { "sp960", &sp960_paper_adjustment_list },
-  { "ultrachrome_photo", &ultrachrome_photo_paper_adjustment_list },
-  { "ultrachrome_matte", &ultrachrome_matte_paper_adjustment_list },
-  { "ultrachrome_k3_photo", &ultrachrome_k3_photo_paper_adjustment_list },
-  { "ultrachrome_k3_matte", &ultrachrome_k3_matte_paper_adjustment_list },
-  { "r800_photo", &r800_photo_paper_adjustment_list },
-  { "r800_matte", &r800_matte_paper_adjustment_list },
-  { "picturemate_4", &picturemate_4_paper_adjustment_list },
-  { "picturemate_6", &picturemate_6_paper_adjustment_list },
-  { "claria", &claria_paper_adjustment_list },
-};
-
-const paper_adjustment_list_t *
-stpi_escp2_get_paper_adjustment_list_named(const char *n)
-{
-  int i;
-  if (n)
-    for (i = 0; i < sizeof(the_adjustments) / sizeof(paperadj_t); i++)
-      {
-	if (strcmp(n, the_adjustments[i].name) == 0)
-	  return the_adjustments[i].paper_list;
-      }
+const paper_t *
+stp_escp2_get_media_type(const stp_vars_t *v, int ignore_res)
+{
+  stpi_escp2_printer_t *printdef = stp_escp2_get_printer(v);
+  const stp_string_list_t *p = printdef->papers;
+  if (p)
+    {
+      const char *name = stp_get_string_parameter(v, "MediaType");
+      if (name)
+	return get_media_type_named(v, name, ignore_res);
+    }
   return NULL;
 }
 
-
-#define DECLARE_INPUT_SLOT(name)				\
-static const input_slot_list_t name##_input_slot_list =		\
-{								\
-  #name,							\
-  name##_input_slots,						\
-  sizeof(name##_input_slots) / sizeof(const input_slot_t),	\
+const paper_t *
+stp_escp2_get_default_media_type(const stp_vars_t *v)
+{
+  stpi_escp2_printer_t *printdef = stp_escp2_get_printer(v);
+  const stp_string_list_t *p = printdef->papers;
+  if (p)
+    {
+      int paper_type_count = stp_string_list_count(p);
+      if (paper_type_count >= 0)
+	return get_media_type_named(v, stp_string_list_param(p, 0)->name, 1);
+    }
+  return NULL;
 }
 
-static const input_slot_t standard_roll_feed_input_slots[] =
-{
-  {
-    "Standard",
-    N_("Standard"),
-    0,
-    0,
-    0,
-    { 16, "IR\002\000\000\001EX\006\000\000\000\000\000\005\000" },
-    { 6, "IR\002\000\000\000"}
-  },
-  {
-    "Roll",
-    N_("Roll Feed"),
-    0,
-    1,
-    ROLL_FEED_DONT_EJECT,
-    { 16, "IR\002\000\000\001EX\006\000\000\000\000\000\005\001" },
-    { 6, "IR\002\000\000\002" }
-  }
-};
-
-DECLARE_INPUT_SLOT(standard_roll_feed);
-
-static const input_slot_t cutter_roll_feed_input_slots[] =
-{
-  {
-    "Standard",
-    N_("Standard"),
-    0,
-    0,
-    0,
-    { 16, "IR\002\000\000\001EX\006\000\000\000\000\000\005\000" },
-    { 6, "IR\002\000\000\000"}
-  },
-  {
-    "RollCutPage",
-    N_("Roll Feed (cut each page)"),
-    0,
-    1,
-    ROLL_FEED_CUT_ALL,
-    { 16, "IR\002\000\000\001EX\006\000\000\000\000\000\005\001" },
-    { 6, "IR\002\000\000\002" }
-  },
-  {
-    "RollCutNone",
-    N_("Roll Feed (do not cut)"),
-    0,
-    1,
-    ROLL_FEED_DONT_EJECT,
-    { 16, "IR\002\000\000\001EX\006\000\000\000\000\000\005\001" },
-    { 6, "IR\002\000\000\002" }
-  }
-};
-
-DECLARE_INPUT_SLOT(cutter_roll_feed);
-
-static const input_slot_t cd_cutter_roll_feed_input_slots[] =
-{
-  {
-    "Standard",
-    N_("Standard"),
-    0,
-    0,
-    0,
-    { 23, "IR\002\000\000\001EX\006\000\000\000\000\000\005\000PP\003\000\000\001\377" },
-    { 6, "IR\002\000\000\000"}
-  },
-  {
-    "Manual",
-    N_("Manual Feed"),
-    0,
-    0,
-    0,
-    { 36, "PM\002\000\000\000IR\002\000\000\001EX\006\000\000\000\000\000\005\000FP\003\000\000\000\000PP\003\000\000\002\001" },
-    { 6, "IR\002\000\000\000"}
-  },
-  {
-    "CD",
-    N_("Print to CD"),
-    1,
-    0,
-    0,
-    { 36, "PM\002\000\000\000IR\002\000\000\001EX\006\000\000\000\000\000\005\000FP\003\000\000\000\000PP\003\000\000\002\001" },
-    { 6, "IR\002\000\000\000"}
-  },
-  {
-    "RollCutPage",
-    N_("Roll Feed (cut each page)"),
-    0,
-    1,
-    ROLL_FEED_CUT_ALL,
-    { 23, "IR\002\000\000\001EX\006\000\000\000\000\000\005\001PP\003\000\000\001\377" },
-    { 6, "IR\002\000\000\002" }
-  },
-  {
-    "RollCutNone",
-    N_("Roll Feed (do not cut)"),
-    0,
-    1,
-    ROLL_FEED_DONT_EJECT,
-    { 23, "IR\002\000\000\001EX\006\000\000\000\000\000\005\001PP\003\000\000\001\377" },
-    { 6, "IR\002\000\000\002" }
-  }
-};
-
-DECLARE_INPUT_SLOT(cd_cutter_roll_feed);
-
-static const input_slot_t cd_roll_feed_input_slots[] =
-{
-  {
-    "Standard",
-    N_("Standard"),
-    0,
-    0,
-    0,
-    { 23, "IR\002\000\000\001EX\006\000\000\000\000\000\005\000PP\003\000\000\001\377" },
-    { 6, "IR\002\000\000\000"}
-  },
-  {
-    "Manual",
-    N_("Manual Feed"),
-    0,
-    0,
-    0,
-    { 36, "PM\002\000\000\000IR\002\000\000\001EX\006\000\000\000\000\000\005\000FP\003\000\000\000\000PP\003\000\000\002\001" },
-    { 6, "IR\002\000\000\000"}
-  },
-  {
-    "CD",
-    N_("Print to CD"),
-    1,
-    0,
-    0,
-    { 36, "PM\002\000\000\000IR\002\000\000\001EX\006\000\000\000\000\000\005\000FP\003\000\000\000\000PP\003\000\000\002\001" },
-    { 6, "IR\002\000\000\000"}
-  },
-  {
-    "Roll",
-    N_("Roll Feed"),
-    0,
-    1,
-    ROLL_FEED_DONT_EJECT,
-    { 23, "IR\002\000\000\001EX\006\000\000\000\000\000\005\001PP\003\000\000\001\377" },
-    { 6, "IR\002\000\000\002" }
-  }
-};
-
-DECLARE_INPUT_SLOT(cd_roll_feed);
-
-static const input_slot_t r2400_input_slots[] =
-{
-  {
-    "Standard",
-    N_("Standard"),
-    0,
-    0,
-    0,
-    { 23, "IR\002\000\000\001EX\006\000\000\000\000\000\005\000PP\003\000\000\001\377" },
-    { 6, "IR\002\000\000\000"}
-  },
-  {
-    "Velvet",
-    N_("Manual Sheet Guide"),
-    0,
-    0,
-    0,
-    { 23, "IR\002\000\000\001EX\006\000\000\000\000\000\005\000PP\003\000\000\003\000" },
-    { 6, "IR\002\000\000\000"}
-  },
-  {
-    "Matte",
-    N_("Manual Feed (Front)"),
-    0,
-    0,
-    0,
-    { 23, "IR\002\000\000\001EX\006\000\000\000\000\000\005\000PP\003\000\000\002\000" },
-    { 6, "IR\002\000\000\000"}
-  },
-  {
-    "Roll",
-    N_("Roll Feed"),
-    0,
-    1,
-    ROLL_FEED_DONT_EJECT,
-    { 23, "IR\002\000\000\001EX\006\000\000\000\000\000\005\001PP\003\000\000\003\001" },
-    { 6, "IR\002\000\000\002" }
-  }
-};
-
-DECLARE_INPUT_SLOT(r2400);
-
-static const input_slot_t r1800_input_slots[] =
-{
-  {
-    "Standard",
-    N_("Standard"),
-    0,
-    0,
-    0,
-    { 23, "IR\002\000\000\001EX\006\000\000\000\000\000\005\000PP\003\000\000\001\377" },
-    { 6, "IR\002\000\000\000"}
-  },
-  {
-    "Velvet",
-    N_("Manual Sheet Guide"),
-    0,
-    0,
-    0,
-    { 23, "IR\002\000\000\001EX\006\000\000\000\000\000\005\000PP\003\000\000\003\000" },
-    { 6, "IR\002\000\000\000"}
-  },
-  {
-    "Matte",
-    N_("Manual Feed (Front)"),
-    0,
-    0,
-    0,
-    { 23, "IR\002\000\000\001EX\006\000\000\000\000\000\005\000PP\003\000\000\002\000" },
-    { 6, "IR\002\000\000\000"}
-  },
-  {
-    "Roll",
-    N_("Roll Feed"),
-    0,
-    1,
-    ROLL_FEED_DONT_EJECT,
-    { 23, "IR\002\000\000\001EX\006\000\000\000\000\000\005\001PP\003\000\000\003\001" },
-    { 6, "IR\002\000\000\002" }
-  },
-  {
-    "CD",
-    N_("Print to CD"),
-    1,
-    0,
-    0,
-    { 36, "PM\002\000\000\000IR\002\000\000\001EX\006\000\000\000\000\000\005\000FP\003\000\000\000\000PP\003\000\000\002\001" },
-    { 6, "IR\002\000\000\000"}
-  },
-};
-
-DECLARE_INPUT_SLOT(r1800);
 
-static const input_slot_t rx700_input_slots[] =
+static const char *
+slots_namefunc(const void *item)
 {
-  {
-    "Rear",
-    N_("Rear Tray"),
-    0,
-    0,
-    0,
-    { 23, "IR\002\000\000\001EX\006\000\000\000\000\000\005\000PP\003\000\000\001\000" },
-    { 6, "IR\002\000\000\000"}
-  },
-  {
-    "Front",
-    N_("Front Tray"),
-    0,
-    0,
-    0,
-    { 23, "IR\002\000\000\001EX\006\000\000\000\000\000\005\000PP\003\000\000\001\001" },
-    { 6, "IR\002\000\000\000"}
-  },
-  {
-    "CD",
-    N_("Print to CD"),
-    1,
-    0,
-    0,
-    { 36, "PM\002\000\000\000IR\002\000\000\001EX\006\000\000\000\000\000\005\000FP\003\000\000\000\000PP\003\000\000\002\001" },
-    { 6, "IR\002\000\000\000"}
-  },
-  {
-    "PhotoBoard",
-    N_("Photo Board"),
-    0,
-    0,
-    0,
-    { 23, "IR\002\000\000\001EX\006\000\000\000\000\000\005\000PP\003\000\000\002\000" },
-    { 6, "IR\002\000\000\000"}
-  },
-};
+  const input_slot_t *p = (const input_slot_t *) (item);
+  return p->name;
+}
 
-DECLARE_INPUT_SLOT(rx700);
+int
+stp_escp2_load_input_slots(const stp_vars_t *v, const char *name)
+{
+  stpi_escp2_printer_t *printdef = stp_escp2_get_printer(v);
+  stp_list_t *dirlist = stpi_data_path();
+  stp_list_item_t *item;
+  int found = 0;
+  item = stp_list_get_start(dirlist);
+  while (item)
+    {
+      const char *dn = (const char *) stp_list_item_get_data(item);
+      char *ffn = stpi_path_merge(dn, name);
+      stp_mxml_node_t *slots =
+	stp_mxmlLoadFromFile(NULL, ffn, STP_MXML_NO_CALLBACK);
+      stp_free(ffn);
+      if (slots)
+	{
+	  stp_mxml_node_t **xnode =
+	    (stp_mxml_node_t **) &(printdef->slots);
+	  stp_list_t **xlist =
+	    (stp_list_t **) &(printdef->slots_cache);
+	  stp_string_list_t **xslots =
+	    (stp_string_list_t **) &(printdef->input_slots);
+	  stp_mxml_node_t *node = stp_mxmlFindElement(slots, slots,
+						      "escp2:InputSlots", NULL,
+						      NULL, STP_MXML_DESCEND);
+	  *xnode = slots;
+	  *xlist = stp_list_create();
+	  stp_list_set_namefunc(*xlist, slots_namefunc);
+	  *xslots = stp_string_list_create();
+	  if (node)
+	    {
+	      node = node->child;
+	      while (node)
+		{
+		  if (node->type == STP_MXML_ELEMENT &&
+		      strcmp(node->value.element.name, "slot") == 0)
+		    stp_string_list_add_string(*xslots,
+					       stp_mxmlElementGetAttr(node, "name"),
+					       stp_mxmlElementGetAttr(node, "text"));
+		  node = node->next;
+		}
+	    }
+	  found = 1;
+	  break;
+	}
+      item = stp_list_item_next(item);
+    }
+  stp_list_destroy(dirlist);
+  if (! found)
+    {
+      stp_erprintf("Unable to load input slots from %s!\n", name);
+      stp_abort();
+    }
+  return found;
+}
 
-static const input_slot_t pro_roll_feed_input_slots[] =
+static stp_mxml_node_t *
+get_slots_xml(const stp_vars_t *v)
 {
-  {
-    "Standard",
-    N_("Standard"),
-    0,
-    0,
-    0,
-    { 7, "PP\003\000\000\002\000" },
-    { 0, "" }
-  },
-  {
-    "Roll",
-    N_("Roll Feed"),
-    0,
-    1,
-    0,
-    { 7, "PP\003\000\000\003\000" },
-    { 0, "" }
-  }
-};
-
-DECLARE_INPUT_SLOT(pro_roll_feed);
+  stpi_escp2_printer_t *printdef = stp_escp2_get_printer(v);
+  return printdef->slots;
+}
 
-static const input_slot_t spro5000_input_slots[] =
+static stp_list_t *
+get_slots_cache(const stp_vars_t *v)
 {
-  {
-    "CutSheet1",
-    N_("Cut Sheet Bin 1"),
-    0,
-    0,
-    0,
-    { 7, "PP\003\000\000\001\001" },
-    { 0, "" }
-  },
-  {
-    "CutSheet2",
-    N_("Cut Sheet Bin 2"),
-    0,
-    0,
-    0,
-    { 7, "PP\003\000\000\002\001" },
-    { 0, "" }
-  },
-  {
-    "CutSheetAuto",
-    N_("Cut Sheet Autoselect"),
-    0,
-    0,
-    0,
-    { 7, "PP\003\000\000\001\377" },
-    { 0, "" }
-  },
-  {
-    "ManualSelect",
-    N_("Manual Selection"),
-    0,
-    0,
-    0,
-    { 7, "PP\003\000\000\002\001" },
-    { 0, "" }
-  }
-};
+  stpi_escp2_printer_t *printdef = stp_escp2_get_printer(v);
+  return printdef->slots_cache;
+}
 
-DECLARE_INPUT_SLOT(spro5000);
+static input_slot_t *
+build_input_slot(const stp_vars_t *v, const char *name)
+{
+  stp_mxml_node_t *node, *n1;
+  stp_mxml_node_t *doc = get_slots_xml(v);
+  input_slot_t *answer;
+  if (!doc)
+    return NULL;
+  node = stp_mxmlFindElement(doc, doc, "slot", "name", name, STP_MXML_DESCEND);
+  if (!node)
+    return NULL;
+  answer = stp_zalloc(sizeof(input_slot_t));
+  answer->name = stp_mxmlElementGetAttr(node, "name");
+  answer->text = gettext(stp_mxmlElementGetAttr(node, "text"));
+  n1 = stp_mxmlFindElement(node, node, "CD", NULL, NULL, STP_MXML_DESCEND);
+  if (n1)
+    answer->is_cd = 1;
+  n1 = stp_mxmlFindElement(node, node, "RollFeed", NULL, NULL, STP_MXML_DESCEND);
+  if (n1)
+    {
+      answer->is_roll_feed = 1;
+      if (stp_mxmlFindElement(n1, n1, "CutAll", NULL, NULL, STP_MXML_DESCEND))
+	answer->roll_feed_cut_flags |= ROLL_FEED_CUT_ALL;
+      if (stp_mxmlFindElement(n1, n1, "CutLast", NULL, NULL, STP_MXML_DESCEND))
+	answer->roll_feed_cut_flags |= ROLL_FEED_CUT_LAST;
+      if (stp_mxmlFindElement(n1, n1, "DontEject", NULL, NULL, STP_MXML_DESCEND))
+	answer->roll_feed_cut_flags |= ROLL_FEED_DONT_EJECT;
+    }
+  n1 = stp_mxmlFindElement(node, node, "Duplex", NULL, NULL, STP_MXML_DESCEND);
+  if (n1)
+    {
+      if (stp_mxmlFindElement(n1, n1, "Tumble", NULL, NULL, STP_MXML_DESCEND))
+	answer->duplex |= DUPLEX_TUMBLE;
+      if (stp_mxmlFindElement(n1, n1, "NoTumble", NULL, NULL, STP_MXML_DESCEND))
+	answer->duplex |= DUPLEX_NO_TUMBLE;
+    }
+  n1 = stp_mxmlFindElement(node, node, "InitSequence", NULL, NULL, STP_MXML_DESCEND);
+  if (n1 && n1->child && n1->child->type == STP_MXML_TEXT)
+    answer->init_sequence = stp_xmlstrtoraw(n1->child->value.text.string);
+  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);
+  return answer;
+}
 
-static const input_slot_list_t default_input_slot_list =
+int
+stp_escp2_printer_supports_rollfeed(const stp_vars_t *v)
 {
-  "Standard",
-  NULL,
-  0,
-};
+  stp_mxml_node_t *node = get_slots_xml(v);
+  if (stp_mxmlFindElement(node, node, "RollFeed", NULL, NULL, STP_MXML_DESCEND))
+    return 1;
+  else
+    return 0;
+}
 
-typedef struct
+int
+stp_escp2_printer_supports_print_to_cd(const stp_vars_t *v)
 {
-  const char *name;
-  const input_slot_list_t *input_slots;
-} inslot_t;
+  stp_mxml_node_t *node = get_slots_xml(v);
+  if (stp_mxmlFindElement(node, node, "CD", NULL, NULL, STP_MXML_DESCEND))
+    return 1;
+  else
+    return 0;
+}
 
-static const inslot_t the_slots[] =
+int
+stp_escp2_printer_supports_duplex(const stp_vars_t *v)
 {
-  { "cd_cutter_roll_feed", &cd_cutter_roll_feed_input_slot_list },
-  { "cd_roll_feed", &cd_roll_feed_input_slot_list },
-  { "cutter_roll_feed", &cutter_roll_feed_input_slot_list },
-  { "default", &default_input_slot_list },
-  { "pro_roll_feed", &pro_roll_feed_input_slot_list },
-  { "r1800", &r1800_input_slot_list },
-  { "r2400", &r2400_input_slot_list },
-  { "rx700", &rx700_input_slot_list },
-  { "spro5000", &spro5000_input_slot_list },
-  { "standard_roll_feed", &standard_roll_feed_input_slot_list },
-};
+  stp_mxml_node_t *node = get_slots_xml(v);
+  if (stp_mxmlFindElement(node, node, "Duplex", NULL, NULL, STP_MXML_DESCEND))
+    return 1;
+  else
+    return 0;
+}
 
-const input_slot_list_t *
-stpi_escp2_get_input_slot_list_named(const char *n)
+static const input_slot_t *
+get_input_slot_named(const stp_vars_t *v, const char *name)
 {
+  input_slot_t *answer = NULL;
   int i;
-  if (n)
-    for (i = 0; i < sizeof(the_slots) / sizeof(inslot_t); i++)
-      {
-	if (strcmp(n, the_slots[i].name) == 0)
-	  return the_slots[i].input_slots;
-      }
+  stpi_escp2_printer_t *printdef = stp_escp2_get_printer(v);
+  const stp_string_list_t *p = printdef->input_slots;
+  stp_list_t *cache = get_slots_cache(v);
+  stp_list_item_t *li = stp_list_get_item_by_name(cache, name);
+  if (li)
+    answer = (input_slot_t *) stp_list_item_get_data(li);
+  else
+    {
+      int slot_count = stp_string_list_count(p);
+      for (i = 0; i < slot_count; i++)
+	{
+	  if (!strcmp(name, stp_string_list_param(p, i)->name))
+	    {
+#ifdef HAVE_LOCALE_H
+	      char *locale = stp_strdup(setlocale(LC_ALL, NULL));
+	      setlocale(LC_ALL, "C");
+#endif
+	      answer = build_input_slot(v, name);
+#ifdef HAVE_LOCALE_H
+	      setlocale(LC_ALL, locale);
+	      stp_free(locale);
+#endif
+	      break;
+	    }
+	}
+      if (answer)
+	stp_list_item_create(cache, NULL, answer);
+    }
+  return answer;
+}
+
+const input_slot_t *
+stp_escp2_get_input_slot(const stp_vars_t *v)
+{
+  stpi_escp2_printer_t *printdef = stp_escp2_get_printer(v);
+  const stp_string_list_t *p = printdef->input_slots;
+  if (p)
+    {
+      const char *name = stp_get_string_parameter(v, "InputSlot");
+      if (name)
+	return get_input_slot_named(v, name);
+    }
   return NULL;
 }
diff --git a/src/main/escp2-resolutions.c b/src/main/escp2-resolutions.c
index 76d8313..6ca9f3c 100644
--- a/src/main/escp2-resolutions.c
+++ b/src/main/escp2-resolutions.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: escp2-resolutions.c,v 1.44 2008/02/24 04:08:05 rlk Exp $"
+ * "$Id: escp2-resolutions.c,v 1.51 2008/07/06 02:17:43 rlk Exp $"
  *
  *   Print plug-in EPSON ESC/P2 driver for the GIMP.
  *
@@ -29,690 +29,307 @@
 #include <gutenprint/gutenprint-intl-internal.h>
 #include "print-escp2.h"
 
-static const res_t r_360x90dpi =
-{ "360x90dpi",     N_("360 x 90 DPI Fast Economy"),
-  360,  90,  360,  90,  360,  90,   0, 0, 1 };
-static const res_t r_360x90sw =
-{ "360x90sw",      N_("360 x 90 DPI Fast Economy"),
-  360,  90,  360,  90,  360,  90,   1, 0, 1 };
 
-static const res_t r_360x120dpi =
-{ "360x120dpi",    N_("360 x 120 DPI Economy"),
-  360,  120,  360,  120,  360,  120,  0, 0, 1 };
-static const res_t r_360x120sw =
-{ "360x120sw",     N_("360 x 120 DPI Economy"),
-  360,  120,  360,  120,  360,  120,  1, 0, 1 };
-
-static const res_t r_180dpi =
-{ "180dpi",        N_("180 DPI Economy"),
-  180,  180,  180,  180,  180,  180,  0, 0, 1 };
-static const res_t r_180sw =
-{ "180sw",         N_("180 DPI Economy"),
-  180,  180,  180,  180,  180,  180,  1, 0, 1 };
-
-static const res_t r_360x180dpi =
-{ "360x180dpi",    N_("360 x 180 DPI Draft"),
-  360,  180,  360,  180,  360,  180,  0, 0, 1 };
-static const res_t r_360x180sw =
-{ "360x180sw",     N_("360 x 180 DPI Draft"),
-  360,  180,  360,  180,  360,  180,  1, 0, 1 };
-
-static const res_t r_360x240dpi =
-{ "360x240dpi",    N_("360 x 240 DPI Draft"),
-  360,  240,  360,  240,  360,  240,  0, 0, 1 };
-static const res_t r_360x240sw =
-{ "360x240sw",     N_("360 x 240 DPI Draft"),
-  360,  240,  360,  240,  360,  240,  1, 0, 1 };
-
-static const res_t r_360mw =
-{ "360mw",         N_("360 DPI High Quality"),
-  360,  360,  360,  360,  360,  360,  0, 1, 1 };
-static const res_t r_360pro =
-{ "360pro",        N_("360 DPI"),
-  360,  360,  360,  360,  360,  360,  0, 1, 1 };
-static const res_t r_360 =
-{ "360",           N_("360 DPI"),
-  360,  360,  360,  360,  360,  360,  0, 0, 1 };
-static const res_t r_360sw =
-{ "360sw",         N_("360 DPI"),
-  360,  360,  360,  360,  360,  360,  1, 0, 1 };
-
-static const res_t r_720x360mw =
-{ "720x360mw",     N_("720 x 360 DPI"),
-  720,  360,  720,  360,  720,  360,  0, 1, 1 };
-static const res_t r_720x360sw =
-{ "720x360sw",     N_("720 x 360 DPI"),
-  720,  360,  720,  360,  720,  360,  1, 0, 1 };
-static const res_t r_720x360un =
-{ "720x360un",     N_("720 x 360 DPI Enhanced"),
-  720,  360, 1440,  720,  720,  360,  1, 0, 1 };
-
-static const res_t r_720mw =
-{ "720mw",         N_("720 DPI"),
-  720,  720,  720,  720,  720,  720,  0, 1, 1 };
-static const res_t r_720sw =
-{ "720sw",         N_("720 DPI"),
-  720,  720,  720,  720,  720,  720,  1, 0, 1 };
-static const res_t r_720un =
-{ "720un",         N_("720 DPI High Quality"),
-  720,  720, 1440,  720,  720,  720,  1, 0, 1 };
-static const res_t r_720hq =
-{ "720hq",         N_("720 DPI High Quality"),
-  720,  720,  720,  720,  720,  720,  1, 0, 2 };
-static const res_t r_720hq2 =
-{ "720hq2",        N_("720 DPI Highest Quality"),
-  720,  720,  720,  720,  720,  720,  1, 0, 4 };
-static const res_t r_720x720oov =
-{ "720x720oov",    N_("720 x 720 DPI"),
-  2880, 720,  2880, 720,  720, 720,  1, 0, 1 };
-
-static const res_t r_1440x720mw =
-{ "1440x720mw",     N_("1440 x 720 DPI"),
-  1440, 720,  1440, 720,  1440, 720,  0, 1, 1 };
-static const res_t r_1440x720sw =
-{ "1440x720sw",    N_("1440 x 720 DPI"),
-  1440, 720,  1440, 720,  1440, 720,  1, 0, 1 };
-static const res_t r_1440x720hq2 =
-{ "1440x720hq2",   N_("1440 x 720 DPI Highest Quality"),
-  1440, 720,  1440, 720,  1440, 720,  1, 0, 2 };
-static const res_t r_720x1440sw =
-{ "720x1440sw",    N_("1440 x 720 DPI Transposed"),
-  720, 1440,  720, 1440,  720, 1440,  1, 0, 1 };
-static const res_t r_720x1440ov =
-{ "720x1440ov",   N_("1440 x 720 DPI Transposed"),
-  1440, 1440, 1440, 1440, 720, 1440,  1, 0, 1};
-static const res_t r_1440x720ov =
-{ "1440x720ov",    N_("1440 x 720 DPI"),
-  2880, 720,  2880, 720,  1440, 720,  1, 0, 1 };
-
-static const res_t r_2880x720mw =
-{ "2880x720mw",    N_("2880 x 720 DPI"),
-  2880, 720,  2880, 720,  2880, 720,  0, 1, 1};
-static const res_t r_2880x720sw =
-{ "2880x720sw",    N_("2880 x 720 DPI"),
-  2880, 720,  2880, 720,  2880, 720,  1, 0, 1};
-static const res_t r_2880x720hq2 =
-{ "2880x720hq2",   N_("2880 x 720 DPI Highest Quality"),
-  2880, 720,  2880, 720,  2880, 720,  1, 0, 2 };
-
-static const res_t r_1440x1440mw =
-{ "1440x1440mw",   N_("1440 x 1440 DPI"),
-  1440, 1440,  1440, 1440,  1440, 1440, 0, 1, 1};
-static const res_t r_1440x1440sw =
-{ "1440x1440sw",   N_("1440 x 1440 DPI"),
-  1440, 1440,  1440, 1440,  1440, 1440, 1, 0, 1};
-static const res_t r_1440x1440ov =
-{ "1440x1440ov",   N_("1440 x 1440 DPI"),
-  2880, 1440,  2880, 1440,  1440, 1440, 1, 0, 1};
-
-static const res_t r_2880x1440mw =
-{ "2880x1440mw",   N_("2880 x 1440 DPI"),
-  2880, 1440,  2880, 1440,  2880, 1440, 0, 1, 1};
-static const res_t r_2880x1440sw =
-{ "2880x1440sw",   N_("2880 x 1440 DPI"),
-  2880, 1440,  2880, 1440,  2880, 1440, 1, 0, 1};
-static const res_t r_1440x2880sw =
-{ "1440x2880sw",   N_("2880 x 1440 DPI Transposed"),
-  1440, 2880,  1440, 2880,  1440, 2880, 1, 0, 1};
-static const res_t r_2880x1440sw2400 =
-{ "2880x1440sw",   N_("2880 x 1440 DPI"),
-  1440, 2880,  1440, 2880,  1440, 2880, 1, 0, 1};
-
-static const res_t r_5760x1440sw =
-{ "5760x1440sw",   N_("5760 x 1440 DPI"),
-  5760, 1440,  5760, 1440,  5760, 1440, 1, 0, 1};
-
-static const res_t r_2880x2880mw =
-{ "2880x2880mw",   N_("2880 x 2880 DPI"),
-  2880, 2880,  2880, 2880,  2880, 2880, 0, 1, 1};
-static const res_t r_2880x2880sw =
-{ "2880x2880sw",   N_("2880 x 2880 DPI"),
-  2880, 2880,  2880, 2880,  2880, 2880, 1, 0, 1};
-
-static const res_t r_5760x2880mw =
-{ "5760x2880mw",   N_("5760 x 2880 DPI"),
-  5760, 2880,  5760, 2880,  5760, 2880, 0, 1, 1};
-static const res_t r_5760x2880sw =
-{ "5760x2880sw",   N_("5760 x 2880 DPI"),
-  5760, 2880,  5760, 2880,  5760, 2880, 1, 0, 1};
-
-
-
-static const res_t *const stpi_escp2_720dpi_reslist[] =
-{
-  &r_360x90dpi,
-
-  &r_360x120dpi,
-
-  &r_180dpi,
-
-  &r_360x240dpi,
-
-  &r_360x180dpi,
-
-  &r_360mw,
-  &r_360,
-
-  &r_720x360sw,
-
-  &r_720mw,
-
-  NULL
-};
-
-static const res_t *const stpi_escp2_1440dpi_reslist[] =
+int
+stp_escp2_load_printer_weaves_from_xml(const stp_vars_t *v,
+				       stp_mxml_node_t *node)
 {
-  &r_360x90sw,
-
-  &r_360x120sw,
-
-  &r_180sw,
-
-  &r_360x240sw,
-
-  &r_360x180sw,
-
-  &r_360sw,
-
-  &r_720x360sw,
-
-  &r_720sw,
-  &r_720hq,
-
-  &r_1440x720sw,
-  &r_1440x720hq2,
-
-  NULL
-};
-
-static const res_t *const stpi_escp2_2880dpi_reslist[] =
-{
-  &r_360x90sw,
-
-  &r_360x120sw,
-
-  &r_180sw,
-
-  &r_360x240sw,
-
-  &r_360x180sw,
-
-  &r_360sw,
-
-  &r_720x360sw,
-
-  &r_720sw,
-
-  &r_1440x720sw,
-  &r_1440x720hq2,
-
-  &r_2880x720sw,
-  &r_2880x720hq2,
-
-  NULL
-};
-
-static const res_t *const stpi_escp2_2880_1440dpi_reslist[] =
-{
-  &r_360x90sw,
-
-  &r_360x120sw,
-
-  &r_180sw,
-
-  &r_360x240sw,
-
-  &r_360x180sw,
-
-  &r_360sw,
-
-  &r_720x360sw,
-
-  &r_720sw,
-
-  &r_1440x720sw,
-
-  &r_2880x720sw,
-
-  &r_1440x1440sw,
-
-  &r_2880x1440sw,
-
-  &r_2880x2880sw,
-
-  NULL
-};
-
-static const res_t *const stpi_escp2_g3_reslist[] =
-{
-  &r_360x90dpi,
-
-  &r_360x120dpi,
-
-  &r_180dpi,
-
-  &r_360x240dpi,
-
-  &r_360x180dpi,
-
-  &r_360mw,
-  &r_360,
-
-  &r_720x360sw,
-
-  &r_720sw,
-  &r_720hq,
-
-  &r_1440x720sw,
-  &r_1440x720hq2,
-
-  NULL
-};
-
-static const res_t *const stpi_escp2_superfine_reslist[] =
-{
-  &r_360x90sw,
-
-  &r_360x120sw,
-
-  &r_360x180sw,
-
-  &r_360x240sw,
-
-  &r_360sw,
-
-  &r_720x360sw,
-
-  &r_720sw,
-
-  &r_1440x720sw,
-
-  &r_1440x1440ov,
-
-  &r_2880x1440sw,
-
-  &r_5760x1440sw,
-
-  &r_2880x2880sw,
-
-  &r_5760x2880sw,
-
-  NULL
-};
-
-static const res_t *const stpi_escp2_claria_1400_reslist[] =
-{
-  &r_360x90sw,
-
-  &r_360x180sw,
-
-  &r_360x240sw,
-
-  &r_360sw,
-
-  &r_720x360sw,
-
-  &r_720x360un,
-
-  &r_720sw,
-
-  &r_720un,
-
-  &r_1440x720sw,
-
-  &r_1440x1440ov,
-
-  &r_2880x1440sw,
-
-  &r_5760x1440sw,
-
-  &r_2880x2880sw,
-
-  &r_5760x2880sw,
-
-  NULL
-};
-
-static const res_t *const stpi_escp2_picturemate_reslist[] =
-{
-
-  &r_720x720oov,
-
-  &r_1440x720ov,
-
-  &r_720x1440ov,
-
-  &r_1440x1440sw,
-
-  &r_2880x1440sw,
-
-  &r_5760x1440sw,
-
-  NULL
-};
-
-static const res_t *const stpi_escp2_sc500_reslist[] =
-{
-  &r_360x90dpi,
-
-  &r_360x120dpi,
-
-  &r_180dpi,
-
-  &r_360x240dpi,
-
-  &r_360x180dpi,
-
-  &r_360mw,
-  &r_360,
-
-  &r_720x360mw,
-
-  &r_720mw,
-
-  NULL
-};
-
-static const res_t *const stpi_escp2_g3_720dpi_reslist[] =
-{
-  &r_360x90dpi,
-
-  &r_360x120sw,
-
-  &r_180dpi,
-
-  &r_360x240sw,
-
-  &r_360x180dpi,
-
-  &r_360mw,
-  &r_360,
-
-  &r_720x360sw,
-
-  &r_720sw,
-  &r_720hq,
-  &r_720hq2,
-
-  NULL
-};
-
-static const res_t *const stpi_escp2_720dpi_soft_reslist[] =
-{
-  &r_360x90dpi,
-
-  &r_360x120sw,
-
-  &r_180dpi,
-
-  &r_360x240sw,
-
-  &r_360x180dpi,
-
-  &r_360sw,
-
-  &r_720x360sw,
-
-  &r_720sw,
-  &r_720hq,
-  &r_720hq2,
-
-  NULL
-};
-
-static const res_t *const stpi_escp2_sc640_reslist[] =
-{
-  &r_360x90dpi,
-
-  &r_180dpi,
-
-  &r_360x180dpi,
-
-  &r_360mw,
-  &r_360,
-
-  &r_720x360sw,
-
-  &r_720mw,
-
-  &r_1440x720sw,
-  &r_1440x720hq2,
-
-  NULL
-};
-
-static const res_t *const stpi_escp2_pro_reslist[] =
-{
-  &r_360x90dpi,
-
-  &r_180dpi,
-
-  &r_360x180dpi,
-
-  &r_360pro,
-
-  &r_720x360mw,
-
-  &r_720mw,
-
-  &r_1440x720mw,
-
-  &r_2880x720mw,
-
-  &r_1440x1440mw,
-
-  &r_2880x1440mw,
-
-  &r_2880x2880mw,
-
-  NULL
-};
-
-typedef struct
-{
-  const char *name;
-  const res_t *const *const res_list;
-} resolution_t;
-
-static const resolution_t the_resolutions[] =
-{
-  { "superfine", stpi_escp2_superfine_reslist },
-  { "claria_1400", stpi_escp2_claria_1400_reslist },
-  { "pro", stpi_escp2_pro_reslist },
-  { "720dpi", stpi_escp2_720dpi_reslist },
-  { "720dpi_soft", stpi_escp2_720dpi_soft_reslist },
-  { "g3_720dpi", stpi_escp2_g3_720dpi_reslist },
-  { "1440dpi", stpi_escp2_1440dpi_reslist },
-  { "2880dpi", stpi_escp2_2880dpi_reslist },
-  { "2880_1440dpi", stpi_escp2_2880_1440dpi_reslist },
-  { "g3", stpi_escp2_g3_reslist },
-  { "sc500", stpi_escp2_sc500_reslist },
-  { "sc640", stpi_escp2_sc640_reslist },
-  { "picturemate", stpi_escp2_picturemate_reslist },
-};
-
-const res_t *const *
-stpi_escp2_get_reslist_named(const char *n)
-{
-  int i;
-  if (n)
-    for (i = 0; i < sizeof(the_resolutions) / sizeof(resolution_t); i++)
-      {
-	if (strcmp(n, the_resolutions[i].name) == 0)
-	  return the_resolutions[i].res_list;
-      }
-  return NULL;
+  stpi_escp2_printer_t *printdef = stp_escp2_get_printer(v);
+  printer_weave_list_t *xpw = stp_malloc(sizeof(printer_weave_list_t));
+  int count = 0;
+  stp_mxml_node_t *child = node->child;
+  while (child)
+    {
+      if (child->type == STP_MXML_ELEMENT &&
+	  !strcmp(child->value.element.name, "weave"))
+	count++;
+      child = child->next;
+    }
+  printdef->printer_weaves = xpw;
+  if (stp_mxmlElementGetAttr(node, "name"))
+    xpw->name = stp_strdup(stp_mxmlElementGetAttr(node, "name"));
+  xpw->n_printer_weaves = count;
+  xpw->printer_weaves = stp_zalloc(sizeof(printer_weave_t) * count);
+  child = node->child;
+  count = 0;
+  while (child)
+    {
+      if (child->type == STP_MXML_ELEMENT &&
+	  !strcmp(child->value.element.name, "weave"))
+	{
+	  const char *wname = stp_mxmlElementGetAttr(child, "name");
+	  const char *wtext = stp_mxmlElementGetAttr(child, "text");
+	  const char *cmd = stp_mxmlElementGetAttr(child, "command");
+	  if (wname)
+	    xpw->printer_weaves[count].name = stp_strdup(wname);
+	  if (wtext)
+	    xpw->printer_weaves[count].text = stp_strdup(wtext);
+	  if (cmd)
+	    xpw->printer_weaves[count].command = stp_xmlstrtoraw(cmd);
+	  count++;
+	}
+      child = child->next;
+    }
+  return 1;
 }
 
-#define DECLARE_PRINTER_WEAVES(name)				\
-static const printer_weave_list_t name##_printer_weave_list =	\
-{								\
-  #name,							\
-  sizeof(name##_printer_weaves) / sizeof(printer_weave_t),	\
-  name##_printer_weaves						\
-}
-
-static const printer_weave_t standard_printer_weaves[] =
+int
+stp_escp2_load_printer_weaves(const stp_vars_t *v, const char *name)
 {
-  { "Off", N_("Off"), 0 },
-  { "On", N_("On"), 1 }
-};
-
-DECLARE_PRINTER_WEAVES(standard);
-
-static const printer_weave_t pro7000_printer_weaves[] =
-{
-  { "Off", N_("Off"), 0 },
-  { "On", N_("Interleave"), 1 },
-  { "FOL", N_("Full Overlap"), 2 },
-  { "FourPass", N_("Four Pass"), 3 },
-  { "FOL2", N_("Full Overlap 2"), 4 },
-};
-
-DECLARE_PRINTER_WEAVES(pro7000);
-
-static const printer_weave_t pro7500_printer_weaves[] =
-{
-  { "Off", N_("Off"), 0 },
-  { "On", N_("Interleave"), 1 },
-  { "FOL", N_("Full Overlap"), 2 },
-  { "FourPass", N_("Four Pass"), 3 },
-  { "FOL2", N_("Full Overlap 2"), 4 },
-  { "MW2", N_("Interleave 2"), 5 },
-};
-
-DECLARE_PRINTER_WEAVES(pro7500);
-
-static const printer_weave_t pro7600_printer_weaves[] =
-{
-  { "Off", N_("Off"), 0 },
-  { "On", N_("Interleave"), 1 },
-  { "FOL", N_("Full Overlap"), 2 },
-  { "FourPass", N_("Four Pass"), 3 },
-  { "FOL2", N_("Full Overlap 2"), 4 },
-  { "MW2", N_("Interleave 2"), 5 },
-  { "EightPass", N_("Eight Pass"), 6 },
-};
-
-DECLARE_PRINTER_WEAVES(pro7600);
-
-typedef struct
-{
-  const char *name;
-  const printer_weave_list_t *weave_list;
-} weave_t;
-
-static const weave_t the_weaves[] =
-{
-  { "standard", &standard_printer_weave_list },
-  { "pro7000", &pro7000_printer_weave_list },
-  { "pro7500", &pro7500_printer_weave_list },
-  { "pro7600", &pro7600_printer_weave_list },
-};
-
-const printer_weave_list_t *
-stpi_escp2_get_printer_weaves_named(const char *n)
-{
-  int i;
-  if (n)
-    for (i = 0; i < sizeof(the_weaves) / sizeof(weave_t); i++)
-      {
-	if (strcmp(n, the_weaves[i].name) == 0)
-	  return the_weaves[i].weave_list;
-      }
-  return NULL;
-}
-
-
-#define DECLARE_QUALITY_LIST(name)			\
-static const quality_list_t name##_quality_list =	\
-{							\
-  #name,						\
-  name##_qualities,					\
-  sizeof(name##_qualities) / sizeof(const quality_t),	\
+  stp_list_t *dirlist = stpi_data_path();
+  stp_list_item_t *item;
+  int found = 0;
+  item = stp_list_get_start(dirlist);
+  while (item)
+    {
+      const char *dn = (const char *) stp_list_item_get_data(item);
+      char *ffn = stpi_path_merge(dn, name);
+      stp_mxml_node_t *weaves =
+	stp_mxmlLoadFromFile(NULL, ffn, STP_MXML_NO_CALLBACK);
+      stp_free(ffn);
+      if (weaves)
+	{
+	  stp_mxml_node_t *node = stp_mxmlFindElement(weaves, weaves,
+						      "escp2:PrinterWeaves", NULL,
+						      NULL, STP_MXML_DESCEND);
+	  if (node)
+	    stp_escp2_load_printer_weaves_from_xml(v, node);
+	  stp_mxmlDelete(weaves);
+	  found = 1;
+	  break;
+	}
+      item = stp_list_item_next(item);
+    }
+  stp_list_destroy(dirlist);
+  if (! found)
+    {
+      stp_erprintf("Unable to load printer weaves from %s!\n", name);
+      stp_abort();
+    }
+  return found;
 }
 
-static const quality_t standard_qualities[] =
+int
+stp_escp2_load_resolutions_from_xml(const stp_vars_t *v, stp_mxml_node_t *node)
 {
-  { "FastEconomy", N_("Fast Economy"), 180, 90, 360, 120, 360, 90 },
-  { "Economy",     N_("Economy"),      360, 180, 360, 240, 360, 180 },
-  { "Draft",       N_("Draft"),        360, 360, 360, 360, 360, 360 },
-  { "Standard",    N_("Standard"),     0, 0, 0, 0, 720, 360 },
-  { "High",        N_("High"),         0, 0, 0, 0, 720, 720 },
-  { "Photo",       N_("Photo"),        1440, 720, 2880, 720, 1440, 720 },
-  { "HighPhoto",   N_("Super Photo"),  1440, 1440, 2880, 1440, 1440, 1440 },
-  { "UltraPhoto",  N_("Ultra Photo"),  2880, 1440, 2880, 1440, 2880, 1440 },
-  { "Best",        N_("Best"),         720, 360, 0, 1440, -1, -1 },
-};
-
-DECLARE_QUALITY_LIST(standard);
-
-static const quality_t v2880_qualities[] =
-{
-  { "FastEconomy", N_("Fast Economy"), 180, 90, 360, 120, 360, 90 },
-  { "Economy",     N_("Economy"),      360, 180, 360, 240, 360, 180 },
-  { "Draft",       N_("Draft"),        360, 360, 360, 360, 360, 360 },
-  { "Standard",    N_("Standard"),     0, 0, 0, 0, 720, 360 },
-  { "High",        N_("High"),         0, 0, 0, 0, 720, 720 },
-  { "Photo",       N_("Photo"),        1440, 720, 2880, 720, 1440, 720 },
-  { "HighPhoto",   N_("Super Photo"),  1440, 1440, 2880, 1440, 1440, 1440 },
-  { "UltraPhoto",  N_("Ultra Photo"),  2880, 2880, 2880, 2880, 2880, 2880 },
-  { "Best",        N_("Best"),         720, 360, 0, 0, -1, -1 },
-};
-
-DECLARE_QUALITY_LIST(v2880);
-
-static const quality_t p1_5_qualities[] =
-{
-  { "FastEconomy", N_("Fast Economy"), 180, 90, 360, 120, 360, 90 },
-  { "Economy",     N_("Economy"),      360, 180, 360, 240, 360, 180 },
-  { "Draft",       N_("Draft"),        360, 360, 360, 360, 360, 360 },
-  { "Standard",    N_("Standard"),     0, 0, 0, 0, 720, 360 },
-  { "High",        N_("High"),         0, 0, 0, 0, 720, 720 },
-  { "Photo",       N_("Photo"),        1440, 720, 1440, 720, 1440, 720 },
-  { "HighPhoto",   N_("Super Photo"),  1440, 1440, 2880, 1440, 1440, 1440 },
-  { "UltraPhoto",  N_("Ultra Photo"),  2880, 1440, 2880, 1440, 2880, 1440 },
-  { "Best",        N_("Best"),         720, 360, 0, 1440, -1, -1 },
-};
-
-DECLARE_QUALITY_LIST(p1_5);
-
-static const quality_t picturemate_qualities[] =
-{
-  { "Draft",       N_("Draft"),        1440,  720, 1440,  720, 1440,  720 },
-  { "Standard",    N_("Standard"),     1440, 1440, 1440, 1440, 1440, 1440 },
-  { "Photo",       N_("Photo"),        1440, 1440, 1440, 1440, 1440, 1440 },
-  { "High",        N_("High"),         2880, 1440, 2880, 1440, 2880, 1440 },
-  { "HighPhoto",   N_("Super Photo"),  2880, 1440, 2880, 1440, 2880, 1440 },
-  { "UltraPhoto",  N_("Ultra Photo"),  5760, 1440, 5760, 1440, 5760, 1440 },
-  { "Best",        N_("Best"),         5760, 1440, 5760, 1440, 5760, 1440 },
-};
-
-DECLARE_QUALITY_LIST(picturemate);
+  stpi_escp2_printer_t *printdef = stp_escp2_get_printer(v);
+  resolution_list_t *xrs = stp_malloc(sizeof(resolution_list_t));
+  int count = 0;
+  stp_mxml_node_t *child = node->child;
+  while (child)
+    {
+      if (child->type == STP_MXML_ELEMENT &&
+	  !strcmp(child->value.element.name, "resolution"))
+	count++;
+      child = child->next;
+    }
+  printdef->resolutions = xrs;
+  if (stp_mxmlElementGetAttr(node, "name"))
+    xrs->name = stp_strdup(stp_mxmlElementGetAttr(node, "name"));
+  xrs->n_resolutions = count;
+  xrs->resolutions = stp_zalloc(sizeof(res_t) * count);
+  child = node->child;
+  count = 0;
+  while (child)
+    {
+      if (child->type == STP_MXML_ELEMENT &&
+	  !strcmp(child->value.element.name, "resolution"))
+	{
+	  res_t *res = &(xrs->resolutions[count]);
+	  stp_mxml_node_t *cchild = child->child;
+	  const char *wname = stp_mxmlElementGetAttr(child, "name");
+	  const char *wtext = stp_mxmlElementGetAttr(child, "text");
+	  res->v = stp_vars_create();
+	  res->vertical_passes = 1;
+	  if (wname)
+	    res->name = stp_strdup(wname);
+	  if (wtext)
+	    res->text = stp_strdup(wtext);
+	  stp_vars_fill_from_xmltree_ref(cchild, node, res->v);
+	  while (cchild)
+	    {
+	      if (cchild->type == STP_MXML_ELEMENT)
+		{
+		  const char *elt = cchild->value.element.name;
+		  if (cchild->type == STP_MXML_ELEMENT &&
+		      (!strcmp(elt, "physicalResolution") ||
+		       !strcmp(elt, "printedResolution")))
+		    {
+		      long data[2] = { 0, 0 };
+		      stp_mxml_node_t *ccchild = cchild->child;
+		      data[0] = stp_xmlstrtol(ccchild->value.text.string);
+		      ccchild = ccchild->next;
+		      data[1] = stp_xmlstrtol(ccchild->value.text.string);
+		      if (!strcmp(elt, "physicalResolution"))
+			{
+			  res->hres = data[0];
+			  res->vres = data[1];
+			}			      
+		      else if (!strcmp(elt, "printedResolution"))
+			{
+			  res->printed_hres = data[0];
+			  res->printed_vres = data[1];
+			}			      
+		    }
+		  else if (!strcmp(elt, "verticalPasses") &&
+			   cchild->child &&
+			   cchild->child->type == STP_MXML_TEXT)
+		    res->vertical_passes = stp_xmlstrtol(cchild->child->value.text.string);
+		  else if (!strcmp(elt, "printerWeave") &&
+			   stp_mxmlElementGetAttr(cchild, "command"))
+		    res->command = stp_xmlstrtoraw(stp_mxmlElementGetAttr(cchild, "command"));
+		}
+	      cchild = cchild->next;
+	    }
+	  if (!res->printed_hres)
+	    res->printed_hres = res->hres;
+	  if (!res->printed_vres)
+	    res->printed_vres = res->vres;
+	  count++;
+	}
+      child = child->next;
+    }
+  return 1;
+}
 
-typedef struct
+int
+stp_escp2_load_resolutions(const stp_vars_t *v, const char *name)
 {
-  const char *name;
-  const quality_list_t *quality_list;
-} qual_t;
+  stp_list_t *dirlist = stpi_data_path();
+  stp_list_item_t *item;
+  int found = 0;
+  item = stp_list_get_start(dirlist);
+  while (item)
+    {
+      const char *dn = (const char *) stp_list_item_get_data(item);
+      char *ffn = stpi_path_merge(dn, name);
+      stp_mxml_node_t *resolutions =
+	stp_mxmlLoadFromFile(NULL, ffn, STP_MXML_NO_CALLBACK);
+      stp_free(ffn);
+      if (resolutions)
+	{
+	  stp_mxml_node_t *node = stp_mxmlFindElement(resolutions, resolutions,
+						      "escp2:resolutions", NULL,
+						      NULL, STP_MXML_DESCEND);
+	  if (node)
+	    stp_escp2_load_resolutions_from_xml(v, node);
+	  stp_mxmlDelete(resolutions);
+	  found = 1;
+	  break;
+	}
+      item = stp_list_item_next(item);
+    }
+  stp_list_destroy(dirlist);
+  if (! found)
+    {
+      stp_erprintf("Unable to load resolutions from %s!\n", name);
+      stp_abort();
+    }
+  return found;
+}
 
-static const qual_t the_qualities[] =
+int
+stp_escp2_load_quality_presets_from_xml(const stp_vars_t *v, stp_mxml_node_t *node)
 {
-  { "standard", &standard_quality_list },
-  { "p1_5", &p1_5_quality_list },
-  { "picturemate", &picturemate_quality_list },
-  { "v2880", &v2880_quality_list },
-};
+  stpi_escp2_printer_t *printdef = stp_escp2_get_printer(v);
+  quality_list_t *qpw = stp_malloc(sizeof(quality_list_t));
+  int count = 0;
+  stp_mxml_node_t *child = node->child;
+  while (child)
+    {
+      if (child->type == STP_MXML_ELEMENT &&
+	  !strcmp(child->value.element.name, "quality"))
+	count++;
+      child = child->next;
+    }
+  printdef->quality_list = qpw;
+  if (stp_mxmlElementGetAttr(node, "name"))
+    qpw->name = stp_strdup(stp_mxmlElementGetAttr(node, "name"));
+  qpw->n_quals = count;
+  qpw->qualities = stp_zalloc(sizeof(quality_t) * count);
+  child = node->child;
+  count = 0;
+  while (child)
+    {
+      if (child->type == STP_MXML_ELEMENT &&
+	  !strcmp(child->value.element.name, "quality"))
+	{
+	  stp_mxml_node_t *cchild = child->child;
+	  const char *wname = stp_mxmlElementGetAttr(child, "name");
+	  const char *wtext = stp_mxmlElementGetAttr(child, "text");
+	  if (wname)
+	    qpw->qualities[count].name = stp_strdup(wname);
+	  if (wtext)
+	    qpw->qualities[count].text = stp_strdup(wtext);
+	  while (cchild)
+	    {
+	      if (cchild->type == STP_MXML_ELEMENT &&
+		  (!strcmp(cchild->value.element.name, "minimumResolution") ||
+		   !strcmp(cchild->value.element.name, "maximumResolution") ||
+		   !strcmp(cchild->value.element.name, "desiredResolution")))
+		{
+		  long data[2] = { 0, 0 };
+		  stp_mxml_node_t *ccchild = cchild->child;
+		  data[0] = stp_xmlstrtol(ccchild->value.text.string);
+		  ccchild = ccchild->next;
+		  data[1] = stp_xmlstrtol(ccchild->value.text.string);
+		  if (!strcmp(cchild->value.element.name, "minimumResolution"))
+		    {
+		      qpw->qualities[count].min_hres = data[0];
+		      qpw->qualities[count].min_vres = data[1];
+		    }			      
+		  else if (!strcmp(cchild->value.element.name, "maximumResolution"))
+		    {
+		      qpw->qualities[count].max_hres = data[0];
+		      qpw->qualities[count].max_vres = data[1];
+		    }			      
+		  else if (!strcmp(cchild->value.element.name, "desiredResolution"))
+		    {
+		      qpw->qualities[count].desired_hres = data[0];
+		      qpw->qualities[count].desired_vres = data[1];
+		    }			      
+		}
+	      cchild = cchild->next;
+	    }
+	  count++;
+	}
+      child = child->next;
+    }
+  return 1;
+}
 
-const quality_list_t *
-stpi_escp2_get_quality_list_named(const char *n)
+int
+stp_escp2_load_quality_presets(const stp_vars_t *v, const char *name)
 {
-  int i;
-  if (n)
-    for (i = 0; i < sizeof(the_qualities) / sizeof(qual_t); i++)
-      {
-	if (strcmp(n, the_qualities[i].name) == 0)
-	  return the_qualities[i].quality_list;
-      }
-  return NULL;
+  stp_list_t *dirlist = stpi_data_path();
+  stp_list_item_t *item;
+  int found = 0;
+  item = stp_list_get_start(dirlist);
+  while (item)
+    {
+      const char *dn = (const char *) stp_list_item_get_data(item);
+      char *ffn = stpi_path_merge(dn, name);
+      stp_mxml_node_t *qualities =
+	stp_mxmlLoadFromFile(NULL, ffn, STP_MXML_NO_CALLBACK);
+      stp_free(ffn);
+      if (qualities)
+	{
+	  stp_mxml_node_t *node = stp_mxmlFindElement(qualities, qualities,
+						      "escp2:QualityPresets", NULL,
+						      NULL, STP_MXML_DESCEND);
+	  if (node)
+	    stp_escp2_load_quality_presets_from_xml(v, node);
+	  stp_mxmlDelete(qualities);
+	  found = 1;
+	  break;
+	}
+      item = stp_list_item_next(item);
+    }
+  stp_list_destroy(dirlist);
+  if (! found)
+    {
+      stp_erprintf("Unable to load quality presets from %s!\n", name);
+      stp_abort();
+    }
+  return found;
 }
diff --git a/src/main/generic-options.c b/src/main/generic-options.c
index fc9746c..d0e52da 100644
--- a/src/main/generic-options.c
+++ b/src/main/generic-options.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: generic-options.c,v 1.10 2006/05/28 16:59:04 rlk Exp $"
+ * "$Id: generic-options.c,v 1.11 2008/07/04 14:29:29 rlk Exp $"
  *
  *   Copyright 2003 Robert Krawitz (rlk@alum.mit.edu)
  *
@@ -15,7 +15,7 @@
  *
  *   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.
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111STP_CHANNEL_NONE307, USA.
  */
 
 #ifdef HAVE_CONFIG_H
@@ -62,25 +62,25 @@ static const stp_parameter_t the_parameters[] =
     "Quality", N_("Print Quality"), N_("Basic Output Adjustment"),
     N_("Print Quality"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 0, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 0, 0
   },
   {
     "ImageType", N_("Image Type"), N_("Basic Image Adjustment"),
     N_("Type of image being printed"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_OUTPUT,
-    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 0, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 0, 0
   },
   {
     "JobMode", N_("Job Mode"), N_("Job Mode"),
     N_("Job vs. page mode"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_CORE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 0, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 0, 0
   },
   {
     "PageNumber", N_("Page Number"), N_("Job Mode"),
     N_("Page number"),
     STP_PARAMETER_TYPE_INT, STP_PARAMETER_CLASS_CORE,
-    STP_PARAMETER_LEVEL_BASIC, 0, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 0, 1, STP_CHANNEL_NONE, 1, 0
   },
 };
 
diff --git a/src/main/mxml-file.c b/src/main/mxml-file.c
index ef676e7..3209169 100644
--- a/src/main/mxml-file.c
+++ b/src/main/mxml-file.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: mxml-file.c,v 1.7 2004/09/17 18:38:21 rleigh Exp $"
+ * "$Id: mxml-file.c,v 1.10 2008/07/20 01:12:15 easysw Exp $"
  *
  * File loading code for mini-XML, a small XML-like file parsing library.
  *
@@ -18,6 +18,7 @@
  * Contents:
  *
  *   stp_mxmlLoadFile()        - Load a file into an XML node tree.
+ *   stp_mxmlLoadFromFile()    - Load a file into an XML node tree.
  *   stp_mxmlLoadString()      - Load a string into an XML node tree.
  *   stp_mxmlSaveAllocString() - Save an XML node tree to an allocated string.
  *   stp_mxmlSaveFile()        - Save an XML tree to a file.
@@ -86,6 +87,32 @@ stp_mxmlLoadFile(stp_mxml_node_t *top,		/* I - Top node */
   return (mxml_load_data(top, fp, cb, mxml_file_getc));
 }
 
+/*
+ * 'stp_mxmlLoadFromFile()' - Load a named file into an XML node tree.
+ *
+ * The nodes in the specified file are added to the specified top node.
+ * If no top node is provided, the XML file MUST be well-formed with a
+ * single parent node like <?xml> for the entire file. The callback
+ * function returns the value type that should be used for child nodes.
+ * If STP_MXML_NO_CALLBACK is specified then all child nodes will be either
+ * STP_MXML_ELEMENT or STP_MXML_TEXT nodes.
+ */
+
+stp_mxml_node_t *				/* O - First node or NULL if the file could not be read. */
+stp_mxmlLoadFromFile(stp_mxml_node_t *top,	/* I - Top node */
+		     const char *file,		/* I - File to read from */
+		     stp_mxml_type_t (*cb)(stp_mxml_node_t *))
+					/* I - Callback function or STP_MXML_NO_CALLBACK */
+{
+  FILE *fp = fopen(file, "r");
+  stp_mxml_node_t *doc;
+  if (! fp)
+    return NULL;
+  doc = stp_mxmlLoadFile(top, fp, cb);
+  fclose(fp);
+  return doc;
+}
+
 
 /*
  * 'stp_mxmlLoadString()' - Load a string into an XML node tree.
@@ -202,6 +229,24 @@ stp_mxmlSaveFile(stp_mxml_node_t *node,		/* I - Node to write */
   return (0);
 }
 
+int					/* O - 0 on success, -1 on error. */
+stp_mxmlSaveToFile(stp_mxml_node_t *node,	/* I - Node to write */
+		   const char      *file,	/* I - File to write to */
+		   int             (*cb)(stp_mxml_node_t *, int))
+					/* I - Whitespace callback or STP_MXML_NO_CALLBACK */
+{
+  FILE *fp = fopen(file, "w");
+  int answer;
+  int status;
+  if (!fp)
+    return -1;
+  answer = stp_mxmlSaveFile(node, fp, cb);
+  status = fclose(fp);
+  if (status != 0)
+    return -1;
+  else
+    return answer;
+}
 
 /*
  * 'stp_mxmlSaveString()' - Save an XML node tree to a string.
@@ -562,7 +607,7 @@ mxml_load_data(stp_mxml_node_t *top,	/* I - Top node */
 	  */
 
 	  fprintf(stderr, "Mismatched close tag <%s> under parent <%s>!\n",
-	          buffer, parent->value.element.name);
+	          buffer, parent ? parent->value.element.name : "(null)");
           break;
 	}
 
@@ -1432,5 +1477,5 @@ mxml_write_ws(stp_mxml_node_t *node,	/* I - Current node */
 
 
 /*
- * End of "$Id: mxml-file.c,v 1.7 2004/09/17 18:38:21 rleigh Exp $".
+ * End of "$Id: mxml-file.c,v 1.10 2008/07/20 01:12:15 easysw Exp $".
  */
diff --git a/src/main/path.c b/src/main/path.c
index 03ad06e..12a9ec8 100644
--- a/src/main/path.c
+++ b/src/main/path.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: path.c,v 1.19 2006/07/07 21:31:02 rleigh Exp $"
+ * "$Id: path.c,v 1.20 2008/06/01 14:41:18 rlk Exp $"
  *
  *   Gutenprint path functions - split and search paths.
  *
@@ -33,8 +33,6 @@
 #include <unistd.h>
 
 static int stpi_path_check(const struct dirent *module);
-static char *stpi_path_merge(const char *path,
-			     const char *file);
 static int stpi_scandir (const char *dir,
 			 struct dirent ***namelist,
 			 int (*sel) (const struct dirent *),
@@ -150,11 +148,33 @@ stpi_path_check(const struct dirent *module) /* File to check */
   return status;
 }
 
+stp_list_t *
+stpi_data_path(void)
+{
+  stp_list_t *dir_list;                  /* List of directories to scan */
+  if (!(dir_list = stp_list_create()))
+    return NULL;
+  stp_list_set_freefunc(dir_list, stp_list_node_free_data);
+  if (getenv("STP_DATA_PATH"))
+    stp_path_split(dir_list, getenv("STP_DATA_PATH"));
+  else
+    stp_path_split(dir_list, PKGXMLDATADIR);
+  return dir_list;
+}
+
+stp_list_t *
+stpi_list_files_on_data_path(const char *name)
+{
+  stp_list_t *dir_list = stpi_data_path(); /* List of directories to scan */
+  stp_list_t *file_list = stp_path_search(dir_list, name);
+  stp_list_destroy(dir_list);
+  return file_list;
+}
 
 /*
  * Join a path and filename together.
  */
-static char *
+char *
 stpi_path_merge(const char *path, /* Path */
 	       const char *file) /* Filename */
 {
diff --git a/src/main/print-canon.c b/src/main/print-canon.c
index 9a2080d..6e085fb 100644
--- a/src/main/print-canon.c
+++ b/src/main/print-canon.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-canon.c,v 1.226 2008/04/20 13:39:16 faust3 Exp $"
+ * "$Id: print-canon.c,v 1.229 2008/08/06 20:46:49 faust3 Exp $"
  *
  *   Print plug-in CANON BJL driver for the GIMP.
  *
@@ -200,79 +200,85 @@ static const stp_parameter_t the_parameters[] =
     "PageSize", N_("Page Size"), N_("Basic Printer Setup"),
     N_("Size of the paper being printed to"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_CORE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "MediaType", N_("Media Type"), N_("Basic Printer Setup"),
     N_("Type of media (plain paper, photo paper, etc.)"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "InputSlot", N_("Media Source"), N_("Basic Printer Setup"),
     N_("Source (input slot) of the media"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "CDInnerRadius", N_("CD Hub Size"), N_("Basic Printer Setup"),
     N_("Print only outside of the hub of the CD, or all the way to the hole"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "CDOuterDiameter", N_("CD Size (Custom)"), N_("Basic Printer Setup"),
     N_("Variable adjustment for the outer diameter of CD"),
     STP_PARAMETER_TYPE_DIMENSION, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_ADVANCED, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_ADVANCED, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "CDInnerDiameter", N_("CD Hub Size (Custom)"), N_("Basic Printer Setup"),
     N_("Variable adjustment to the inner hub of the CD"),
     STP_PARAMETER_TYPE_DIMENSION, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_ADVANCED, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_ADVANCED, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "CDXAdjustment", N_("CD Horizontal Fine Adjustment"), N_("Advanced Printer Setup"),
     N_("Fine adjustment to horizontal position for CD printing"),
     STP_PARAMETER_TYPE_DIMENSION, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_ADVANCED, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_ADVANCED, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "CDYAdjustment", N_("CD Vertical Fine Adjustment"), N_("Advanced Printer Setup"),
     N_("Fine adjustment to horizontal position for CD printing"),
     STP_PARAMETER_TYPE_DIMENSION, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_ADVANCED, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_ADVANCED, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "Resolution", N_("Resolution"), N_("Basic Printer Setup"),
     N_("Resolution and quality of the print"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "InkType", N_("Ink Type"), N_("Advanced Printer Setup"),
     N_("Type of ink in the printer"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "InkChannels", N_("Ink Channels"), N_("Advanced Printer Functionality"),
     N_("Ink Channels"),
     STP_PARAMETER_TYPE_INT, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_INTERNAL, 0, 0, -1, 0, 0
+    STP_PARAMETER_LEVEL_INTERNAL, 0, 0, STP_CHANNEL_NONE, 0, 0
   },
   {
     "PrintingMode", N_("Printing Mode"), N_("Core Parameter"),
     N_("Printing Output Mode"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_CORE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "Duplex", N_("Double-Sided Printing"), N_("Basic Printer Setup"),
     N_("Duplex/Tumble Setting"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
+  },
+  {
+    "Quality", N_("Print Quality"), N_("Basic Output Adjustment"),
+    N_("Print Quality"),
+    STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_FEATURE,
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 0, 0
   },
 };
 
@@ -324,26 +330,26 @@ static const float_param_t float_parameters[] =
   },
   {
     {
-      "LightCyanTransition", N_("Light Cyan Transition"), N_("Advanced Ink Adjustment"),
+      "LightCyanTrans", N_("Light Cyan Transition"), N_("Advanced Ink Adjustment"),
       N_("Light Cyan Transition"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
-      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, -1, 1, 0
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
     }, 0.0, 5.0, 1.0, 1
   },
   {
     {
-      "LightMagentaTransition", N_("Light Magenta Transition"), N_("Advanced Ink Adjustment"),
+      "LightMagentaTrans", N_("Light Magenta Transition"), N_("Advanced Ink Adjustment"),
       N_("Light Magenta Transition"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
-      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, -1, 1, 0
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
     }, 0.0, 5.0, 1.0, 1
   },
  {
     {
-      "LightYellowTransition", N_("Light Yellow Transition"), N_("Advanced Ink Adjustment"),
+      "LightYellowTrans", N_("Light Yellow Transition"), N_("Advanced Ink Adjustment"),
       N_("Light Yellow Transition"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
-      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, -1, 1, 0
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
     }, 0.0, 5.0, 1.0, 1
   },
 };
@@ -454,9 +460,11 @@ canon_source_type(const char *name, const canon_cap_t * caps)
 static const canon_mode_t* canon_get_current_mode(const stp_vars_t *v){
     const char* input_slot = stp_get_string_parameter(v, "InputSlot");
     const char *resolution = stp_get_string_parameter(v, "Resolution");
+    const char *quality = stp_get_string_parameter(v, "Quality");
     const canon_cap_t * caps = canon_get_model_capabilities(v);
     const canon_mode_t* mode = NULL;
     int i;
+
     if(resolution){
         for(i=0;i<caps->modelist->count;i++){
             if(!strcmp(resolution,caps->modelist->modes[i].name)){
@@ -465,10 +473,20 @@ static const canon_mode_t* canon_get_current_mode(const stp_vars_t *v){
             }
         }
     }
+
     if(!mode)
         mode = &caps->modelist->modes[caps->modelist->default_mode];
 
 #if 0
+    if(quality && strcmp(quality, "None") == 0)
+        quality = "Standard";
+
+    if(quality && !strcmp(quality,"Standard")){
+        return &caps->modelist->modes[caps->modelist->default_mode];
+    }
+#endif
+
+#if 0
     /* only some modes can print to cd */
     if(input_slot && !strcmp(input_slot,"CD") && !(mode->flags & MODE_FLAG_CD)){
         for(i=0;i<caps->modelist->count;i++){
@@ -806,6 +824,16 @@ canon_parameters(const stp_vars_t *v, const char *name,
     else
       description->is_active = 0;
   }
+  else if (strcmp(name, "Quality") == 0)
+  {
+    int has_standard_quality = 0;
+    description->bounds.str = stp_string_list_create();
+    stp_string_list_add_string(description->bounds.str, "None",
+			       _("Manual Control"));
+    stp_string_list_add_string(description->bounds.str, "Standard",
+			       _("Standard"));
+    description->deflt.str = "Standard";
+  }
 }
 
 
@@ -1587,7 +1615,7 @@ static void canon_setup_channels(stp_vars_t *v,canon_privdata_t* privdata){
     const char secondary[STP_NCOLORS] = {'k','c','m','y'};
     /* names of the density adjustment controls */
     const char *primary_density_control[STP_NCOLORS] = {"BlackDensity","CyanDensity","MagentaDensity","YellowDensity"};
-    const char *secondary_density_control[STP_NCOLORS] = {NULL,"LightCyanTransition","LightMagentaTransition","LightYellowTransition"};
+    const char *secondary_density_control[STP_NCOLORS] = {NULL,"LightCyanTrans","LightMagentaTrans","LightYellowTrans"};
     /* ink darkness for every channel */
     const double ink_darkness[] = {1.0, 0.31 / .5, 0.61 / .97, 0.08};
     const char* channel_order = default_channel_order;
diff --git a/src/main/print-color.c b/src/main/print-color.c
index 0c7e592..9b0ec54 100644
--- a/src/main/print-color.c
+++ b/src/main/print-color.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-color.c,v 1.139 2008/01/25 00:38:32 rlk Exp $"
+ * "$Id: print-color.c,v 1.140 2008/07/09 00:26:52 rlk Exp $"
  *
  *   Gutenprint color management module - traditional Gutenprint algorithm.
  *
@@ -176,7 +176,7 @@ static const float_param_t float_parameters[] =
       "ColorCorrection", N_("Color Correction"), N_("Basic Image Adjustment"),
       N_("Color correction to be applied"),
       STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_OUTPUT,
-      STP_PARAMETER_LEVEL_ADVANCED, 1, 1, -1, 1, 0
+      STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
     }, 0.0, 0.0, 0.0, CMASK_EVERY, 0, -1
   },
   {
diff --git a/src/main/print-escp2-data.c b/src/main/print-escp2-data.c
index 9a7ff60..5a51947 100644
--- a/src/main/print-escp2-data.c
+++ b/src/main/print-escp2-data.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-escp2-data.c,v 1.246 2008/02/27 00:43:37 rlk Exp $"
+ * "$Id: print-escp2-data.c,v 1.270 2008/07/16 02:00:17 rlk Exp $"
  *
  *   Print plug-in EPSON ESC/P2 driver for the GIMP.
  *
@@ -30,2019 +30,472 @@
 #include "print-escp2.h"
 #include <limits.h>
 
-/*
- * Dot sizes are for:
- *
- *  0: 120/180
- *  1: 360
- *  2: 720x360
- *  3: 720
- *  4: 1440x720
- *  5: 2880x720 or 1440x1440
- *  6: 2880x1440
- *  7: 2880x2880
- *  8: 5760x2880
- */
-
-/*   0     1     2     3     4     5     6     7     8 */
-
-static const escp2_dot_size_t g1_dotsizes =
-{   -2,   -2,   -2,   -2,   -1,   -1,   -1,   -1,   -1 };
-
-static const escp2_dot_size_t g2_dotsizes =
-{   -2,   -2,   -2,   -2,   -1,   -1,   -1,   -1,   -1 };
-
-static const escp2_dot_size_t g3_dotsizes =
-{    3,    3,    2,    1,    1,   -1,   -1,   -1,   -1 };
-
-static const escp2_dot_size_t c6pl_dotsizes =
-{ 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10 };
-
-static const escp2_dot_size_t c4pl_dotsizes =
-{ 0x12, 0x12, 0x12, 0x11, 0x10, 0x10, 0x10, 0x10, 0x10 };
-
-static const escp2_dot_size_t c4pl_pigment_dotsizes =
-{ 0x12, 0x12, 0x12, 0x11, 0x11, 0x10, 0x10, 0x10, 0x10 };
-
-static const escp2_dot_size_t c3pl_dotsizes =
-{ 0x11, 0x11, 0x11, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10 };
-
-static const escp2_dot_size_t c3pl_pigment_dotsizes =
-{ 0x10, 0x10, 0x10, 0x11, 0x12, 0x12, 0x12, 0x12, 0x12 };
-
-static const escp2_dot_size_t c3pl_pigment_c120_dotsizes =
-{ 0x11, 0x11, 0x12, 0x12, 0x13, 0x13, 0x13, 0x13, 0x13 };
-
-static const escp2_dot_size_t p3pl_dotsizes =
-{ 0x10, 0x10, 0x10, 0x11, 0x12, 0x12, 0x12, 0x12, 0x12 };
-
-static const escp2_dot_size_t p1_5pl_dotsizes =
-{ 0x10, 0x10, 0x10, 0x11, 0x12, 0x13, 0x13, 0x13, 0x13 };
-
-static const escp2_dot_size_t claria_dotsizes =
-{ 0x33, 0x33, 0x24, 0x24, 0x24, 0x24, 0x25, 0x25, 0x25 };
-
-static const escp2_dot_size_t claria_1400_dotsizes =
-{ 0x33, 0x33, 0x21, 0x21, 0x33, 0x33, 0x25, 0x25, 0x25 };
-
-static const escp2_dot_size_t c2pl_dotsizes =
-{ 0x12, 0x12, 0x12, 0x11, 0x13,   -1, 0x10, 0x10, 0x10 };
-
-static const escp2_dot_size_t c1_8pl_dotsizes =
-{ 0x10, 0x10, 0x10, 0x10, 0x11, 0x12, 0x12, 0x13, 0x13 };
-
-static const escp2_dot_size_t p3_5pl_dotsizes =
-{ 0x10, 0x10, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12 };
-
-static const escp2_dot_size_t sc440_dotsizes =
-{    3,    3,    2,    1,   -1,   -1,   -1,   -1,   -1 };
-
-static const escp2_dot_size_t sc480_dotsizes =
-{ 0x13, 0x13, 0x13, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10 };
-
-static const escp2_dot_size_t sc600_dotsizes =
-{    4,    4,    3,    2,    1,   -1,   -1,   -1,   -1 };
-
-static const escp2_dot_size_t sc640_dotsizes =
-{    3,    3,    2,    1,    1,   -1,   -1,   -1,   -1 };
-
-static const escp2_dot_size_t sc660_dotsizes =
-{    3,    3,    0,    0,    0,   -1,   -1,   -1,   -1 };
-
-static const escp2_dot_size_t sc670_dotsizes =
-{ 0x12, 0x12, 0x12, 0x11, 0x11,   -1,   -1,   -1,   -1 };
-
-static const escp2_dot_size_t sp700_dotsizes =
-{    3,    3,    2,    1,    4,   -1,   -1,   -1,   -1 };
-
-static const escp2_dot_size_t sp720_dotsizes =
-{ 0x12, 0x12, 0x11, 0x11, 0x11,   -1,   -1,   -1,   -1 };
-
-static const escp2_dot_size_t sp2000_dotsizes =
-{ 0x11, 0x11, 0x11, 0x10, 0x10,   -1,   -1,   -1,   -1 };
-
-static const escp2_dot_size_t spro_dye_dotsizes =
-{    3,    3,    3,    1,    1,   -1,   -1,   -1,   -1 };
-
-static const escp2_dot_size_t spro_pigment_dotsizes =
-{    3,    3,    2,    1,    1,   -1,   -1,   -1,   -1 };
-
-static const escp2_dot_size_t spro10000_dotsizes =
-{    4, 0x11, 0x11, 0x10, 0x10,   -1,   -1,   -1,   -1 };
-
-static const escp2_dot_size_t spro5000_dotsizes =
-{    3,    3,    2,    1,    4,   -1,   -1,   -1,   -1 };
-
-static const escp2_dot_size_t spro_c4pl_pigment_dotsizes =
-{ 0x11, 0x11, 0x11, 0x10, 0x10,   -1,    5,    5,    5 };
-
-static const escp2_dot_size_t picturemate_dotsizes =
-{   -1,   -1,   -1,   -1, 0x12, 0x12, 0x12, 0x12,   -1 };
-
-/*
- * Bits are for:
- *
- *  0: 120/180
- *  1: 360
- *  2: 720x360
- *  3: 720
- *  4: 1440x720
- *  5: 2880x720 or 1440x1440
- *  6: 2880x1440
- *  7: 2880x2880
- *  8: 5760x2880
- */
-
-/*   0     1     2     3     4     5     6     7     8 */
-
-static const escp2_bits_t variable_bits =
-{    2,    2,    2,    2,    2,    2,    2,    2,    2 };
-
-static const escp2_bits_t stp950_bits =
-{    2,    2,    2,    2,    2,    2,    1,    1,    1 };
-
-static const escp2_bits_t ultrachrome_bits =
-{    2,    2,    2,    2,    2,    1,    1,    1,    1 };
-
-static const escp2_bits_t standard_bits =
-{    1,    1,    1,    1,    1,    1,    1,    1,    1 };
-
-static const escp2_bits_t c1_8_bits =
-{    2,    2,    2,    2,    2,    1,    1,    1,    1 };
-
-/*
- * Base resolutions are for:
- *
- *  0: 120/180
- *  1: 360
- *  2: 720x360
- *  3: 720
- *  4: 1440x720
- *  5: 2880x720 or 1440x1440
- *  6: 2880x1440
- *  7: 2880x2880
- *  8: 5760x2880
- */
-
-/*   0     1     2     3     4     5     6     7     8 */
-
-static const escp2_base_resolutions_t standard_base_res =
-{  720,  720,  720,  720,  720,  720,  720,  720,  720 };
-
-static const escp2_base_resolutions_t g3_base_res =
-{  720,  720,  720,  720,  360,  360,  360,  360,  360 };
-
-static const escp2_base_resolutions_t variable_base_res =
-{  360,  360,  360,  360,  360,  360,  360,  360,  360 };
-
-static const escp2_base_resolutions_t stp950_base_res =
-{  360,  360,  360,  360,  360,  720,  720,  720,  720 };
-
-static const escp2_base_resolutions_t ultrachrome_base_res =
-{  360,  360,  360,  360,  360,  720,  720,  720,  720 };
-
-static const escp2_base_resolutions_t c1_8_base_res =
-{  360,  360,  720,  720,  720, 1440, 1440, 1440, 1440 };
-
-static const escp2_base_resolutions_t c1_5_base_res =
-{  360,  360,  720,  720,  720,  720,  720,  720,  720 };
-
-static const escp2_base_resolutions_t claria_1400_base_res =
-{  360,  360,  720,  720,  360,  360,  720,  720,  720 };
-
-static const escp2_base_resolutions_t stc900_base_res =
-{  360,  360,  360,  360,  180,  180,  360,  360,  360 };
-
-static const escp2_base_resolutions_t pro_base_res =
-{ 2880, 2880, 2880, 2880, 2880, 2880, 2880, 2880, 5760 };
-
-/*
- * Densities are for:
- *
- *  0: 120/180
- *  1: 360
- *  2: 720x360
- *  3: 720
- *  4: 1440x720
- *  5: 2880x720 or 1440x1440
- *  6: 2880x1440
- *  7: 2880x2880
- *  8: 5760x2880
- */
-
-/*  0    1     2       3    4      5      6      7      8 */
-
-static const escp2_densities_t g1_densities =
-{ 2.6, 1.3,  1.3,  0.568, 0.0,   0.0,   0.0,   0.0,   0.0   };
-
-static const escp2_densities_t g3_densities =
-{ 2.6, 1.3,  0.65, 0.775, 0.388, 0.0,   0.0,   0.0,   0.0   };
-
-static const escp2_densities_t c6pl_densities =
-{ 4.0, 2.0,  1.0,  0.568, 0.568, 0.568, 0.0,   0.0,   0.0   };
-
-static const escp2_densities_t c4pl_2880_densities =
-{ 2.6, 1.3,  0.65, 0.650, 0.650, 0.650, 0.32,  0.0,   0.0   };
-
-static const escp2_densities_t c4pl_densities =
-{ 2.6, 1.3,  0.65, 0.568, 0.523, 0.792, 0.396, 0.0,   0.0   };
-
-static const escp2_densities_t c4pl_pigment_densities =
-{ 2.3, 1.15, 0.58, 0.766, 0.388, 0.958, 0.479, 0.0,   0.0   };
-
-static const escp2_densities_t c3pl_pigment_densities =
-{ 2.4, 1.2,  0.60, 0.600, 0.512, 0.512, 0.512, 0.0,   0.0   };
-
-static const escp2_densities_t c3pl_pigment_c66_densities =
-{ 2.8, 1.4,  0.70, 0.600, 0.512, 0.512, 0.512, 0.0,   0.0   };
-
-static const escp2_densities_t c3pl_pigment_c120_densities =
-{ 4.0, 2.0,  1.56, 0.780, 0.512, 0.512, 0.512, 0.256, 0.128 };
-
-static const escp2_densities_t c3pl_densities =
-{ 2.6, 1.3,  0.65, 0.730, 0.7,   0.91,  0.455, 0.0,   0.0   };
-
-static const escp2_densities_t p3pl_densities =
-{ 4.0, 2.0,  1.00, 0.679, 0.657, 0.684, 0.566, 0.283, 0.0   };
-
-static const escp2_densities_t p1_5pl_densities =
-{ 2.8, 1.4,  1.00, 1.000, 0.869, 0.942, 0.471, 0.500, 0.530 };
-
-static const escp2_densities_t claria_densities =
-{ 4.0, 4.0,  3.52, 1.760, 0.880, 0.440, 0.586, 0.733, 0.440 };
-
-static const escp2_densities_t claria_1400_densities =
-{ 4.0, 4.0,  3.52, 1.760, 0.880, 0.440, 0.586, 0.733, 0.440 };
-
-static const escp2_densities_t p3_5pl_densities =
-{ 2.8, 1.4,  1.77, 0.886, 0.443, 0.221, 0.240, 0.293, 0.146 };
-
-static const escp2_densities_t c2pl_densities =
-{ 2.0, 1.0,  0.5,  0.650, 0.650, 0.0,   0.650, 0.325, 0.0   };
-
-static const escp2_densities_t c1_8pl_densities =
-{ 2.3, 1.15, 0.57, 0.650, 0.650, 0.0,   0.650, 0.360, 0.0   };
-
-static const escp2_densities_t sc1500_densities =
-{ 2.6, 1.3,  1.3,  0.631, 0.0,   0.0,   0.0,   0.0,   0.0   };
-
-static const escp2_densities_t sc440_densities =
-{ 4.0, 2.0,  1.0,  0.900, 0.45,  0.0,   0.0,   0.0,   0.0   };
-
-static const escp2_densities_t sc480_densities =
-{ 2.8, 1.4,  0.7,  0.710, 0.710, 0.546, 0.0,   0.0,   0.0   };
-
-static const escp2_densities_t sc660_densities =
-{ 4.0, 2.0,  1.0,  0.646, 0.323, 0.0,   0.0,   0.0,   0.0   };
-
-static const escp2_densities_t sc980_densities =
-{ 2.6, 1.3,  0.65, 0.511, 0.49,  0.637, 0.455, 0.0,   0.0   };
-
-static const escp2_densities_t sp700_densities =
-{ 2.6, 1.3,  1.3,  0.775, 0.55,  0.0,   0.0,   0.0,   0.0   };
-
-static const escp2_densities_t sp2000_densities =
-{ 2.6, 1.3,  0.65, 0.852, 0.438, 0.219, 0.0,   0.0,   0.0   };
-
-static const escp2_densities_t spro_dye_densities =
-{ 2.6, 1.3,  1.3,  0.775, 0.388, 0.275, 0.0,   0.0,   0.0   };
-
-static const escp2_densities_t spro_pigment_densities =
-{ 3.0, 1.5,  0.78, 0.775, 0.388, 0.194, 0.0,   0.0,   0.0   };
-
-static const escp2_densities_t spro10000_densities =
-{ 2.6, 1.3,  0.65, 0.431, 0.216, 0.392, 0.0,   0.0,   0.0   };
-
-static const escp2_densities_t picturemate_densities =
-{   0,   0,     0,     0, 1.596, 0.798, 0.650, 0.530, 0.0   };
-
-
-static const stp_raw_t new_init_sequence = STP_RAW_STRING("\0\0\0\033\001@EJL 1284.4\n@EJL     \n\033@");
-
-static const stp_raw_t je_deinit_sequence = STP_RAW_STRING("JE\001\000\000");
-
-/* These sequences provided by Epson.  No, I don't know what
-   most of them mean. */
-
-static const stp_raw_t bsc64_borderless_sequence = STP_RAW_STRING("SN\114\000\000\011\026\000\000\000\000\000\000\000\003\000\000\000\260\004\352\004\064\001\016\002\000\000\000\000\064\010\150\020\030\025\310\031\340\075\314\020\214\012\024\005\214\000\012\001\054\001\000\000\017\017\017\017\017\017\017\017\004\012\004\017\017\017\017\017\006\004\000\001\001\001\000\000\020\010");
-
-static const stp_raw_t bsc66_borderless_sequence = STP_RAW_STRING("SN\114\000\000\011\026\000\000\000\000\000\000\000\003\000\000\000\260\004\352\004\064\001\016\002\000\000\000\000\064\010\150\020\030\025\310\031\340\075\314\020\214\012\024\005\214\000\012\001\054\001\000\000\017\017\017\017\017\017\017\017\004\012\004\017\017\017\017\017\006\004\000\001\001\001\000\000\020\010");
-
-static const stp_raw_t bsc68_borderless_sequence = STP_RAW_STRING("SN\114\000\000\011\026\000\000\000\000\000\000\000\003\000\000\000\260\004\352\004\064\001\016\002\000\000\000\000\064\010\150\020\030\025\310\031\340\075\314\020\214\012\024\005\214\000\012\001\054\001\000\000\017\017\017\017\017\017\017\017\004\012\004\017\017\017\017\017\006\004\000\001\001\001\000\000\020\010");
-
-static const stp_raw_t bsc82_borderless_sequence = STP_RAW_STRING("SN\062\000\000\006\013\000\000\000\000\000\000\000\001\002\026\003\276\000\064\007\000\000\154\007\352\011\352\011\226\000\000\000\226\000\064\007\023\020\025\031\001\021\004\021\021\021\001\001\000\000\174\005");
-
-static const stp_raw_t bsc84_borderless_sequence = STP_RAW_STRING("SN\114\000\000\011\027\000\000\000\000\000\000\000\003\000\000\001\260\004\336\004\064\001\000\002\000\000\000\000\064\010\150\020\030\025\310\031\340\075\314\020\214\012\024\005\214\000\012\001\054\001\000\000\017\017\017\017\017\017\017\017\004\012\004\017\017\017\017\017\006\004\000\001\001\001\000\000\370\007");
-
-static const stp_raw_t bsc86_borderless_sequence = STP_RAW_STRING("SN\114\000\000\011\027\000\000\000\000\000\000\000\003\000\000\001\260\004\336\004\064\001\000\002\000\000\000\000\064\010\150\020\030\025\310\031\340\075\314\020\214\012\024\005\214\000\012\001\054\001\000\000\017\017\017\017\017\017\017\017\004\012\004\017\017\017\017\017\006\004\000\001\001\001\000\000\370\007");
-
-static const stp_raw_t bsc88_borderless_sequence = STP_RAW_STRING("SN\114\000\000\011\027\000\000\000\000\000\000\000\003\000\000\001\260\004\336\004\064\001\000\002\000\000\000\000\064\010\150\020\030\025\310\031\340\075\314\020\214\012\024\005\214\000\012\001\054\001\000\000\017\017\017\017\017\017\017\017\004\012\004\017\017\017\017\017\006\004\000\001\001\001\000\000\370\007");
-
-static const stp_raw_t cx6400_borderless_sequence = STP_RAW_STRING("SN\062\000\000\006\026\000\000\000\000\000\000\001\000\000\027\003\276\000\077\007\000\000\334\005\366\011\366\011\226\000\000\000\226\000\077\007\031\030\031\031\004\031\004\031\031\031\004\004\000\000\135\006");
-
-static const stp_raw_t cx6600_borderless_sequence = STP_RAW_STRING("SN\062\000\000\006\026\000\000\000\000\000\000\001\000\000\027\003\276\000\077\007\000\000\334\005\366\011\366\011\226\000\000\000\226\000\077\007\031\030\031\031\004\031\004\031\031\031\004\004\000\000\135\006");
-
-static const stp_raw_t pm830c_borderless_sequence = STP_RAW_STRING("SN\054\000\000\001\027\000\000\000\000\000\000\001\003\000\243\156\000\223\170\220\065\002\000\000\005\277\001\270\006\144\000\164\016\032\004\042\005\310\031\000\100\000\022\143\102\007");
-
-static const stp_raw_t pm930c_borderless_sequence = STP_RAW_STRING("SN\070\000\000\007\027\000\000\000\000\000\000\001\003\000\330\006\124\001\264\015\042\013\110\007\060\011\316\022\054\001\251\013\054\001\002\003\363\027\031\030\031\031\031\031\004\031\031\031\001\004\103\000\000\001\001\001\360\006");
-
-static const stp_raw_t pm970c_borderless_sequence = STP_RAW_STRING("SN\070\000\000\007\033\000\000\000\000\000\000\001\003\000\330\006\124\001\264\015\054\013\110\007\060\011\316\022\054\001\251\013\054\001\002\003\363\027\031\030\031\031\031\031\004\031\031\031\001\004\103\000\000\001\001\001\364\006");
-
-static const stp_raw_t sp1280_borderless_sequence = STP_RAW_STRING("SN\003\000\000\011\001");
-
-static const stp_raw_t sp780_borderless_sequence = STP_RAW_STRING("SN\003\000\000\000\002SN\003\000\000\001\001SN\003\000\000\011\001");
-
-static const stp_raw_t sp820_borderless_sequence = STP_RAW_STRING("SN\003\000\000\011\001");
-
-static const stp_raw_t sp820u_borderless_sequence = STP_RAW_STRING("SN\003\000\000\011\001");
-
-static const stp_raw_t sp825_borderless_sequence = STP_RAW_STRING("SN\003\000\000\011\001");
-
-static const stp_raw_t sp890_borderless_sequence = STP_RAW_STRING("SN\003\000\000\000\010SN\003\000\000\001\001SN\003\000\000\002\000SN\003\000\000\007\000SN\003\000\000\011\001");
-
-static const stp_raw_t sp900_borderless_sequence = STP_RAW_STRING("SN\064\000\000\003\026\000\000\000\000\000\000\001\003\000\007\144\050\002\152\215\000\063\344\000\040\120\000\207\150\020\212\003\070\002\360\001\324\100\000\001\010\001\142\141\141\140\141\024\002\025\027\061\132\011");
-
-static const stp_raw_t sp925_borderless_sequence = STP_RAW_STRING("SN\054\000\000\001\027\000\000\000\000\000\000\001\003\000\243\156\000\223\170\220\065\002\000\000\005\277\001\270\006\144\000\024\036\032\004\042\005\310\031\000\100\000\022\143\362\006");
-
-static const stp_raw_t sp960_borderless_sequence = STP_RAW_STRING("SN\064\000\000\002\027\000\000\000\000\000\000\001\003\000\204\003\252\000\204\006\270\004\364\006\166\005\230\011\226\000\304\004\226\000\206\002\270\012\031\030\031\031\031\031\004\064\064\064\004\001\000\000\040\011");
-
-static const stp_raw_t spr300_borderless_sequence = STP_RAW_STRING("SN\120\000\000\014\027\000\000\000\000\000\000\000\003\000\001\001\130\002\320\004\107\001\107\002\000\000\000\000\120\010\204\020\030\025\310\031\340\075\240\017\214\012\060\005\214\000\012\001\054\001\000\000\000\000\017\017\017\017\017\017\017\017\004\012\004\017\017\017\017\017\006\004\017\017\000\000\001\001\000\001\060\010");
-
-static const stp_raw_t spr320_borderless_sequence = STP_RAW_STRING("SN\120\000\000\014\027\000\000\000\000\000\000\000\003\000\001\001\130\002\320\004\107\001\107\002\000\000\000\000\120\010\204\020\030\025\310\031\340\075\240\017\214\012\060\005\214\000\012\001\054\001\000\000\000\000\017\017\017\017\017\017\017\017\004\012\004\017\017\017\017\017\006\004\017\017\000\000\001\001\000\001\060\010");
-
-static const stp_raw_t spr800_borderless_sequence = STP_RAW_STRING("SN\124\000\000\012\033\000\000\000\000\000\000\001\003\000\001\001\235\007\124\001\120\012\252\000\363\006\077\002\120\012\277\007\050\002\045\013\054\001\253\000\037\001\041\000\040\001\322\000\241\000\000\000\017\000\036\000\030\031\031\031\031\031\031\031\003\033\033\143\143\143\143\143\143\143\143\143\143\143\002\000\001\000\001\001\362\014");
-
-static const stp_raw_t sprx500_borderless_sequence = STP_RAW_STRING("SN\114\000\000\011\026\000\000\000\000\000\000\000\003\000\000\001\260\004\336\004\064\001\000\002\000\000\000\000\064\010\150\020\030\025\310\031\340\075\314\020\214\012\024\005\214\000\012\001\054\001\000\000\017\017\017\017\017\017\017\017\004\012\004\017\017\017\017\017\006\004\000\001\001\001\000\000\367\007");
-
-static const stp_raw_t sprx600_borderless_sequence = STP_RAW_STRING("SN\114\000\000\011\026\000\000\000\000\000\000\000\003\000\000\001\260\004\336\004\064\001\000\002\000\000\000\000\064\010\150\020\030\025\310\031\340\075\314\020\214\012\024\005\214\000\012\001\054\001\000\000\017\017\017\017\017\017\017\017\004\012\004\017\017\017\017\017\006\004\000\001\001\001\000\000\367\007");
+typedef struct
+{
+  const char *attr_name;
+  short bit_shift;
+  short bit_width;
+} escp2_printer_attr_t;
 
-static const stp_raw_t sprx620_borderless_sequence = STP_RAW_STRING("SN\114\000\000\011\026\000\000\000\000\000\000\000\003\000\000\001\260\004\336\004\064\001\000\002\000\000\000\000\064\010\150\020\030\025\310\031\340\075\314\020\214\012\024\005\214\000\012\001\054\001\000\000\017\017\017\017\017\017\017\017\004\012\004\017\017\017\017\017\006\004\000\001\001\001\000\000\367\007");
+static const escp2_printer_attr_t escp2_printer_attrs[] =
+{
+  { "command_mode",		0, 4 },
+  { "zero_margin",		4, 2 },
+  { "variable_mode",		6, 1 },
+  { "graymode",		 	7, 1 },
+  { "fast_360",			8, 1 },
+  { "send_zero_advance",        9, 1 },
+  { "supports_ink_change",     10, 1 },
+  { "packet_mode",             11, 1 },
+  { "interchangeable_ink",     12, 1 },
+  { "envelope_landscape",      13, 1 },
+};
 
-static const stp_raw_t generic_borderless_sequence = STP_RAW_STRING("SN\001\000\000US\003\000\000\000\002");
+static stpi_escp2_printer_t *escp2_model_capabilities;
 
-#define INCH(x)		(72 * x)
+static int escp2_model_count = 0;
 
-const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
+static void
+load_model_from_file(const stp_vars_t *v, stp_mxml_node_t *xmod, int model)
 {
-  /* FIRST GENERATION PRINTERS */
-  /* 0: Stylus Color */
-  {
-    (MODEL_VARIABLE_NO | MODEL_COMMAND_1998 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_NO| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    15, 1, 4, 15, 1, 4, 15, 1, 4, 4,
-    360, 14400, -1, 720, 720, 90, 90,
-    0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
-    INCH(19 / 2), INCH(44), INCH(2), INCH(2), INCH(17 / 2), INCH(44),
-    9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
-    1, 7, 0, 0,
-    g1_dotsizes, g1_densities, "simple",
-    "720dpi", "standard",
-    standard_bits, standard_base_res, "default",
-    "standard", NULL, NULL,
-    NULL, NULL, "standard"
-  },
-  /* 1: Stylus Color 400/500 */
-  {
-    (MODEL_VARIABLE_NO | MODEL_COMMAND_1998 | MODEL_GRAYMODE_NO |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_NO| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 4,
-    360, 14400, -1, 720, 720, 90, 90,
-    0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
-    INCH(19 / 2), INCH(44), INCH(2), INCH(2), INCH(17 / 2), INCH(44),
-    9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
-    1, 7, 0, 0,
-    g2_dotsizes, g1_densities, "simple",
-    "sc500", "standard",
-    standard_bits, standard_base_res, "default",
-    "standard", NULL, NULL,
-    NULL, NULL, "standard"
-  },
-  /* 2: Stylus Color 1500 */
-  {
-    (MODEL_VARIABLE_NO | MODEL_COMMAND_1998 | MODEL_GRAYMODE_NO |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_NO| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 4,
-    360, 14400, -1, 720, 720, 90, 90,
-    0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
-    INCH(17), INCH(44), INCH(2), INCH(2), INCH(17), INCH(44),
-    9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
-    1, 7, 0, 0,
-    g1_dotsizes, sc1500_densities, "simple",
-    "sc500", "cmy",
-    standard_bits, standard_base_res, "standard_roll_feed",
-    "standard", NULL, NULL,
-    NULL, NULL, "standard"
-  },
-  /* 3: Stylus Color 600 */
-  {
-    (MODEL_VARIABLE_NO | MODEL_COMMAND_1998 | MODEL_GRAYMODE_NO |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_NO| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    32, 1, 4, 32, 1, 4, 32, 1, 4, 4,
-    360, 14400, -1, 1440, 720, 90, 90,
-    0, 1, 0, 0, 0, 0, 0, 8, 1, 28800, 720 * 720,
-    INCH(19 / 2), INCH(44), INCH(2), INCH(2), INCH(17 / 2), INCH(44),
-    8, 9, 0, 30, 8, 9, 0, 30, 8, 9, 0, 0, 8, 9, 0, 0, -1, -1, 0, 0, 0,
-    1, 7, 0, 0,
-    sc600_dotsizes, g3_densities, "simple",
-    "g3", "standard",
-    standard_bits, g3_base_res, "default",
-    "standard", NULL, NULL,
-    NULL, NULL, "standard"
-  },
-  /* 4: Stylus Color 800 */
-  {
-    (MODEL_VARIABLE_NO | MODEL_COMMAND_1998 | MODEL_GRAYMODE_NO |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_NO| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    64, 1, 2, 64, 1, 2, 64, 1, 2, 4,
-    360, 14400, -1, 1440, 720, 180, 180,
-    0, 1, 4, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
-    INCH(19 / 2), INCH(44), INCH(2), INCH(2), INCH(17 / 2), INCH(44),
-    8, 9, 9, 40, 8, 9, 9, 40, 8, 9, 0, 0, 8, 9, 0, 0, -1, -1, 0, 0, 0,
-    1, 7, 0, 0,
-    g3_dotsizes, g3_densities, "simple",
-    "g3", "standard",
-    standard_bits, g3_base_res, "default",
-    "standard", NULL, NULL,
-    NULL, NULL, "standard"
-  },
-  /* 5: Stylus Color 850 */
-  {
-    (MODEL_VARIABLE_NO | MODEL_COMMAND_1998 | MODEL_GRAYMODE_NO |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_NO| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    64, 1, 2, 64, 1, 2, 64, 1, 2, 4,
-    360, 14400, -1, 1440, 720, 180, 180,
-    0, 1, 4, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
-    INCH(19 / 2), INCH(44), INCH(2), INCH(2), INCH(17 / 2), INCH(44),
-    9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
-    1, 7, 0, 0,
-    g3_dotsizes, g3_densities, "simple",
-    "g3", "standard",
-    standard_bits, g3_base_res, "default",
-    "standard", NULL, NULL,
-    NULL, NULL, "standard"
-  },
-  /* 6: Stylus Color 1520 */
-  {
-    (MODEL_VARIABLE_NO | MODEL_COMMAND_1998 | MODEL_GRAYMODE_NO |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_NO| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    64, 1, 2, 64, 1, 2, 64, 1, 2, 4,
-    360, 14400, -1, 1440, 720, 180, 180,
-    0, 1, 4, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
-    INCH(17), INCH(44), INCH(2), INCH(2), INCH(136 / 10), INCH(44),
-    8, 9, 9, 40, 8, 9, 9, 40, 8, 9, 0, 0, 8, 9, 0, 0, -1, -1, 0, 0, 0,
-    1, 7, 0, 0,
-    g3_dotsizes, g3_densities, "simple",
-    "g3", "standard",
-    standard_bits, g3_base_res, "standard_roll_feed",
-    "standard", NULL, NULL,
-    NULL, NULL, "standard"
-  },
-
-  /* SECOND GENERATION PRINTERS */
-  /* 7: Stylus Photo 700 */
-  {
-    (MODEL_VARIABLE_NO | MODEL_COMMAND_1998 | MODEL_GRAYMODE_NO |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_NO| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    32, 1, 4, 32, 1, 4, 32, 1, 4, 6,
-    360, 14400, -1, 1440, 720, 90, 90,
-    0, 1, 0, 0, 0, 0, 0, 8, 1, 28800, 720 * 720,
-    INCH(19 / 2), INCH(44), INCH(2), INCH(2), INCH(17 / 2), INCH(44),
-    9, 9, 0, 30, 9, 9, 0, 30, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
-    1, 15, 0, 0,		/* Is it really 15 pairs??? */
-    sp700_dotsizes, sp700_densities, "simple",
-    "g3", "photo_gen1",
-    standard_bits, g3_base_res, "default",
-    "standard", NULL, NULL,
-    NULL, NULL, "photo"
-  },
-  /* 8: Stylus Photo EX */
-  {
-    (MODEL_VARIABLE_NO | MODEL_COMMAND_1998 | MODEL_GRAYMODE_NO |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_NO | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_NO| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    32, 1, 4, 32, 1, 4, 32, 1, 4, 6,
-    360, 14400, -1, 1440, 720, 90, 90,
-    0, 1, 0, 0, 0, 0, 0, 8, 1, 28800, 720 * 720,
-    INCH(118 / 10), INCH(44), INCH(2), INCH(2), INCH(118 / 10), INCH(44),
-    9, 9, 0, 30, 9, 9, 0, 30, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
-    1, 7, 0, 0,
-    sp700_dotsizes, sp700_densities, "simple",
-    "g3", "photo_gen1",
-    standard_bits, g3_base_res, "default",
-    "standard", NULL, NULL,
-    NULL, NULL, "photo"
-  },
-  /* 9: Stylus Photo */
-  {
-    (MODEL_VARIABLE_NO | MODEL_COMMAND_1998 | MODEL_GRAYMODE_NO |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_NO| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    32, 1, 4, 32, 1, 4, 32, 1, 4, 6,
-    360, 14400, -1, 720, 720, 90, 90,
-    0, 1, 0, 0, 0, 0, 0, 8, 1, 28800, 720 * 720,
-    INCH(19 / 2), INCH(44), INCH(2), INCH(2), INCH(17 / 2), INCH(44),
-    9, 9, 0, 30, 9, 9, 0, 30, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
-    1, 7, 0, 0,
-    sp700_dotsizes, sp700_densities, "simple",
-    "g3_720dpi", "photo_gen1",
-    standard_bits, g3_base_res, "default",
-    "standard", NULL, NULL,
-    NULL, NULL, "photo"
-  },
-
-  /* THIRD GENERATION PRINTERS */
-  /* 10: Stylus Color 440/460 */
-  {
-    (MODEL_VARIABLE_NO | MODEL_COMMAND_1999 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_NO| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    21, 1, 4, 21, 1, 4, 21, 1, 4, 4,
-    360, 14400, -1, 720, 720, 90, 90,
-    0, 1, 0, 0, 0, 0, 0, 8, 1, 28800, 720 * 720,
-    INCH(19 / 2), INCH(44), INCH(2), INCH(2), INCH(17 / 2), INCH(44),
-    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
-    1, 15, 0, 0,
-    sc440_dotsizes, sc440_densities, "simple",
-    "g3_720dpi", "standard",
-    standard_bits, standard_base_res, "default",
-    "standard", NULL, NULL,
-    NULL, NULL, "standard"
-  },
-  /* 11: Stylus Color 640 */
-  {
-    (MODEL_VARIABLE_NO | MODEL_COMMAND_1999 | MODEL_GRAYMODE_NO |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_NO| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    32, 1, 4, 32, 1, 4, 32, 1, 4, 4,
-    360, 14400, -1, 1440, 720, 90, 90,
-    0, 1, 0, 0, 0, 0, 0, 8, 1, 28800, 720 * 720,
-    INCH(19 / 2), INCH(44), INCH(2), INCH(2), INCH(17 / 2), INCH(44),
-    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
-    1, 15, 0, 0,
-    sc640_dotsizes, sc440_densities, "simple",
-    "sc640", "standard",
-    standard_bits, standard_base_res, "default",
-    "standard", NULL, NULL,
-    NULL, NULL, "standard"
-  },
-  /* 12: Stylus Color 740/Stylus Scan 2000/Stylus Scan 2500 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_1999 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_NO| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    48, 1, 3, 144, 1, 1, 144, 1, 1, 4,
-    360, 14400, -1, 1440, 720, 90, 90,
-    0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
-    INCH(19 / 2), INCH(44), INCH(2), INCH(2), INCH(17 / 2), INCH(44),
-    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
-    3, 15, 0, 0,
-    c6pl_dotsizes, c6pl_densities, "variable_6pl",
-    "1440dpi", "standard",
-    variable_bits, variable_base_res, "default",
-    "standard", NULL, NULL,
-    NULL, NULL, "standard"
-  },
-  /* 13: Stylus Color 900 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_1999 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    96, 1, 2, 192, 1, 1, 192, 1, 1, 4,
-    360, 14400, -1, 1440, 720, 180, 180,
-    0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
-    INCH(19 / 2), INCH(44), INCH(2), INCH(2), INCH(17 / 2), INCH(44),
-    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
-    3, 15, 0, 0,
-    c3pl_dotsizes, c3pl_densities, "variable_3pl",
-    "1440dpi", "standard",
-    variable_bits, stc900_base_res, "default",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    NULL, NULL, "standard"
-  },
-  /* 14: Stylus Photo 750 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_1999 | MODEL_GRAYMODE_NO |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    48, 1, 3, 48, 1, 3, 48, 1, 3, 6,
-    360, 14400, -1, 1440, 720, 90, 90,
-    0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
-    INCH(19 / 2), INCH(44), INCH(2), INCH(2), INCH(17 / 2), INCH(44),
-    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
-    3, 15, 0, 0,
-    c6pl_dotsizes, c6pl_densities, "variable_6pl",
-    "1440dpi", "photo_gen1",
-    variable_bits, variable_base_res, "default",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    NULL, NULL, "photo"
-  },
-  /* 15: Stylus Photo 1200 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_1999 | MODEL_GRAYMODE_NO |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    48, 1, 3, 48, 1, 3, 48, 1, 3, 6,
-    360, 14400, -1, 1440, 720, 90, 90,
-    0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
-    INCH(13), INCH(44), INCH(2), INCH(2), INCH(13), INCH(44),
-    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
-    3, 15, 0, 0,
-    c6pl_dotsizes, c6pl_densities, "variable_6pl",
-    "1440dpi", "photo_gen1",
-    variable_bits, variable_base_res, "standard_roll_feed",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    NULL, NULL, "photo"
-  },
-  /* 16: Stylus Color 860 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_1999 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    48, 1, 3, 144, 1, 1, 144, 1, 1, 4,
-    360, 14400, -1, 1440, 720, 90, 90,
-    0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
-    INCH(19 / 2), INCH(44), INCH(2), INCH(2), INCH(17 / 2), INCH(44),
-    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
-    3, 15, 0, 0,
-    c4pl_dotsizes, c4pl_densities, "variable_1440_4pl",
-    "1440dpi", "standard",
-    variable_bits, variable_base_res, "default",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    NULL, NULL, "standard"
-  },
-  /* 17: Stylus Color 1160 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_1999 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    48, 1, 3, 144, 1, 1, 144, 1, 1, 4,
-    360, 14400, -1, 1440, 720, 90, 90,
-    0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
-    INCH(13), INCH(44), INCH(2), INCH(2), INCH(13), INCH(44),
-    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
-    3, 15, 0, 0,
-    c4pl_dotsizes, c4pl_densities, "variable_1440_4pl",
-    "1440dpi", "standard",
-    variable_bits, variable_base_res, "default",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    NULL, NULL, "standard"
-  },
-  /* 18: Stylus Color 660 */
-  {
-    (MODEL_VARIABLE_NO | MODEL_COMMAND_1999 | MODEL_GRAYMODE_NO |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    32, 1, 4, 32, 1, 4, 32, 1, 4, 4,
-    360, 14400, -1, 1440, 720, 90, 90,
-    0, 1, 0, 0, 0, 0, 0, 8, 1, 28800, 720 * 720,
-    INCH(19 / 2), INCH(44), INCH(2), INCH(2), INCH(17 / 2), INCH(44),
-    9, 9, 9, 9, 9, 9, 9, 26, 9, 9, 9, 0, 9, 9, 9, 0, -1, -1, 0, 0, 0,
-    1, 15, 0, 0,
-    sc660_dotsizes, sc660_densities, "simple",
-    "sc640", "standard",
-    standard_bits, standard_base_res, "default",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    NULL, NULL, "standard"
-  },
-  /* 19: Stylus Color 760 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_1999 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    48, 1, 3, 144, 1, 1, 144, 1, 1, 4,
-    360, 14400, -1, 1440, 720, 90, 90,
-    0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
-    INCH(19 / 2), INCH(44), INCH(2), INCH(2), INCH(17 / 2), INCH(44),
-    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
-    3, 15, 0, 0,
-    c4pl_dotsizes, c4pl_densities, "variable_1440_4pl",
-    "1440dpi", "standard",
-    variable_bits, variable_base_res, "default",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    NULL, NULL, "standard"
-  },
-  /* 20: Stylus Photo 720 (Australia) */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_1999 | MODEL_GRAYMODE_NO |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    32, 1, 4, 32, 1, 4, 32, 1, 4, 6,
-    360, 14400, -1, 1440, 720, 90, 90,
-    0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
-    INCH(19 / 2), INCH(44), INCH(2), INCH(2), INCH(17 / 2), INCH(44),
-    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
-    3, 15, 0, 0,
-    sp720_dotsizes, c6pl_densities, "variable_6pl",
-    "1440dpi", "photo_gen1",
-    variable_bits, variable_base_res, "default",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    NULL, NULL, "photo"
-  },
-  /* 21: Stylus Color 480 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_YES |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    15, 15, 3, 48, 48, 3, 48, 48, 3, 4,
-    360, 14400, 360, 720, 720, 90, 90,
-    0, 1, 0, 0, 0, -99, 0, 0, 1, 28800, 720 * 720,
-    INCH(19 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
-    3, 15, 0, 0,
-    sc480_dotsizes, sc480_densities, "variable_x80_6pl",
-    "720dpi_soft", "x80",
-    variable_bits, variable_base_res, "default",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    NULL, NULL, "standard"
-  },
-  /* 22: Stylus Photo 870/875 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_NO |
-     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    48, 1, 3, 48, 1, 3, 48, 1, 3, 6,
-    360, 14400, -1, 1440, 720, 90, 90,
-    0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 720 * 720,
-    INCH(19 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
-    3, 15, 0, 0,
-    c4pl_dotsizes, c4pl_densities, "variable_1440_4pl",
-    "1440dpi", "photo_gen2",
-    variable_bits, variable_base_res, "standard_roll_feed",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    NULL, NULL, "photo"
-  },
-  /* 23: Stylus Photo 1270 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_NO |
-     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    48, 1, 3, 48, 1, 3, 48, 1, 3, 6,
-    360, 14400, -1, 1440, 720, 90, 90,
-    0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 720 * 720,
-    INCH(13), INCH(1200), INCH(2), INCH(2), INCH(13), INCH(1200),
-    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
-    3, 15, 0, 0,
-    c4pl_dotsizes, c4pl_densities, "variable_1440_4pl",
-    "1440dpi", "photo_gen2",
-    variable_bits, variable_base_res, "standard_roll_feed",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    NULL, NULL, "photo"
-  },
-  /* 24: Stylus Color 3000 */
-  {
-    (MODEL_VARIABLE_NO | MODEL_COMMAND_1998 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_NO| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    64, 1, 2, 64, 1, 2, 64, 1, 2, 4,
-    360, 14400, -1, 1440, 720, 180, 180,
-    0, 1, 4, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
-    INCH(17), INCH(44), INCH(2), INCH(2), INCH(17), INCH(44),
-    8, 9, 9, 40, 8, 9, 9, 40, 8, 9, 0, 0, 8, 9, 0, 0, -1, -1, 0, 0, 0,
-    1, 7, 0, 0,
-    g3_dotsizes, g3_densities, "simple",
-    "g3", "standard",
-    standard_bits, g3_base_res, "standard_roll_feed",
-    "standard", NULL, NULL,
-    NULL, NULL, "standard"
-  },
-  /* 25: Stylus Color 670 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    32, 1, 4, 64, 1, 2, 64, 1, 2, 4,
-    360, 14400, -1, 1440, 720, 90, 90,
-    0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
-    INCH(19 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
-    3, 15, 0, 0,
-    sc670_dotsizes, c6pl_densities, "variable_6pl",
-    "1440dpi", "standard",
-    variable_bits, variable_base_res, "default",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    NULL, NULL, "standard"
-  },
-  /* 26: Stylus Photo 2000P */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_NO |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    48, 1, 3, 144, 1, 1, 144, 1, 1, 6,
-    360, 14400, -1, 1440, 720, 90, 90,
-    0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
-    INCH(13), INCH(1200), INCH(2), INCH(2), INCH(13), INCH(1200),
-    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
-    2, 15, 0, 0,
-    sp2000_dotsizes, sp2000_densities, "variable_2000p",
-    "1440dpi", "photo_pigment",
-    variable_bits, variable_base_res, "default",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    NULL, NULL, "photo"
-  },
-  /* 27: Stylus Pro 5000 */
-  {
-    (MODEL_VARIABLE_NO | MODEL_COMMAND_1998 | MODEL_GRAYMODE_NO |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_NO| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    64, 1, 2, 64, 1, 2, 64, 1, 2, 6,
-    360, 14400, -1, 1440, 720, 180, 180,
-    0, 1, 0, 0, 0, 0, 0, 4, 1, 28800, 720 * 720,
-    INCH(13), INCH(44), INCH(2), INCH(2), INCH(13), INCH(44),
-    9, 9, 0, 30, 9, 9, 0, 30, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
-    1, 7, 0, 0,
-    spro5000_dotsizes, sp700_densities, "simple",
-    "1440dpi", "photo_gen1",
-    standard_bits, g3_base_res, "spro5000",
-    "standard", NULL, NULL,
-    NULL, NULL, "photo"
-  },
-  /* 28: Stylus Pro 7000 */
-  {
-    (MODEL_VARIABLE_NO | MODEL_COMMAND_PRO | MODEL_GRAYMODE_NO |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_NO| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 6,
-    360, 14400, -1, 1440, 720, 90, 90,
-    0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
-    INCH(24), INCH(1200), INCH(7), INCH(7), INCH(24), INCH(1200),
-    9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 9, 9, 9, 9, 9, 9, -1, -1, 0, 0, 0,
-    1, 7, 0, 0,
-    spro_dye_dotsizes, spro_dye_densities, "simple",
-    "pro", "photo_gen1",
-    standard_bits, pro_base_res, "pro_roll_feed",
-    "standard", NULL, NULL,
-    NULL, "pro7000", "photo"
-  },
-  /* 29: Stylus Pro 7500 */
-  {
-    (MODEL_VARIABLE_NO | MODEL_COMMAND_PRO | MODEL_GRAYMODE_NO |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_YES | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_NO| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 6,
-    360, 14400, -1, 1440, 720, 90, 90,
-    0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
-    INCH(24), INCH(1200), INCH(7), INCH(7), INCH(24), INCH(1200),
-    9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 9, 9, 9, 9, 9, 9, -1, -1, 0, 0, 0,
-    1, 7, 0, 0,
-    spro_pigment_dotsizes, spro_pigment_densities, "simple",
-    "pro", "photo_pigment",
-    standard_bits, pro_base_res, "pro_roll_feed",
-    "standard", NULL, NULL,
-    NULL, "pro7500", "photo"
-  },
-  /* 30: Stylus Pro 9000 */
-  {
-    (MODEL_VARIABLE_NO | MODEL_COMMAND_PRO | MODEL_GRAYMODE_NO |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_NO| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 6,
-    360, 14400, -1, 1440, 720, 90, 90,
-    0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
-    INCH(44), INCH(1200), INCH(7), INCH(7), INCH(44), INCH(1200),
-    9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 9, 9, 9, 9, 9, 9, -1, -1, 0, 0, 0,
-    1, 7, 0, 0,
-    spro_dye_dotsizes, spro_dye_densities, "simple",
-    "pro", "photo_gen1",
-    standard_bits, pro_base_res, "pro_roll_feed",
-    "standard", NULL, NULL,
-    NULL, "pro7000", "photo"
-  },
-  /* 31: Stylus Pro 9500 */
-  {
-    (MODEL_VARIABLE_NO | MODEL_COMMAND_PRO | MODEL_GRAYMODE_NO |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_YES | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_NO| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 6,
-    360, 14400, -1, 1440, 720, 90, 90,
-    0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
-    INCH(44), INCH(1200), INCH(7), INCH(7), INCH(44), INCH(1200),
-    9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 9, 9, 9, 9, 9, 9, -1, -1, 0, 0, 0,
-    1, 7, 0, 0,
-    spro_pigment_dotsizes, spro_pigment_densities, "simple",
-    "pro", "photo_pigment",
-    standard_bits, pro_base_res, "pro_roll_feed",
-    "standard", NULL, NULL,
-    NULL, "pro7500", "photo"
-  },
-  /* 32: Stylus Color 777/680 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    48, 1, 3, 144, 1, 1, 144, 1, 1, 4,
-    360, 14400, -1, 2880, 720, 90, 90,
-    0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
-    INCH(19 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
-    3, 15, 0, 0,
-    c4pl_dotsizes, c4pl_2880_densities, "variable_2880_4pl",
-    "2880dpi", "standard",
-    variable_bits, variable_base_res, "default",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    NULL, NULL, "standard"
-  },
-  /* 33: Stylus Color 880/83/C60 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    48, 1, 3, 144, 1, 1, 144, 1, 1, 4,
-    360, 14400, -1, 2880, 720, 90, 90,
-    0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
-    INCH(19 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
-    3, 15, 0, 0,
-    c4pl_dotsizes, c4pl_2880_densities, "variable_2880_4pl",
-    "2880dpi", "standard",
-    variable_bits, variable_base_res, "default",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    NULL, NULL, "standard"
-  },
-  /* 34: Stylus Color 980 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    96, 1, 2, 192, 1, 1, 192, 1, 1, 4,
-    360, 14400, -1, 2880, 720, 180, 180,
-    38, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
-    INCH(17 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
-    3, 15, 0, 0,
-    c3pl_dotsizes, sc980_densities, "variable_3pl",
-    "2880dpi", "standard",
-    variable_bits, variable_base_res, "default",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    NULL, NULL, "standard"
-  },
-  /* 35: Stylus Photo 780/790 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    48, 1, 3, 48, 1, 3, 48, 1, 3, 6,
-    360, 14400, -1, 2880, 720, 90, 90,
-    0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 720 * 720,
-    INCH(19 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 24,
-    3, 15, 0, 0,
-    c4pl_dotsizes, c4pl_2880_densities, "variable_2880_4pl",
-    "2880dpi", "photo_gen2",
-    variable_bits, variable_base_res, "default",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    &sp780_borderless_sequence, NULL, "photo"
-  },
-  /* 36: Stylus Photo 785/890/895/915/935 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    48, 1, 3, 48, 1, 3, 48, 1, 3, 6,
-    360, 14400, -1, 2880, 720, 90, 90,
-    0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 720 * 720,
-    INCH(19 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 24,
-    3, 15, 0, 0,
-    c4pl_dotsizes, c4pl_2880_densities, "variable_2880_4pl",
-    "2880dpi", "photo_gen2",
-    variable_bits, variable_base_res, "standard_roll_feed",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    &sp890_borderless_sequence, NULL, "photo"
-  },
-  /* 37: Stylus Photo 1280/1290 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    48, 1, 3, 48, 1, 3, 48, 1, 3, 6,
-    360, 14400, -1, 2880, 720, 90, 90,
-    0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 720 * 720,
-    INCH(13), INCH(1200), INCH(2), INCH(2), INCH(13), INCH(1200),
-    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 24,
-    3, 15, 0, 0,
-    c4pl_dotsizes, c4pl_2880_densities, "variable_2880_4pl",
-    "2880dpi", "photo_gen2",
-    variable_bits, variable_base_res, "standard_roll_feed",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    &sp1280_borderless_sequence, NULL, "photo"
-  },
-  /* 38: Stylus Color 580 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_YES |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    15, 15, 3, 48, 48, 3, 48, 48, 3, 4,
-    360, 14400, 360, 1440, 720, 90, 90,
-    0, 1, 0, 0, 0, -99, 0, 0, 1, 28800, 720 * 720,
-    INCH(19 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
-    3, 15, 0, 0,
-    sc480_dotsizes, sc480_densities, "variable_x80_6pl",
-    "1440dpi", "x80",
-    variable_bits, variable_base_res, "default",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    NULL, NULL, "standard"
-  },
-  /* 39: Stylus Color Pro XL */
-  {
-    (MODEL_VARIABLE_NO | MODEL_COMMAND_1998 | MODEL_GRAYMODE_NO |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_NO| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    16, 1, 4, 16, 1, 4, 16, 1, 4, 4,
-    360, 14400, -1, 720, 720, 90, 90,
-    0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
-    INCH(13), INCH(1200), INCH(2), INCH(2), INCH(13), INCH(1200),
-    9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
-    1, 7, 0, 0,
-    g1_dotsizes, g1_densities, "simple",
-    "720dpi", "standard",
-    standard_bits, standard_base_res, "default",
-    "standard", NULL, NULL,
-    NULL, NULL, "standard"
-  },
-  /* 40: Stylus Pro 5500 */
-  {
-    (MODEL_VARIABLE_NO | MODEL_COMMAND_PRO | MODEL_GRAYMODE_NO |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_YES | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_NO| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 6,
-    360, 14400, -1, 1440, 720, 90, 90,
-    0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
-    INCH(13), INCH(1200), INCH(2), INCH(2), INCH(13), INCH(1200),
-    9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
-    1, 7, 0, 0,
-    spro_pigment_dotsizes, spro_pigment_densities, "simple",
-    "pro", "photo_pigment",
-    standard_bits, pro_base_res, "spro5000",
-    "standard", NULL, NULL,
-    NULL, "pro7500", "photo"
-  },
-  /* 41: Stylus Pro 10000 */
-  {
-    (MODEL_VARIABLE_NO | MODEL_COMMAND_PRO | MODEL_GRAYMODE_NO |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_YES | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_NO| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 6,
-    360, 14400, -1, 1440, 720, 90, 90,
-    0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
-    INCH(44), INCH(1200), INCH(7), INCH(7), INCH(44), INCH(1200),
-    9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 9, 9, 9, 9, 9, 9, -1, -1, 0, 0, 0,
-    1, 7, 0, 0,
-    spro10000_dotsizes, spro10000_densities, "spro10000",
-    "pro", "photo_gen2",
-    variable_bits, pro_base_res, "pro_roll_feed",
-    "standard", NULL, NULL,
-    NULL, "pro7000", "photo"
-  },
-  /* 42: Stylus C20SX/C20UX */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_YES |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    15, 15, 3, 48, 48, 3, 48, 48, 3, 4,
-    360, 14400, -1, 720, 720, 90, 90,
-    0, 1, 0, 0, 0, -99, 0, 0, 1, 28800, 720 * 720,
-    INCH(19 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
-    3, 15, 0, 0,
-    sc480_dotsizes, sc480_densities, "variable_x80_6pl",
-    "720dpi_soft", "x80",
-    variable_bits, variable_base_res, "default",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    NULL, NULL, "standard"
-  },
-  /* 43: Stylus C40SX/C40UX/C41SX/C41UX/C42SX/C42UX */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_YES |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    15, 15, 3, 48, 48, 3, 48, 48, 3, 4,
-    360, 14400, -1, 1440, 720, 90, 90,
-    0, 1, 0, 0, 0, -99, 0, 0, 1, 28800, 720 * 720,
-    INCH(19 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
-    3, 15, 0, 0,
-    sc480_dotsizes, sc480_densities, "variable_x80_6pl",
-    "1440dpi", "x80",
-    variable_bits, variable_base_res, "default",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    NULL, NULL, "standard"
-  },
-  /* 44: Stylus C70/C80 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_NO),
-    60, 60, 2, 180, 180, 2, 180, 180, 2, 4,
-    360, 14400, -1, 2880, 1440, 360, 180,
-    0, 1, 0, 0, 0, -240, 0, 0, 1, 28800, 720 * 720,
-    INCH(17 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
-    4, 15, 0, 0,
-    c3pl_pigment_dotsizes, c3pl_pigment_densities, "variable_3pl_pigment",
-    "2880_1440dpi", "c80",
-    variable_bits, variable_base_res, "default",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    NULL, NULL, "standard"
-  },
-  /* 45: Stylus Color Pro */
-  {
-    (MODEL_VARIABLE_NO | MODEL_COMMAND_1998 | MODEL_GRAYMODE_NO |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_NO| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    16, 1, 4, 16, 1, 4, 16, 1, 4, 4,
-    360, 14400, -1, 720, 720, 90, 90,
-    0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
-    INCH(19 / 2), INCH(44), INCH(2), INCH(2), INCH(17 / 2), INCH(44),
-    9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
-    1, 7, 0, 0,
-    g1_dotsizes, g1_densities, "simple",
-    "720dpi", "standard",
-    standard_bits, standard_base_res, "default",
-    "standard", NULL, NULL,
-    NULL, NULL, "standard"
-  },
-  /* 46: Stylus Photo 950/960 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_YES |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    96, 96, 2, 96, 96, 2, 24, 24, 1, 6,
-    360, 14400, -1, 2880, 1440, 360, 180,
-    0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 1440 * 1440,
-    INCH(19 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 0, 0, 24,
-    4, 15, 0, 0,
-    c2pl_dotsizes, c2pl_densities, "variable_2pl",
-    "superfine", "f360_photo",
-    stp950_bits, stp950_base_res, "cd_cutter_roll_feed",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    &sp960_borderless_sequence, NULL, "sp960"
-  },
-  /* 47: Stylus Photo 2100/2200 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_H_ONLY | MODEL_VACUUM_NO | MODEL_FAST_360_YES |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_YES |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    96, 96, 2, 96, 96, 2, 192, 192, 1, 7,
-    360, 14400, -1, 2880, 1440, 360, 180,
-    0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 1440 * 1440,
-    INCH(13), INCH(1200), INCH(2), INCH(2), INCH(13), INCH(1200),
-    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 0, 0, 0,
-    4, 15, 0, 0,
-    c4pl_pigment_dotsizes, c4pl_pigment_densities, "variable_ultrachrome",
-    "superfine", "f360_ultrachrome",
-    ultrachrome_bits, ultrachrome_base_res, "cd_cutter_roll_feed",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    NULL, NULL, "sp2200"
-  },
-  /* 48: Stylus Pro 7600 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_PRO | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_YES | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 7,
-    360, 14400, -1, 2880, 1440, 360, 180,
-    0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 1440 * 1440,
-    INCH(24), INCH(1200), INCH(7), INCH(7), INCH(24), INCH(1200),
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, -1, 0, 0, 0,
-    3, 15, 0, 0,
-    spro_c4pl_pigment_dotsizes, c4pl_pigment_densities, "variable_ultrachrome",
-    "pro", "ultrachrome",
-    ultrachrome_bits, pro_base_res, "pro_roll_feed",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    NULL, "pro7600", "photo"
-  },
-  /* 49: Stylus Pro 9600 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_PRO | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_YES | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 7,
-    360, 14400, -1, 2880, 1440, 360, 180,
-    0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 1440 * 1440,
-    INCH(44), INCH(1200), INCH(7), INCH(7), INCH(44), INCH(1200),
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, -1, 0, 0, 0,
-    3, 15, 0, 0,
-    spro_c4pl_pigment_dotsizes, c4pl_pigment_densities, "variable_ultrachrome",
-    "pro", "ultrachrome",
-    ultrachrome_bits, pro_base_res, "pro_roll_feed",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    NULL, "pro7600", "photo"
-  },
-  /* 50: Stylus Photo 825/830 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    48, 1, 3, 48, 1, 3, 48, 1, 3, 6,
-    360, 14400, -1, 2880, 1440, 90, 90,
-    0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 720 * 720,
-    INCH(19 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 24,
-    3, 15, 0, 0,
-    c4pl_dotsizes, c4pl_2880_densities, "variable_2880_4pl",
-    "2880_1440dpi", "photo_gen2",
-    variable_bits, variable_base_res, "default",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    &sp1280_borderless_sequence, NULL, "photo"
-  },
-  /* 51: Stylus Photo 925 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    48, 1, 3, 48, 1, 3, 48, 1, 3, 6,
-    360, 14400, -1, 2880, 1440, 90, 90,
-    0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 720 * 720,
-    INCH(19 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 24,
-    3, 15, 0, 0,
-    c4pl_dotsizes, c4pl_2880_densities, "variable_2880_4pl",
-    "2880_1440dpi", "photo_gen2",
-    variable_bits, variable_base_res, "cutter_roll_feed",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    &sp925_borderless_sequence, NULL, "photo"
-  },
-  /* 52: Stylus Color C62 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_NO),
-    48, 1, 3, 144, 1, 1, 144, 1, 1, 4,
-    360, 14400, -1, 2880, 1440, 90, 90,
-    0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
-    INCH(17 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
-    3, 15, 0, 0,
-    c4pl_dotsizes, c4pl_2880_densities, "variable_2880_4pl",
-    "2880_1440dpi", "standard",
-    variable_bits, variable_base_res, "default",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    NULL, NULL, "standard"
-  },
-  /* 53: Japanese PM-950C */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_NO |
-     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_YES |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    96, 96, 2, 96, 96, 2, 24, 24, 1, 6,
-    360, 14400, -1, 2880, 1440, 360, 180,
-    0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 1440 * 1440,
-    INCH(19 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 0, 0, 24,
-    4, 15, 0, 0,
-    c2pl_dotsizes, c2pl_densities, "variable_2pl",
-    "superfine", "f360_photo7_japan",
-    stp950_bits, stp950_base_res, "cd_cutter_roll_feed",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    &sp960_borderless_sequence, NULL, "pm_950c"
-  },
-  /* 54: Stylus Photo EX3 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_1999 | MODEL_GRAYMODE_NO |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    32, 1, 4, 32, 1, 4, 32, 1, 4, 6,
-    360, 14400, -1, 1440, 720, 90, 90,
-    0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
-    INCH(13), INCH(44), INCH(2), INCH(2), INCH(13), INCH(44),
-    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
-    3, 15, 0, 0,
-    sp720_dotsizes, c6pl_densities, "variable_6pl",
-    "1440dpi", "photo_gen1",
-    variable_bits, variable_base_res, "default",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    NULL, NULL, "photo"
-  },
-  /* 55: Stylus C82/CX-5200 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_NO),
-    59, 60, 2, 180, 180, 2, 180, 180, 2, 4,
-    360, 14400, -1, 2880, 1440, 360, 180,
-    0, 1, 0, 0, 0, -240, 0, 0, 1, 28800, 720 * 720,
-    INCH(17 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
-    4, 15, 0, 0,
-    c3pl_pigment_dotsizes, c3pl_pigment_densities, "variable_3pl_pigment",
-    "2880_1440dpi", "c82",
-    variable_bits, variable_base_res, "default",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    NULL, NULL, "standard"
-  },
-  /* 56: Stylus C50 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    15, 15, 3, 48, 48, 3, 48, 48, 3, 4,
-    360, 14400, -1, 1440, 720, 90, 90,
-    0, 1, 0, 0, 0, -99, 0, 0, 1, 28800, 720 * 720,
-    INCH(19 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
-    3, 15, 0, 0,
-    c4pl_dotsizes, c4pl_densities, "variable_x80_6pl",
-    "1440dpi", "x80",
-    variable_bits, variable_base_res, "default",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    NULL, NULL, "standard"
-  },
-  /* 57: Japanese PM-970C */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_NO |
-     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_YES |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_NO),
-    180, 180, 2, 360, 360, 1, 360, 360, 1, 7,
-    360, 14400, -1, 2880, 2880, 720, 360,
-    0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 1440 * 1440,
-    INCH(17 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 24,
-    4, 15, 0, 0,
-    c1_8pl_dotsizes, c1_8pl_densities, "variable_2pl",
-    "superfine", "f360_photo7_japan",
-    c1_8_bits, c1_8_base_res, "cutter_roll_feed",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    &pm970c_borderless_sequence, NULL, "pm_950c"
-  },
-  /* 58: Japanese PM-930C */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_NO |
-     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_NO),
-    90, 90, 2, 90, 90, 2, 90, 90, 2, 6,
-    360, 14400, -1, 2880, 2880, 720, 360,
-    0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 1440 * 1440,
-    INCH(17 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 24,
-    4, 15, 0, 0,
-    c1_8pl_dotsizes, c1_8pl_densities, "variable_2pl",
-    "superfine", "photo_gen2",
-    c1_8_bits, c1_8_base_res, "cutter_roll_feed",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    &pm930c_borderless_sequence, NULL, "photo"
-  },
-  /* 59: Stylus C43SX/C43UX/C44SX/C44UX (WRONG -- see 43!) */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_YES |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    15, 15, 3, 48, 48, 3, 48, 48, 3, 4,
-    360, 14400, -1, 2880, 720, 90, 90,
-    0, 1, 0, 0, 0, -99, 0, 0, 1, 28800, 720 * 720,
-    INCH(19 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
-    3, 15, 0, 0,
-    c4pl_dotsizes, c4pl_densities, "variable_x80_6pl",
-    "1440dpi", "x80",
-    variable_bits, variable_base_res, "default",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    NULL, NULL, "standard"
-  },
-  /* 60: Stylus C84 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_NO),
-    59, 60, 2, 180, 180, 2, 180, 180, 2, 4,
-    360, 14400, -1, 2880, 1440, 360, 180,
-    0, 1, 0, 80, 42, -240, 0, 0, 1, 28800, 720 * 720,
-    INCH(17 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 24,
-    4, 15, 0, 0,
-    c3pl_pigment_dotsizes, c3pl_pigment_densities, "variable_3pl_pigment",
-    "2880_1440dpi", "c82",
-    variable_bits, variable_base_res, "default",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    &bsc84_borderless_sequence, NULL, "standard"
-  },
-  /* 61: Stylus Color C63/C64 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_NO),
-    29, 30, 3, 90, 90, 3, 90, 90, 3, 4,
-    360, 14400, -1, 2880, 1440, 360, 120,
-    0, 1, 0, 80, 42, -180, 0, 0, 1, 28800, 1440 * 720,
-    INCH(17 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 24,
-    4, 15, 0, 0,
-    c3pl_pigment_dotsizes, c3pl_pigment_densities, "variable_3pl_pigment",
-    "2880_1440dpi", "c64",
-    variable_bits, variable_base_res, "default",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    &bsc64_borderless_sequence, NULL, "standard"
-  },
-  /* 62: Stylus Photo 900 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_NO),
-    48, 1, 3, 48, 1, 3, 48, 1, 3, 6,
-    360, 14400, -1, 2880, 720, 90, 90,
-    0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 720 * 720,
-    INCH(17 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, 399, 394, 595, 842, 24,
-    3, 15, 0, 0,
-    c4pl_dotsizes, c4pl_2880_densities, "variable_2880_4pl",
-    "2880dpi", "photo_gen2",
-    variable_bits, variable_base_res, "cd_roll_feed",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    &sp900_borderless_sequence, NULL, "photo"
-  },
-  /* 63: Stylus Photo R300 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_FULL | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_NO),
-    90, 1, 3, 90, 1, 3, 90, 1, 3, 6,
-    360, 14400, -1, 2880, 1440, 360, 120,
-    0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 1440 * 1440,
-    INCH(17 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 595, 842, 24,
-    4, 15, 0, 0,
-    p3pl_dotsizes, p3pl_densities, "variable_3pl_pmg",
-    "superfine", "photo_gen3",
-    variable_bits, variable_base_res, "cd_roll_feed",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    &spr300_borderless_sequence, NULL, "photo"
-  },
-  /* 64: PM-G800/Stylus Photo R800 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_FULL | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_NO),
-    180, 1, 2, 180, 1, 2, 180, 1, 2, 8,
-    360, 28800, -1, 5760, 2880, 360, 180,
-    180 * 2, 1, 0, 80, 42, 0, 0, 0, 1, 180, 5760 * 2880,
-    INCH(17 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 11, 9, 9, 0, 11, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 595, 842, 24,
-    4, 15, 0, 0,
-    p1_5pl_dotsizes, p1_5pl_densities, "variable_1_5pl",
-    "superfine", "cmykrb",
-    variable_bits, c1_5_base_res, "r1800",
-    "v2880", &new_init_sequence, &je_deinit_sequence,
-    &spr800_borderless_sequence, NULL, "r800"
-  },
-  /* 65: Stylus Photo CX4600 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_NO),
-    90, 1, 3, 90, 1, 3, 90, 1, 3, 4,
-    360, 14400, -1, 5760, 1440, 360, 120,
-    0, 1, 0, 80, 42, 0, 0, 0, 1, 180, 1440 * 1440,
-    INCH(17 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 595, 842, 0,
-    4, 15, 0, 0,
-    p3pl_dotsizes, p3pl_densities, "variable_3pl_pmg",
-    "superfine", "cx3650",
-    variable_bits, variable_base_res, "default",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    NULL, NULL, "mfp2005"
-  },
-  /* 66: Stylus Color C65/C66 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_NO),
-    29, 30, 3, 90, 90, 3, 90, 90, 3, 4,
-    360, 14400, -1, 2880, 1440, 360, 120,
-    0, 1, 0, 80, 42, -180, 0, 0, 1, 28800, 1440 * 720,
-    INCH(17 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 24,
-    4, 15, 0, 0,
-    c3pl_pigment_dotsizes, c3pl_pigment_c66_densities, "variable_3pl_pigment_c66",
-    "2880_1440dpi", "c64",
-    variable_bits, variable_base_res, "default",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    &bsc66_borderless_sequence, NULL, "standard"
-  },
-  /* 67: Stylus Photo R1800 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_FULL | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_NO),
-    180, 1, 2, 180, 1, 2, 180, 1, 2, 8,
-    360, 28800, -1, 5760, 2880, 360, 180,
-    180 * 2, 1, 0, 96, 42, 0, 0, 0, 1, 180, 5760 * 2880,
-    INCH(13), INCH(1200), INCH(2), INCH(2), INCH(13), INCH(1200),
-    9, 9, 0, 11, 9, 9, 0, 11, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 595, 842, 24,
-    4, 15, 0, 0,
-    p1_5pl_dotsizes, p1_5pl_densities, "variable_1_5pl",
-    "superfine", "cmykrb",
-    variable_bits, c1_5_base_res, "r1800",
-    "v2880", &new_init_sequence, &je_deinit_sequence,
-    &spr800_borderless_sequence, NULL, "r800"
-  },
-  /* 68: PM-G820 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_FULL | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_NO),
-    180, 1, 2, 180, 1, 2, 180, 1, 2, 8,
-    360, 14400, -1, 5760, 2880, 360, 180,
-    180 * 2, 1, 0, 80, 42, 0, 0, 0, 1, 180, 5760 * 2880,
-    INCH(17 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 11, 9, 9, 0, 11, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 595, 842, 24,
-    4, 15, 0, 0,
-    p1_5pl_dotsizes, p1_5pl_densities, "variable_1_5pl",
-    "superfine", "cmykrb",
-    variable_bits, c1_5_base_res, "cd_roll_feed",
-    "v2880", &new_init_sequence, &je_deinit_sequence,
-    &spr800_borderless_sequence, NULL, "r800"
-  },
-  /* 69: Stylus C86 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_NO),
-    59, 60, 2, 180, 180, 2, 180, 180, 2, 4,
-    360, 14400, -1, 2880, 2880, 360, 180,
-    0, 1, 0, 80, 42, -240, 0, 0, 1, 28800, 1440 * 720,
-    INCH(17 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 24,
-    4, 15, 0, 0,
-    c3pl_pigment_dotsizes, c3pl_pigment_densities, "variable_3pl_pigment",
-    "2880_1440dpi", "c82",
-    variable_bits, variable_base_res, "default",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    &bsc86_borderless_sequence, NULL, "standard"
-  },
-  /* 70: Stylus Photo RX700 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_FULL | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_NO),
-    180, 1, 2, 180, 1, 2, 180, 1, 2, 6,
-    360, 28800, -1, 5760, 2880, 360, 180,
-    10, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 1440 * 1440,
-    INCH(17 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 263, 595, 842, 0,
-    4, 15, 0, 0,
-    p1_5pl_dotsizes, p1_5pl_densities, "variable_1_5pl",
-    "superfine", "photo_gen3",
-    variable_bits, c1_5_base_res, "rx700",
-    "p1_5", &new_init_sequence, &je_deinit_sequence,
-    &generic_borderless_sequence, NULL, "rx700"
-  },
-  /* 71: Stylus Photo R2400 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_FULL | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_YES |
-     MODEL_ENVELOPE_LANDSCAPE_NO),
-    180, 1, 2, 180, 1, 2, 180, 1, 2, 8,
-    360, 14400, -1, 5760, 2880, 360, 180,
-    10, 1, 0, 80, 42, 0, 0, 0, 1, 180, 1440 * 1440,
-    INCH(13), INCH(1200), INCH(2), INCH(2), INCH(13), INCH(1200),
-    9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 595, 842, 0,
-    4, 15, 0, 0,
-    p3_5pl_dotsizes, p3_5pl_densities, "variable_r2400",
-    "superfine", "f360_ultrachrome_k3",
-    variable_bits, c1_5_base_res, "r2400",
-    "v2880", &new_init_sequence, &je_deinit_sequence,
-    &generic_borderless_sequence, NULL, "r2400"
-  },
-  /* 72: Stylus CX3700/3800/3810 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_NO),
-    29, 30, 3, 90, 90, 3, 90, 90, 3, 4,
-    360, 14400, -1, 2880, 1440, 360, 120,
-    0, 1, 0, 80, 42, -180, 0, 0, 1, 28800, 1440 * 720,
-    INCH(17 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
-    4, 15, 0, 0,
-    c3pl_pigment_dotsizes, c3pl_pigment_c66_densities, "variable_3pl_pigment_c66",
-    "2880_1440dpi", "c64",
-    variable_bits, variable_base_res, "default",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    NULL, NULL, "cx3800"
-  },
-  /* 73: E-100/PictureMate */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_NO |
-     MODEL_ZEROMARGIN_FULL | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_NO),
-    90, 1, 3, 90, 1, 3, 90, 1, 3, 6,
-    360, 28800, -1, 5760, 1440, 1440, 720,
-    0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 1440 * 1440,
-    INCH(4), INCH(1200), INCH(2), INCH(2), INCH(4), INCH(1200),
-    9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 595, 842, 0,
-    4, 15, 0, 0,
-    picturemate_dotsizes, picturemate_densities, "variable_picturemate",
-    "picturemate", "picturemate_6",
-    variable_bits, c1_5_base_res, "default",
-    "picturemate", &new_init_sequence, &je_deinit_sequence,
-    NULL, NULL, "picturemate_6"
-  },
-  /* 74: PM-A650 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_NO),
-    90, 90, 3, 90, 90, 3, 90, 90, 3, 4,
-    360, 14400, -1, 5760, 1440, 360, 120,
-    0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 1440 * 1440,
-    INCH(17 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
-    4, 15, 0, 0,
-    c3pl_pigment_dotsizes, c3pl_pigment_c66_densities, "variable_3pl_pigment_c66",
-    "superfine", "c64",
-    variable_bits, variable_base_res, "cd_roll_feed",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    &generic_borderless_sequence, NULL, "standard"
-  },
-  /* 75: Japanese PM-A750 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_NO |
-     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_YES |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_NO),
-    90, 90, 3, 90, 90, 3, 90, 90, 3, 4,
-    360, 14400, -1, 5760, 1440, 360, 120,
-    0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 1440 * 1440,
-    INCH(17 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 0, 0, 0,
-    4, 15, 0, 0,
-    c2pl_dotsizes, c2pl_densities, "variable_2pl",
-    "superfine", "c64",
-    variable_bits, variable_base_res, "cd_roll_feed",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    NULL, NULL, "standard"
-  },
-  /* 76: Japanese PM-A890 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_NO |
-     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_YES |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_NO),
-    90, 90, 3, 90, 90, 3, 90, 90, 3, 6,
-    360, 14400, -1, 5760, 1440, 360, 120,
-    0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 1440 * 1440,
-    INCH(17 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 0, 0, 0,
-    4, 15, 0, 0,
-    c2pl_dotsizes, c2pl_densities, "variable_2pl",
-    "superfine", "photo_gen3",
-    variable_bits, variable_base_res, "cd_roll_feed",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    &generic_borderless_sequence, NULL, "standard"
-  },
-  /* 77: Japanese PM-D600 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_NO),
-    90, 1, 3, 90, 1, 3, 90, 1, 3, 4,
-    360, 14400, -1, 2880, 1440, 360, 120,
-    0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 1440 * 1440,
-    INCH(17 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 595, 842, 0,
-    4, 15, 0, 0,
-    p3pl_dotsizes, p3pl_densities, "variable_3pl_pmg",
-    "superfine", "c64",
-    variable_bits, variable_base_res, "cd_roll_feed",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    &generic_borderless_sequence, NULL, "photo"
-  },
-  /* 78: Stylus Photo 810/820 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    48, 1, 3, 48, 1, 3, 48, 1, 3, 6,
-    360, 14400, -1, 2880, 720, 90, 90,
-    0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 720 * 720,
-    INCH(19 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 24,
-    3, 15, 0, 0,
-    c4pl_dotsizes, c4pl_2880_densities, "variable_2880_4pl",
-    "2880dpi", "photo_gen2",
-    variable_bits, variable_base_res, "default",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    &sp1280_borderless_sequence, NULL, "photo"
-  },
-  /* 79: Stylus CX6400 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_NO),
-    59, 60, 2, 180, 180, 2, 180, 180, 2, 4,
-    360, 14400, -1, 2880, 1440, 360, 180,
-    0, 1, 0, 80, 42, -240, 0, 0, 1, 28800, 720 * 720,
-    INCH(17 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 24,
-    4, 15, 0, 0,
-    c3pl_pigment_dotsizes, c3pl_pigment_densities, "variable_3pl_pigment",
-    "2880_1440dpi", "c82",
-    variable_bits, variable_base_res, "default",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    &cx6400_borderless_sequence, NULL, "standard"
-  },
-  /* 80: Stylus CX6600 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_NO),
-    59, 60, 2, 180, 180, 2, 180, 180, 2, 4,
-    360, 14400, -1, 2880, 2880, 360, 180,
-    0, 1, 0, 80, 42, -240, 0, 0, 1, 28800, 1440 * 720,
-    INCH(17 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 24,
-    4, 15, 0, 0,
-    c3pl_pigment_dotsizes, c3pl_pigment_densities, "variable_3pl_pigment",
-    "2880_1440dpi", "c82",
-    variable_bits, variable_base_res, "default",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    &cx6600_borderless_sequence, NULL, "standard"
-  },
-  /* 81: Stylus Photo R260 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_NO),
-    90, 1, 4, 90, 1, 4, 90, 1, 4, 6,
-    360, 14400, -1, 5760, 2880, 360, 90,
-    90 * 4, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 5760 * 2880,
-    INCH(17 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, 204, 189, 595, 842, 24,
-    4, 15, 0, 0,
-    claria_dotsizes, claria_densities, "variable_claria",
-    "superfine", "claria",
-    variable_bits, c1_5_base_res, "cd_roll_feed",
-    "v2880", &new_init_sequence, &je_deinit_sequence,
-    &generic_borderless_sequence, NULL, "sp1400"
-  },
-  /* 82: Stylus Photo 1400 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_NO),
-    90, 1, 4, 90, 1, 4, 90, 1, 4, 6,
-    360, 14400, -1, 5760, 2880, 360, 90,
-    90 * 4, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 5760 * 2880,
-    INCH(13), INCH(1200), INCH(2), INCH(2), INCH(13), INCH(1200),
-    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, 204, 263, 595, 842, 24,
-    4, 15, 0, 0,
-    claria_1400_dotsizes, claria_1400_densities, "variable_claria_1400",
-    "claria_1400", "claria",
-    variable_bits, claria_1400_base_res, "cd_roll_feed",
-    "v2880", &new_init_sequence, &je_deinit_sequence,
-    &generic_borderless_sequence, NULL, "sp1400"
-  },
-  /* 83: Stylus Photo R240 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_FULL | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_NO),
-    90, 1, 3, 90, 1, 3, 90, 1, 3, 4,
-    360, 14400, -1, 5760, 1440, 360, 120,
-    0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 1440 * 1440,
-    INCH(17 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 595, 842, 24,
-    4, 15, 0, 0,
-    p3pl_dotsizes, p3pl_densities, "variable_3pl_pmg",
-    "superfine", "photo_gen3_4",
-    variable_bits, variable_base_res, "cd_roll_feed",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    &spr300_borderless_sequence, NULL, "standard"
-  },
-  /* 84: Stylus Photo RX500 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_FULL | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_NO),
-    90, 1, 3, 90, 1, 3, 90, 1, 3, 6,
-    360, 14400, -1, 2880, 1440, 360, 120,
-    0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 1440 * 1440,
-    INCH(17 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 595, 842, 24,
-    4, 15, 0, 0,
-    p3pl_dotsizes, p3pl_densities, "variable_3pl_pmg",
-    "superfine", "photo_gen3",
-    variable_bits, variable_base_res, "cd_roll_feed",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    &sprx500_borderless_sequence, NULL, "photo"
-  },
-  /* 85: Stylus C120 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_NO),
-    59, 60, 2, 360, 1, 1, 360, 1, 1, 4,
-    360, 14400, -1, 5760, 2880, 360, 180,
-    0, 1, 0, 80, 42, -240, 0, 0, 1, 28800, 5760 * 2880,
-    INCH(17 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 24,
-    4, 15, 0, 0,
-    c3pl_pigment_c120_dotsizes, c3pl_pigment_c120_densities, "variable_3pl_pigment_c120",
-    "superfine", "c120",
-    variable_bits, variable_base_res, "default",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    &generic_borderless_sequence, NULL, "c120"
-  },
-  /* 86: PictureMate 4-color */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_NO |
-     MODEL_ZEROMARGIN_FULL | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_NO),
-    90, 1, 3, 90, 1, 3, 90, 1, 3, 4,
-    360, 28800, -1, 5760, 1440, 1440, 720,
-    0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 1440 * 1440,
-    INCH(4), INCH(1200), INCH(2), INCH(2), INCH(4), INCH(1200),
-    9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 595, 842, 0,
-    4, 15, 0, 0,
-    picturemate_dotsizes, picturemate_densities, "variable_picturemate",
-    "picturemate", "picturemate_4",
-    variable_bits, c1_5_base_res, "default",
-    "picturemate", &new_init_sequence, &je_deinit_sequence,
-    NULL, NULL, "picturemate_4"
-  },
-};
+  stp_mxml_node_t *tmp = xmod->child;
+  stpi_escp2_printer_t *p = stp_escp2_get_printer(v);
+  int found_black_head_config = 0;
+  int found_fast_head_config = 0;
+  p->max_black_resolution = -1;
+  p->cd_x_offset = -1;
+  p->cd_y_offset = -1;
+  while (tmp)
+    {
+      if (tmp->type == STP_MXML_ELEMENT)
+	{
+	  const char *name = tmp->value.element.name;
+	  const char *target = stp_mxmlElementGetAttr(tmp, "src");
+	  if (target)
+	    {
+	      if (!strcmp(name, "media"))
+		stp_escp2_load_media(v, target);
+	      else if (!strcmp(name, "inputSlots"))
+		stp_escp2_load_input_slots(v, target);
+	      else if (!strcmp(name, "mediaSizes"))
+		stp_escp2_load_media_sizes(v, target);
+	      else if (!strcmp(name, "printerWeaves"))
+		stp_escp2_load_printer_weaves(v, target);
+	      else if (!strcmp(name, "qualityPresets"))
+		stp_escp2_load_quality_presets(v, target);
+	      else if (!strcmp(name, "resolutions"))
+		stp_escp2_load_resolutions(v, target);
+	      else if (!strcmp(name, "inkGroup"))
+		stp_escp2_load_inkgroup(v, target);
+	    }
+	  else if (tmp->child && tmp->child->type == STP_MXML_TEXT)
+	    {
+	      stp_mxml_node_t *child = tmp->child;
+	      const char *val = child->value.text.string;
+	      if (!strcmp(name, "verticalBorderlessSequence"))
+		{
+		  if (p->vertical_borderless_sequence)
+		    {
+		      stp_erprintf("Reassigning vertical borderless sequence for model %d\n", model);
+		      stp_abort();
+		    }
+		  p->vertical_borderless_sequence = stp_xmlstrtoraw(val);
+		}
+	      else if (!strcmp(name, "preinitSequence"))
+		{
+		  if (p->preinit_sequence)
+		    {
+		      stp_erprintf("Reassigning pre-init sequence for model %d\n", model);
+		      stp_abort();
+		    }
+		  p->preinit_sequence = stp_xmlstrtoraw(val);
+		}
+	      else if (!strcmp(name, "preinitRemoteSequence"))
+		{
+		  if (p->preinit_remote_sequence)
+		    {
+		      stp_erprintf("Reassigning pre-init remote sequence for model %d\n", model);
+		      stp_abort();
+		    }
+		  p->preinit_remote_sequence = stp_xmlstrtoraw(val);
+		}
+	      else if (!strcmp(name, "postinitRemoteSequence"))
+		{
+		  if (p->postinit_remote_sequence)
+		    {
+		      stp_erprintf("Reassigning post-init remote sequence for model %d\n", model);
+		      stp_abort();
+		    }
+		  p->postinit_remote_sequence = stp_xmlstrtoraw(val);
+		}
+	      else if (!strcmp(name, "commandSet"))
+		{
+		  if (!strcmp(val, "1998"))
+		    p->flags |= MODEL_COMMAND_1998;
+		  else if (!strcmp(val, "1999"))
+		    p->flags |= MODEL_COMMAND_1999;
+		  else if (!strcmp(val, "2000"))
+		    p->flags |= MODEL_COMMAND_2000;
+		  else if (!strcmp(val, "Pro"))
+		    p->flags |= MODEL_COMMAND_PRO;
+		}
+	      else if (!strcmp(name, "borderless"))
+		{
+		  if (!strcmp(val, "No"))
+		    p->flags |= MODEL_ZEROMARGIN_NO;
+		  else if (!strcmp(val, "Yes"))
+		    p->flags |= MODEL_ZEROMARGIN_YES;
+		  else if (!strcmp(val, "Full"))
+		    p->flags |= MODEL_ZEROMARGIN_FULL;
+		  else if (!strcmp(val, "HorizontalOnly"))
+		    p->flags |= MODEL_ZEROMARGIN_H_ONLY;
+		}
+	      else if (!strcmp(name, "preferredEnvelopeOrientation") &&
+		       !strcmp(val, "Landscape"))
+		p->flags |= MODEL_ENVELOPE_LANDSCAPE_YES;
+	      else if (!strcmp(name, "headConfiguration"))
+		{
+		  const char *htype = stp_mxmlElementGetAttr(tmp, "type");
+		  unsigned long data[4] = { 0, 0, 0, 0 };
+		  while (child)
+		    {
+		      if (child->type == STP_MXML_ELEMENT && child->child &&
+			  child->child->type == STP_MXML_TEXT)
+			{
+			  const char *cname = child->value.element.name;
+			  const char *cval = child->child->value.text.string;
+			  if (!strcmp(cname, "Nozzles"))
+			    data[0] = stp_xmlstrtoul(cval);
+			  else if (!strcmp(cname, "MinNozzles"))
+			    data[1] = stp_xmlstrtoul(cval);
+			  else if (!strcmp(cname, "FirstNozzle"))
+			    data[2] = stp_xmlstrtoul(cval);
+			  else if (!strcmp(cname, "NozzleSeparation"))
+			    data[3] = stp_xmlstrtoul(cval);
+			}
+		      child = child->next;
+		    }		      
+		  if (!strcmp(htype, "default"))
+		    {
+		      p->nozzles = data[0];
+		      p->min_nozzles = data[1];
+		      p->nozzle_start = data[2];
+		      p->nozzle_separation = data[3];
+		      if (!found_black_head_config)
+			{
+			  p->black_nozzles = data[0];
+			  p->min_black_nozzles = data[1];
+			  p->black_nozzle_start = data[2];
+			  p->black_nozzle_separation = data[3];
+			}
+		      if (!found_fast_head_config)
+			{
+			  p->fast_nozzles = data[0];
+			  p->min_fast_nozzles = data[1];
+			  p->fast_nozzle_start = data[2];
+			  p->fast_nozzle_separation = data[3];
+			}
+		    }
+		  else if (!strcmp(htype, "black"))
+		    {
+		      p->black_nozzles = data[0];
+		      p->min_black_nozzles = data[1];
+		      p->black_nozzle_start = data[2];
+		      p->black_nozzle_separation = data[3];
+		      found_black_head_config = 1;
+		    }
+		  else if (!strcmp(htype, "fast"))
+		    {
+		      p->fast_nozzles = data[0];
+		      p->min_fast_nozzles = data[1];
+		      p->fast_nozzle_start = data[2];
+		      p->fast_nozzle_separation = data[3];
+		      found_fast_head_config = 1;
+		    }
+		}
+	      else if (!strcmp(name, "margins"))
+		{
+		  const char *itype = stp_mxmlElementGetAttr(tmp, "interleave");
+		  const char *mtype = stp_mxmlElementGetAttr(tmp, "media");
+		  unsigned long data[4];
+		  int i = 0;
+		  while (child && i < 4)
+		    {
+		      if (child->type == STP_MXML_TEXT)
+			data[i++] = stp_xmlstrtoul(child->value.text.string);
+		      child = child->next;
+		    }		      
+		  if (itype && !strcmp(itype, "soft") &&
+		      mtype && !strcmp(mtype, "sheet"))
+		    {
+		      p->left_margin = data[0];
+		      p->right_margin = data[1];
+		      p->top_margin = data[2];
+		      p->bottom_margin = data[3];
+		    }
+		  else if (itype && !strcmp(itype, "printer") &&
+			   mtype && !strcmp(mtype, "sheet"))
+		    {
+		      p->m_left_margin = data[0];
+		      p->m_right_margin = data[1];
+		      p->m_top_margin = data[2];
+		      p->m_bottom_margin = data[3];
+		    }
+		  else if (itype && !strcmp(itype, "soft") &&
+			   mtype && !strcmp(mtype, "roll"))
+		    {
+		      p->roll_left_margin = data[0];
+		      p->roll_right_margin = data[1];
+		      p->roll_top_margin = data[2];
+		      p->roll_bottom_margin = data[3];
+		    }
+		  else if (itype && !strcmp(itype, "printer") &&
+			   mtype && !strcmp(mtype, "roll"))
+		    {
+		      p->m_roll_left_margin = data[0];
+		      p->m_roll_right_margin = data[1];
+		      p->m_roll_top_margin = data[2];
+		      p->m_roll_bottom_margin = data[3];
+		    }
+		}
+	      else if (!strcmp(name, "physicalChannels"))
+		p->physical_channels = stp_xmlstrtoul(val);
+	      else if (!strcmp(name, "baseSeparation"))
+		p->base_separation = stp_xmlstrtoul(val);
+	      else if (!strcmp(name, "resolutionScale"))
+		p->resolution_scale = stp_xmlstrtoul(val);
+	      else if (!strcmp(name, "maxBlackResolution"))
+		p->max_black_resolution = stp_xmlstrtoul(val);
+	      else if (!strcmp(name, "minimumResolution"))
+		{
+		  p->min_hres = stp_xmlstrtoul(child->value.text.string);
+		  child = child->next;
+		  p->min_vres = stp_xmlstrtoul(child->value.text.string);
+		}
+	      else if (!strcmp(name, "maximumResolution"))
+		{
+		  p->max_hres = stp_xmlstrtoul(child->value.text.string);
+		  child = child->next;
+		  p->max_vres = stp_xmlstrtoul(child->value.text.string);
+		}
+	      else if (!strcmp(name, "extraVerticalFeed"))
+		p->extra_feed = stp_xmlstrtoul(val);
+	      else if (!strcmp(name, "separationRows"))
+		p->separation_rows = stp_xmlstrtoul(val);
+	      else if (!strcmp(name, "pseudoSeparationRows"))
+		p->pseudo_separation_rows = stp_xmlstrtoul(val);
+	      else if (!strcmp(name, "zeroMarginOffset"))
+		p->zero_margin_offset = stp_xmlstrtoul(val);
+	      else if (!strcmp(name, "microLeftMargin"))
+		p->micro_left_margin = stp_xmlstrtoul(val);
+	      else if (!strcmp(name, "initialVerticalOffset"))
+		p->initial_vertical_offset = stp_xmlstrtoul(val);
+	      else if (!strcmp(name, "blackInitialVerticalOffset"))
+		p->black_initial_vertical_offset = stp_xmlstrtoul(val);
+	      else if (!strcmp(name, "extra720DPISeparation"))
+		p->extra_720dpi_separation = stp_xmlstrtoul(val);
+	      else if (!strcmp(name, "minHorizontalAlignment"))
+		p->min_horizontal_position_alignment = stp_xmlstrtoul(val);
+	      else if (!strcmp(name, "baseHorizontalAlignment"))
+		p->base_horizontal_position_alignment = stp_xmlstrtoul(val);
+	      else if (!strcmp(name, "bidirectionalAutoUpperLimit"))
+		p->bidirectional_upper_limit = stp_xmlstrtoul(val);
+	      else if (!strcmp(name, "minimumMediaSize"))
+		{
+		  p->min_paper_width = stp_xmlstrtoul(child->value.text.string);
+		  child = child->next;
+		  p->min_paper_height = stp_xmlstrtoul(child->value.text.string);
+		}
+	      else if (!strcmp(name, "maximumMediaSize"))
+		{
+		  p->max_paper_width = stp_xmlstrtoul(child->value.text.string);
+		  child = child->next;
+		  p->max_paper_height = stp_xmlstrtoul(child->value.text.string);
+		}
+	      else if (!strcmp(name, "maximumImageableArea"))
+		{
+		  p->max_imageable_width = stp_xmlstrtoul(child->value.text.string);
+		  child = child->next;
+		  p->max_imageable_height = stp_xmlstrtoul(child->value.text.string);
+		}
+	      else if (!strcmp(name, "CDOffset"))
+		{
+		  p->cd_x_offset = stp_xmlstrtoul(child->value.text.string);
+		  child = child->next;
+		  p->cd_y_offset = stp_xmlstrtoul(child->value.text.string);
+		}
+	      else if (!strcmp(name, "CDMediaSize"))
+		{
+		  p->cd_page_width = stp_xmlstrtoul(child->value.text.string);
+		  child = child->next;
+		  p->cd_page_height = stp_xmlstrtoul(child->value.text.string);
+		}
+	      else if (!strcmp(name, "extraBottom"))
+		p->paper_extra_bottom = stp_xmlstrtoul(val);
+	      else if (!strcmp(name, "AlignmentChoices"))
+		{
+		  p->alignment_passes =
+		    stp_xmlstrtoul(child->value.text.string);
+		  child = child->next;
+		  p->alignment_choices =
+		    stp_xmlstrtoul(child->value.text.string);
+		  child = child->next;
+		  p->alternate_alignment_passes =
+		    stp_xmlstrtoul(child->value.text.string);
+		  child = child->next;
+		  p->alternate_alignment_choices =
+		    stp_xmlstrtoul(child->value.text.string);
+		}
+	      else if (!strcmp(name, "ChannelNames"))
+		{
+		  p->channel_names = stp_string_list_create();
+		  while (child)
+		    {
+		      if (child->type == STP_MXML_ELEMENT &&
+			  !strcmp(child->value.element.name, "ChannelName"))
+			{
+			  const char *cname = stp_mxmlElementGetAttr(child, "name");
+			  stp_string_list_add_string(p->channel_names, cname, cname);
+			}
+		      child = child->next;
+		    }
+		}
+	      else if (!strcmp(name, "resolutions"))
+		stp_escp2_load_resolutions_from_xml(v, tmp);
+	    }
+	  else
+	    {
+	      if (!strcmp(name, "supportsVariableDropsizes"))
+		p->flags |= MODEL_VARIABLE_YES;
+	      else if (!strcmp(name, "hasFastGraymode"))
+		p->flags |= MODEL_GRAYMODE_YES;
+	      else if (!strcmp(name, "hasFast360DPI"))
+		p->flags |= MODEL_FAST_360_YES;
+	      else if (!strcmp(name, "sendZeroAdvance"))
+		p->flags |= MODEL_SEND_ZERO_ADVANCE_YES;
+	      else if (!strcmp(name, "supportsInkChange"))
+		p->flags |= MODEL_SUPPORTS_INK_CHANGE_YES;
+	      else if (!strcmp(name, "supportsD4Mode"))
+		p->flags |= MODEL_PACKET_MODE_YES;
+	      else if (!strcmp(name, "hasInterchangeableInkCartridges"))
+		p->flags |= MODEL_INTERCHANGEABLE_INK_YES;
+	      else if (!strcmp(name, "resolutions"))
+		stp_escp2_load_resolutions_from_xml(v, tmp);
+	    }
+	}
+      tmp = tmp->next;
+    }
+}
+
+void
+stp_escp2_load_model(const stp_vars_t *v, int model)
+{
+  stp_list_t *dirlist = stpi_data_path();
+  stp_list_item_t *item;
+  char buf[1024];
+  int found = 0;
+
+  stp_xml_init();
+  sprintf(buf, "escp2/model/model_%d.xml", model);
+  item = stp_list_get_start(dirlist);
+  while (item)
+    {
+      const char *dn = (const char *) stp_list_item_get_data(item);
+      char *fn = stpi_path_merge(dn, buf);
+      stp_mxml_node_t *doc = stp_mxmlLoadFromFile(NULL, fn, STP_MXML_NO_CALLBACK);
+      stp_free(fn);
+      if (doc)
+	{
+	  stp_mxml_node_t *node =
+	    stp_mxmlFindElement(doc, doc, "escp2:model", NULL, NULL,
+				STP_MXML_DESCEND);
+	  if (node)
+	    {
+	      const char *stmp = stp_mxmlElementGetAttr(node, "id");
+	      if (stmp && stp_xmlstrtol(stmp) == model)
+		{
+		  load_model_from_file(v, node, model);
+		  found = 1;
+		}
+	      else
+		{
+		  stp_erprintf("Model id %d does not match definition %s!\n",
+			       model, stmp);
+		  stp_abort();
+		}
+	    }
+	  stp_mxmlDelete(doc);
+	  if (found)
+	    break;
+	}
+      item = stp_list_item_next(item);
+    }
+  stp_xml_exit();
+  stp_list_destroy(dirlist);
+  if (! found)
+    {
+      stp_erprintf("Unable to find printer definition for model %d!\n", model);
+      stp_abort();
+    }
+}
+
+stpi_escp2_printer_t *
+stp_escp2_get_printer(const stp_vars_t *v)
+{
+  int model = stp_get_model_id(v);
+  if (model < 0)
+    {
+      stp_erprintf("Unable to find printer definition for model %d!\n", model);
+      stp_abort();
+    }
+  if (!escp2_model_capabilities)
+    {
+      escp2_model_capabilities =
+	stp_zalloc(sizeof(stpi_escp2_printer_t) * (model + 1));
+      escp2_model_count = model + 1;
+    }
+  else if (model >= escp2_model_count)
+    {
+      escp2_model_capabilities =
+	stp_realloc(escp2_model_capabilities,
+		    sizeof(stpi_escp2_printer_t) * (model + 1));
+      (void) memset(escp2_model_capabilities + escp2_model_count, 0,
+		    sizeof(stpi_escp2_printer_t) * (model + 1 - escp2_model_count));
+      escp2_model_count = model + 1;
+    }
+  if (!(escp2_model_capabilities[model].active))
+    {
+#ifdef HAVE_LOCALE_H
+      char *locale = stp_strdup(setlocale(LC_ALL, NULL));
+      setlocale(LC_ALL, "C");
+#endif
+      escp2_model_capabilities[model].active = 1;
+      stp_escp2_load_model(v, model);
+#ifdef HAVE_LOCALE_H
+      setlocale(LC_ALL, locale);
+      stp_free(locale);
+#endif
+    }
+  return &(escp2_model_capabilities[model]);
+}
 
-const int stpi_escp2_model_limit =
-sizeof(stpi_escp2_model_capabilities) / sizeof(stpi_escp2_printer_t);
+model_featureset_t
+stp_escp2_get_cap(const stp_vars_t *v, escp2_model_option_t feature)
+{
+  stpi_escp2_printer_t *printdef = stp_escp2_get_printer(v);
+  model_featureset_t featureset =
+    (((1ul << escp2_printer_attrs[feature].bit_width) - 1ul) <<
+     escp2_printer_attrs[feature].bit_shift);
+  return printdef->flags & featureset;
+}
+
+int
+stp_escp2_has_cap(const stp_vars_t *v, escp2_model_option_t feature,
+		  model_featureset_t class)
+{
+  stpi_escp2_printer_t *printdef = stp_escp2_get_printer(v);
+  model_featureset_t featureset =
+    (((1ul << escp2_printer_attrs[feature].bit_width) - 1ul) <<
+     escp2_printer_attrs[feature].bit_shift);
+  return ((printdef->flags & featureset) == class);
+}
diff --git a/src/main/print-escp2.c b/src/main/print-escp2.c
index b00b8d4..1aebc0a 100644
--- a/src/main/print-escp2.c
+++ b/src/main/print-escp2.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-escp2.c,v 1.387 2008/02/27 02:22:26 rlk Exp $"
+ * "$Id: print-escp2.c,v 1.414 2008/07/26 15:16:15 rlk Exp $"
  *
  *   Print plug-in EPSON ESC/P2 driver for the GIMP.
  *
@@ -33,7 +33,6 @@
 #include <gutenprint/gutenprint-intl-internal.h>
 #include "gutenprint-internal.h"
 #include <string.h>
-#include <assert.h>
 #include <math.h>
 #include <limits.h>
 #include "print-escp2.h"
@@ -52,28 +51,6 @@
 
 typedef struct
 {
-  const char *attr_name;
-  short bit_shift;
-  short bit_width;
-} escp2_printer_attr_t;
-
-static const escp2_printer_attr_t escp2_printer_attrs[] =
-{
-  { "command_mode",		0, 4 },
-  { "zero_margin",		4, 2 },
-  { "variable_mode",		6, 1 },
-  { "graymode",		 	7, 1 },
-  { "vacuum",			8, 1 },
-  { "fast_360",			9, 1 },
-  { "send_zero_advance",       10, 1 },
-  { "supports_ink_change",     11, 1 },
-  { "packet_mode",             12, 1 },
-  { "interchangeable_ink",     13, 1 },
-  { "envelope_landscape",      14, 1 },
-};
-
-typedef struct
-{
   unsigned count;
   const char *name;
 } channel_count_t;
@@ -125,27 +102,25 @@ static const double ink_darknesses[] =
 
 #define INCH(x)		(72 * x)
 
-static const res_t *escp2_find_resolution(const stp_vars_t *v);
-
 #define PARAMETER_INT(s)						\
 {									\
   "escp2_" #s, "escp2_" #s, N_("Advanced Printer Functionality"), NULL,	\
   STP_PARAMETER_TYPE_INT, STP_PARAMETER_CLASS_FEATURE,			\
-  STP_PARAMETER_LEVEL_INTERNAL, 0, 1, -1, 1, 0				\
+  STP_PARAMETER_LEVEL_INTERNAL, 0, 1, STP_CHANNEL_NONE, 1, 0		\
 }
 
 #define PARAMETER_INT_RO(s)						\
 {									\
   "escp2_" #s, "escp2_" #s, N_("Advanced Printer Functionality"), NULL,	\
   STP_PARAMETER_TYPE_INT, STP_PARAMETER_CLASS_FEATURE,			\
-  STP_PARAMETER_LEVEL_INTERNAL, 0, 1, -1, 1, 1				\
+  STP_PARAMETER_LEVEL_INTERNAL, 0, 1, STP_CHANNEL_NONE, 1, 1		\
 }
 
 #define PARAMETER_RAW(s)						\
 {									\
   "escp2_" #s, "escp2_" #s, N_("Advanced Printer Functionality"), NULL,	\
   STP_PARAMETER_TYPE_RAW, STP_PARAMETER_CLASS_FEATURE,			\
-  STP_PARAMETER_LEVEL_INTERNAL, 0, 1, -1, 1, 0				\
+  STP_PARAMETER_LEVEL_INTERNAL, 0, 1, STP_CHANNEL_NONE, 1, 0		\
 }
 
 typedef struct
@@ -157,6 +132,14 @@ typedef struct
   int color_only;
 } float_param_t;
 
+typedef struct
+{
+  const stp_parameter_t param;
+  int min;
+  int max;
+  int defval;
+} int_param_t;
+
 static const stp_parameter_t the_parameters[] =
 {
 #if 0
@@ -164,7 +147,7 @@ static const stp_parameter_t the_parameters[] =
     "AutoMode", N_("Automatic Printing Mode"), N_("Basic Output Adjustment"),
     N_("Automatic printing mode"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
 #endif
   /*
@@ -176,61 +159,67 @@ static const stp_parameter_t the_parameters[] =
     "Quality", N_("Print Quality"), N_("Basic Output Adjustment"),
     N_("Print Quality"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 0, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 0, 0
   },
   {
     "PageSize", N_("Page Size"), N_("Basic Printer Setup"),
     N_("Size of the paper being printed to"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_CORE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "MediaType", N_("Media Type"), N_("Basic Printer Setup"),
     N_("Type of media (plain paper, photo paper, etc.)"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "InputSlot", N_("Media Source"), N_("Basic Printer Setup"),
     N_("Source (input slot) of the media"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
+  },
+  {
+    "Duplex", N_("Double-Sided Printing"), N_("Basic Printer Setup"),
+    N_("Duplex/Tumble Setting"),
+    STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_FEATURE,
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "CDInnerRadius", N_("CD Hub Size"), N_("Basic Printer Setup"),
     N_("Print only outside of the hub of the CD, or all the way to the hole"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "CDOuterDiameter", N_("CD Size (Custom)"), N_("Basic Printer Setup"),
     N_("Variable adjustment for the outer diameter of CD"),
     STP_PARAMETER_TYPE_DIMENSION, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_ADVANCED, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_ADVANCED, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "CDInnerDiameter", N_("CD Hub Size (Custom)"), N_("Basic Printer Setup"),
     N_("Variable adjustment to the inner hub of the CD"),
     STP_PARAMETER_TYPE_DIMENSION, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_ADVANCED, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_ADVANCED, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "CDXAdjustment", N_("CD Horizontal Fine Adjustment"), N_("Advanced Printer Setup"),
     N_("Fine adjustment to horizontal position for CD printing"),
     STP_PARAMETER_TYPE_DIMENSION, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_ADVANCED, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_ADVANCED, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "CDYAdjustment", N_("CD Vertical Fine Adjustment"), N_("Advanced Printer Setup"),
     N_("Fine adjustment to horizontal position for CD printing"),
     STP_PARAMETER_TYPE_DIMENSION, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_ADVANCED, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_ADVANCED, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "Resolution", N_("Resolution"), N_("Basic Printer Setup"),
     N_("Resolution of the print"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_ADVANCED, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_ADVANCED, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   /*
    * Don't check this parameter.  We may offer different settings for
@@ -241,115 +230,109 @@ static const stp_parameter_t the_parameters[] =
     "InkType", N_("Ink Type"), N_("Advanced Printer Setup"),
     N_("Type of ink in the printer"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_ADVANCED2, 1, 1, -1, 0, 0
+    STP_PARAMETER_LEVEL_ADVANCED2, 1, 1, STP_CHANNEL_NONE, 0, 0
   },
   {
     "UseGloss", N_("Enhanced Gloss"), N_("Basic Printer Setup"),
     N_("Add gloss enhancement"),
     STP_PARAMETER_TYPE_BOOLEAN, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 0, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 0, 0
   },
   {
     "InkSet", N_("Ink Set"), N_("Basic Printer Setup"),
     N_("Type of ink in the printer"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "PrintingDirection", N_("Printing Direction"), N_("Advanced Output Adjustment"),
     N_("Printing direction (unidirectional is higher quality, but slower)"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_ADVANCED1, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_ADVANCED1, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "FullBleed", N_("Borderless"), N_("Basic Printer Setup"),
     N_("Print without borders"),
     STP_PARAMETER_TYPE_BOOLEAN, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "Weave", N_("Interleave Method"), N_("Advanced Output Adjustment"),
     N_("Interleave pattern to use"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_ADVANCED1, 1, 1, -1, 1, 0
-  },
-  {
-    "AdjustDotsize", N_("Adjust dot size as necessary"), N_("Advanced Printer Setup"),
-    N_("Adjust dot size as necessary to achieve desired density"),
-    STP_PARAMETER_TYPE_BOOLEAN, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_ADVANCED4, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_ADVANCED1, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "OutputOrder", N_("Output Order"), N_("Basic Printer Setup"),
     N_("Output Order"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_BASIC, 0, 0, -1, 0, 0
+    STP_PARAMETER_LEVEL_BASIC, 0, 0, STP_CHANNEL_NONE, 0, 0
   },
   {
     "AlignmentPasses", N_("Alignment Passes"), N_("Advanced Printer Functionality"),
     N_("Alignment Passes"),
     STP_PARAMETER_TYPE_INT, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_INTERNAL, 0, 0, -1, 0, 0
+    STP_PARAMETER_LEVEL_INTERNAL, 0, 0, STP_CHANNEL_NONE, 0, 0
   },
   {
     "AlignmentChoices", N_("Alignment Choices"), N_("Advanced Printer Functionality"),
     N_("Alignment Choices"),
     STP_PARAMETER_TYPE_INT, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_INTERNAL, 0, 0, -1, 0, 0
+    STP_PARAMETER_LEVEL_INTERNAL, 0, 0, STP_CHANNEL_NONE, 0, 0
   },
   {
     "InkChange", N_("Ink change command"), N_("Advanced Printer Functionality"),
     N_("Ink change command"),
     STP_PARAMETER_TYPE_INT, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_INTERNAL, 0, 0, -1, 0, 0
+    STP_PARAMETER_LEVEL_INTERNAL, 0, 0, STP_CHANNEL_NONE, 0, 0
   },
   {
     "AlternateAlignmentPasses", N_("Alternate Alignment Passes"), N_("Advanced Printer Functionality"),
     N_("Alternate Alignment Passes"),
     STP_PARAMETER_TYPE_INT, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_INTERNAL, 0, 0, -1, 0, 0
+    STP_PARAMETER_LEVEL_INTERNAL, 0, 0, STP_CHANNEL_NONE, 0, 0
   },
   {
     "AlternateAlignmentChoices", N_("Alternate Alignment Choices"), N_("Advanced Printer Functionality"),
     N_("Alternate Alignment Choices"),
     STP_PARAMETER_TYPE_INT, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_INTERNAL, 0, 0, -1, 0, 0
+    STP_PARAMETER_LEVEL_INTERNAL, 0, 0, STP_CHANNEL_NONE, 0, 0
   },
   {
     "SupportsPacketMode", N_("Supports Packet Mode"), N_("Advanced Printer Functionality"),
     N_("Supports D4 Packet Mode"),
     STP_PARAMETER_TYPE_BOOLEAN, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_INTERNAL, 0, 0, -1, 0, 0
+    STP_PARAMETER_LEVEL_INTERNAL, 0, 0, STP_CHANNEL_NONE, 0, 0
   },
   {
     "InterchangeableInk", N_("Has Interchangeable Ink Cartridges"), N_("Advanced Printer Functionality"),
     N_("Has multiple choices of ink cartridges"),
     STP_PARAMETER_TYPE_BOOLEAN, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_INTERNAL, 0, 0, -1, 0, 0
+    STP_PARAMETER_LEVEL_INTERNAL, 0, 0, STP_CHANNEL_NONE, 0, 0
   },
   {
     "InkChannels", N_("Ink Channels"), N_("Advanced Printer Functionality"),
     N_("Ink Channels"),
     STP_PARAMETER_TYPE_INT, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_INTERNAL, 0, 0, -1, 0, 0
+    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,
-    STP_PARAMETER_LEVEL_INTERNAL, 0, 0, -1, 0, 0
+    STP_PARAMETER_LEVEL_INTERNAL, 0, 0, STP_CHANNEL_NONE, 0, 0
   },
   {
     "PrintingMode", N_("Printing Mode"), N_("Core Parameter"),
     N_("Printing Output Mode"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_CORE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "RawChannels", N_("Raw Channels"), N_("Core Parameter"),
     N_("Raw Channel Count"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_CORE,
-    STP_PARAMETER_LEVEL_BASIC, 0, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 0, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "CyanHueCurve", N_("Cyan Map"), N_("Advanced Output Control"),
@@ -376,6 +359,12 @@ static const stp_parameter_t the_parameters[] =
     STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, 4, 1, 0
   },
   {
+    "OrangeHueCurve", N_("Orange Map"), N_("Advanced Output Control"),
+    N_("Adjust the orange map"),
+    STP_PARAMETER_TYPE_CURVE, STP_PARAMETER_CLASS_OUTPUT,
+    STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, 4, 1, 0
+  },
+  {
     "RedHueCurve", N_("Red Map"), N_("Advanced Output Control"),
     N_("Adjust the red map"),
     STP_PARAMETER_TYPE_CURVE, STP_PARAMETER_CLASS_OUTPUT,
@@ -391,6 +380,9 @@ static const stp_parameter_t the_parameters[] =
   PARAMETER_INT(min_nozzles),
   PARAMETER_INT(min_black_nozzles),
   PARAMETER_INT(min_fast_nozzles),
+  PARAMETER_INT(nozzle_start),
+  PARAMETER_INT(black_nozzle_start),
+  PARAMETER_INT(fast_nozzle_start),
   PARAMETER_INT(nozzle_separation),
   PARAMETER_INT(black_nozzle_separation),
   PARAMETER_INT(fast_nozzle_separation),
@@ -432,6 +424,7 @@ static const stp_parameter_t the_parameters[] =
   PARAMETER_INT(cd_page_height),
   PARAMETER_INT(paper_extra_bottom),
   PARAMETER_RAW(preinit_sequence),
+  PARAMETER_RAW(preinit_remote_sequence),
   PARAMETER_RAW(postinit_remote_sequence),
   PARAMETER_RAW(vertical_borderless_sequence)
 };
@@ -491,6 +484,14 @@ static const float_param_t float_parameters[] =
   },
   {
     {
+      "OrangeDensity", N_("Orange Density"), N_("Output Level Adjustment"),
+      N_("Adjust the orange density"),
+      STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
+      STP_PARAMETER_LEVEL_ADVANCED, 0, 1, 5, 1, 0
+    }, 0.0, 2.0, 1.0, 1
+  },
+  {
+    {
       "GlossLimit", N_("Gloss Level"), N_("Output Level Adjustment"),
       N_("Adjust the gloss level"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
@@ -502,15 +503,15 @@ static const float_param_t float_parameters[] =
       "DropSize1", N_("Drop Size Small"), N_("Advanced Ink Adjustment"),
       N_("Drop Size 1 (small)"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
-      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, -1, 1, 0
-    }, 0.0, 1.0, 0.0, 1
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
+    }, 0.0, 1.0, 1.0, 1
   },
   {
     {
       "DropSize2", N_("Drop Size Medium"), N_("Advanced Ink Adjustment"),
       N_("Drop Size 2 (medium)"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
-      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, -1, 1, 0
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
     }, 0.0, 1.0, 0.0, 1
   },
   {
@@ -518,7 +519,7 @@ static const float_param_t float_parameters[] =
       "DropSize3", N_("Drop Size Large"), N_("Advanced Ink Adjustment"),
       N_("Drop Size 3 (large)"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
-      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, -1, 1, 0
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
     }, 0.0, 1.0, 0.0, 1
   },
   {
@@ -526,15 +527,15 @@ static const float_param_t float_parameters[] =
       "LightCyanValue", N_("Light Cyan Value"), N_("Advanced Ink Adjustment"),
       N_("Light Cyan Value"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
-      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, -1, 1, 0
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
     }, 0.0, 5.0, 1.0, 1
   },
   {
     {
-      "LightCyanTransition", N_("Light Cyan Transition"), N_("Advanced Ink Adjustment"),
+      "LightCyanTrans", N_("Light Cyan Transition"), N_("Advanced Ink Adjustment"),
       N_("Light Cyan Transition"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
-      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, -1, 1, 0
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
     }, 0.0, 5.0, 1.0, 1
   },
   {
@@ -542,7 +543,7 @@ static const float_param_t float_parameters[] =
       "LightCyanScale", N_("Light Cyan Density Scale"), N_("Advanced Ink Adjustment"),
       N_("Light Cyan Density Scale"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
-      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, -1, 1, 0
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
     }, 0.0, 5.0, 1.0, 1
   },
   {
@@ -550,7 +551,7 @@ static const float_param_t float_parameters[] =
       "LightMagentaValue", N_("Light Magenta Value"), N_("Advanced Ink Adjustment"),
       N_("Light Magenta Value"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
-      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, -1, 1, 0
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
     }, 0.0, 5.0, 1.0, 1
   },
   {
@@ -558,15 +559,15 @@ static const float_param_t float_parameters[] =
       "LightMagentaScale", N_("Light Magenta Density Scale"), N_("Advanced Ink Adjustment"),
       N_("Light Magenta Density Scale"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
-      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, -1, 1, 0
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
     }, 0.0, 5.0, 1.0, 1
   },
   {
     {
-      "LightMagentaTransition", N_("Light Magenta Transition"), N_("Advanced Ink Adjustment"),
+      "LightMagentaTrans", N_("Light Magenta Transition"), N_("Advanced Ink Adjustment"),
       N_("Light Magenta Transition"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
-      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, -1, 1, 0
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
     }, 0.0, 5.0, 1.0, 1
   },
   {
@@ -574,15 +575,15 @@ static const float_param_t float_parameters[] =
       "DarkYellowValue", N_("Dark Yellow Value"), N_("Advanced Ink Adjustment"),
       N_("Dark Yellow Value"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
-      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, -1, 1, 0
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
     }, 0.0, 5.0, 1.0, 1
   },
   {
     {
-      "DarkYellowTransition", N_("Dark Yellow Transition"), N_("Advanced Ink Adjustment"),
+      "DarkYellowTrans", N_("Dark Yellow Transition"), N_("Advanced Ink Adjustment"),
       N_("Dark Yellow Transition"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
-      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, -1, 1, 0
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
     }, 0.0, 5.0, 1.0, 1
   },
   {
@@ -590,7 +591,7 @@ static const float_param_t float_parameters[] =
       "DarkYellowScale", N_("Dark Yellow Density Scale"), N_("Advanced Ink Adjustment"),
       N_("Dark Yellow Density Scale"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
-      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, -1, 1, 0
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
     }, 0.0, 5.0, 1.0, 1
   },
   {
@@ -598,15 +599,15 @@ static const float_param_t float_parameters[] =
       "GrayValue", N_("Gray Value"), N_("Advanced Ink Adjustment"),
       N_("Gray Value"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
-      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, -1, 1, 0
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
     }, 0.0, 5.0, 1.0, 1
   },
   {
     {
-      "GrayTransition", N_("Gray Transition"), N_("Advanced Ink Adjustment"),
+      "GrayTrans", N_("Gray Transition"), N_("Advanced Ink Adjustment"),
       N_("Gray Transition"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
-      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, -1, 1, 0
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
     }, 0.0, 5.0, 1.0, 1
   },
   {
@@ -614,7 +615,7 @@ static const float_param_t float_parameters[] =
       "GrayScale", N_("Gray Density Scale"), N_("Advanced Ink Adjustment"),
       N_("Gray Density Scale"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
-      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, -1, 1, 0
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
     }, 0.0, 5.0, 1.0, 1
   },
   {
@@ -622,15 +623,15 @@ static const float_param_t float_parameters[] =
       "DarkGrayValue", N_("Gray Value"), N_("Advanced Ink Adjustment"),
       N_("Gray Value"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
-      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, -1, 1, 0
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
     }, 0.0, 5.0, 1.0, 1
   },
   {
     {
-      "DarkGrayTransition", N_("Gray Transition"), N_("Advanced Ink Adjustment"),
+      "DarkGrayTrans", N_("Gray Transition"), N_("Advanced Ink Adjustment"),
       N_("Gray Transition"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
-      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, -1, 1, 0
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
     }, 0.0, 5.0, 1.0, 1
   },
   {
@@ -638,7 +639,7 @@ static const float_param_t float_parameters[] =
       "DarkGrayScale", N_("Gray Density Scale"), N_("Advanced Ink Adjustment"),
       N_("Gray Density Scale"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
-      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, -1, 1, 0
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
     }, 0.0, 5.0, 1.0, 1
   },
   {
@@ -646,15 +647,15 @@ static const float_param_t float_parameters[] =
       "LightGrayValue", N_("Light Gray Value"), N_("Advanced Ink Adjustment"),
       N_("Light Gray Value"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
-      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, -1, 1, 0
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
     }, 0.0, 5.0, 1.0, 1
   },
   {
     {
-      "LightGrayTransition", N_("Light Gray Transition"), N_("Advanced Ink Adjustment"),
+      "LightGrayTrans", N_("Light Gray Transition"), N_("Advanced Ink Adjustment"),
       N_("Light Gray Transition"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
-      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, -1, 1, 0
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
     }, 0.0, 5.0, 1.0, 1
   },
   {
@@ -662,7 +663,7 @@ static const float_param_t float_parameters[] =
       "LightGrayScale", N_("Light Gray Density Scale"), N_("Advanced Ink Adjustment"),
       N_("Light Gray Density Scale"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
-      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, -1, 1, 0
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
     }, 0.0, 5.0, 1.0, 1
   },
   {
@@ -670,15 +671,15 @@ static const float_param_t float_parameters[] =
       "Gray3Value", N_("Dark Gray Value"), N_("Advanced Ink Adjustment"),
       N_("Dark Gray Value"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
-      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, -1, 1, 0
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
     }, 0.0, 5.0, 1.0, 1
   },
   {
     {
-      "Gray3Transition", N_("Dark Gray Transition"), N_("Advanced Ink Adjustment"),
+      "Gray3Trans", N_("Dark Gray Transition"), N_("Advanced Ink Adjustment"),
       N_("Dark Gray Transition"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
-      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, -1, 1, 0
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
     }, 0.0, 5.0, 1.0, 1
   },
   {
@@ -686,7 +687,7 @@ static const float_param_t float_parameters[] =
       "Gray3Scale", N_("Dark Gray Density Scale"), N_("Advanced Ink Adjustment"),
       N_("Dark Gray Density Scale"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
-      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, -1, 1, 0
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
     }, 0.0, 5.0, 1.0, 1
   },
   {
@@ -694,15 +695,15 @@ static const float_param_t float_parameters[] =
       "Gray2Value", N_("Mid Gray Value"), N_("Advanced Ink Adjustment"),
       N_("Medium Gray Value"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
-      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, -1, 1, 0
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
     }, 0.0, 5.0, 1.0, 1
   },
   {
     {
-      "Gray2Transition", N_("Mid Gray Transition"), N_("Advanced Ink Adjustment"),
+      "Gray2Trans", N_("Mid Gray Transition"), N_("Advanced Ink Adjustment"),
       N_("Medium Gray Transition"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
-      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, -1, 1, 0
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
     }, 0.0, 5.0, 1.0, 1
   },
   {
@@ -710,7 +711,7 @@ static const float_param_t float_parameters[] =
       "Gray2Scale", N_("Mid Gray Density Scale"), N_("Advanced Ink Adjustment"),
       N_("Medium Gray Density Scale"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
-      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, -1, 1, 0
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
     }, 0.0, 5.0, 1.0, 1
   },
   {
@@ -718,15 +719,15 @@ static const float_param_t float_parameters[] =
       "Gray1Value", N_("Light Gray Value"), N_("Advanced Ink Adjustment"),
       N_("Light Gray Value"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
-      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, -1, 1, 0
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
     }, 0.0, 5.0, 1.0, 1
   },
   {
     {
-      "Gray1Transition", N_("Light Gray Transition"), N_("Advanced Ink Adjustment"),
+      "Gray1Trans", N_("Light Gray Transition"), N_("Advanced Ink Adjustment"),
       N_("Light Gray Transition"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
-      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, -1, 1, 0
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
     }, 0.0, 5.0, 1.0, 1
   },
   {
@@ -734,7 +735,7 @@ static const float_param_t float_parameters[] =
       "Gray1Scale", N_("Light Gray Density Scale"), N_("Advanced Ink Adjustment"),
       N_("Light Gray Density Scale"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
-      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, -1, 1, 0
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
     }, 0.0, 5.0, 1.0, 1
   },
   {
@@ -761,50 +762,96 @@ static const float_param_t float_parameters[] =
       STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, 0, 1, 0
     }, 0.0, 5.0, 0.5, 1
   },
+  {
+    {
+      "PageDryTime", N_("Drying Time Per Page"), N_("Advanced Printer Functionality"),
+      N_("Set drying time per page"),
+      STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_FEATURE,
+      STP_PARAMETER_LEVEL_ADVANCED3, 0, 1, STP_CHANNEL_NONE, 1, 0
+    }, 0, 60.0, 0.0, 1
+  },
+  {
+    {
+      "ScanDryTime", N_("Drying Time Per Scan"), N_("Advanced Printer Functionality"),
+      N_("Set drying time per scan"),
+      STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_FEATURE,
+      STP_PARAMETER_LEVEL_ADVANCED3, 0, 1, STP_CHANNEL_NONE, 1, 0
+    }, 0, 10.0, 0.0, 1
+  },
+  {
+    {
+      "ScanMinDryTime", N_("Minimum Drying Time Per Scan"), N_("Advanced Printer Functionality"),
+      N_("Set minimum drying time per scan"),
+      STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_FEATURE,
+      STP_PARAMETER_LEVEL_ADVANCED3, 0, 1, STP_CHANNEL_NONE, 1, 0
+    }, 0, 10.0, 0.0, 1
+  },
 };
 
 static const int float_parameter_count =
 sizeof(float_parameters) / sizeof(const float_param_t);
 
 
-static escp2_privdata_t *
-get_privdata(stp_vars_t *v)
+static const int_param_t int_parameters[] =
 {
-  return (escp2_privdata_t *) stp_get_component_data(v, "Driver");
-}
-
-static model_featureset_t
-escp2_get_cap(const stp_vars_t *v, escp2_model_option_t feature)
-{
-  int model = stp_get_model_id(v);
-  if (feature < 0 || feature >= MODEL_LIMIT)
-    return (model_featureset_t) -1;
-  else
+  {
     {
-      model_featureset_t featureset =
-	(((1ul << escp2_printer_attrs[feature].bit_width) - 1ul) <<
-	 escp2_printer_attrs[feature].bit_shift);
-      return stpi_escp2_model_capabilities[model].flags & featureset;
-    }
-}
+      "PaperThickness", N_("Paper Thickness"), N_("Advanced Printer Functionality"),
+      N_("Set printer paper thickness"),
+      STP_PARAMETER_TYPE_INT, STP_PARAMETER_CLASS_FEATURE,
+      STP_PARAMETER_LEVEL_ADVANCED3, 0, 1, STP_CHANNEL_NONE, 1, 0
+    }, 0, 255, 0
+  },
+  {
+    {
+      "VacuumIntensity", N_("Vacuum Intensity"), N_("Advanced Printer Functionality"),
+      N_("Set vacuum intensity (printer-specific)"),
+      STP_PARAMETER_TYPE_INT, STP_PARAMETER_CLASS_FEATURE,
+      STP_PARAMETER_LEVEL_ADVANCED3, 0, 1, STP_CHANNEL_NONE, 1, 0
+    }, 0, 255, 0
+  },
+  {
+    {
+      "FeedSequence", N_("Feed Sequence"), N_("Advanced Printer Functionality"),
+      N_("Set paper feed sequence (printer-specific)"),
+      STP_PARAMETER_TYPE_INT, STP_PARAMETER_CLASS_FEATURE,
+      STP_PARAMETER_LEVEL_ADVANCED3, 0, 1, STP_CHANNEL_NONE, 1, 0
+    }, 0, 255, 0
+  },
+  {
+    {
+      "PrintMethod", N_("Print Method"), N_("Advanced Printer Functionality"),
+      N_("Set print method (printer-specific)"),
+      STP_PARAMETER_TYPE_INT, STP_PARAMETER_CLASS_FEATURE,
+      STP_PARAMETER_LEVEL_ADVANCED3, 0, 1, STP_CHANNEL_NONE, 1, 0
+    }, 0, 255, 0
+  },
+  {
+    {
+      "PlatenGap", N_("Platen Gap"), N_("Advanced Printer Functionality"),
+      N_("Set platen gap (printer-specific)"),
+      STP_PARAMETER_TYPE_INT, STP_PARAMETER_CLASS_FEATURE,
+      STP_PARAMETER_LEVEL_ADVANCED3, 0, 1, STP_CHANNEL_NONE, 1, 0
+    }, 0, 255, 0
+  },
+  {
+    {
+      "FeedAdjustment", N_("Feed Adjustment"), N_("Advanced Printer Functionality"),
+      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
+    }, 0, 255, 0
+  },
+};
 
-static int
-escp2_has_cap(const stp_vars_t *v, escp2_model_option_t feature,
-	      model_featureset_t class)
+static const int int_parameter_count =
+sizeof(int_parameters) / sizeof(const int_param_t);
+
+
+static escp2_privdata_t *
+get_privdata(stp_vars_t *v)
 {
-  int model = stp_get_model_id(v);
-  if (feature < 0 || feature >= MODEL_LIMIT)
-    return -1;
-  else
-    {
-      model_featureset_t featureset =
-	(((1ul << escp2_printer_attrs[feature].bit_width) - 1ul) <<
-	 escp2_printer_attrs[feature].bit_shift);
-      if ((stpi_escp2_model_capabilities[model].flags & featureset) == class)
-	return 1;
-      else
-	return 0;
-    }
+  return (escp2_privdata_t *) stp_get_component_data(v, "Driver");
 }
 
 #define DEF_SIMPLE_ACCESSOR(f, t)					\
@@ -815,8 +862,8 @@ escp2_##f(const stp_vars_t *v)						\
     return stp_get_int_parameter(v, "escp2_" #f);			\
   else									\
     {									\
-      int model = stp_get_model_id(v);					\
-      return (stpi_escp2_model_capabilities[model].f);			\
+      stpi_escp2_printer_t *printdef = stp_escp2_get_printer(v);	\
+      return printdef->f;						\
     }									\
 }
 
@@ -828,8 +875,8 @@ escp2_##f(const stp_vars_t *v)						\
     return stp_get_raw_parameter(v, "escp2_" #f);			\
   else									\
     {									\
-      int model = stp_get_model_id(v);					\
-      return (stpi_escp2_model_capabilities[model].f);			\
+      stpi_escp2_printer_t *printdef = stp_escp2_get_printer(v);	\
+      return printdef->f;						\
     }									\
 }
 
@@ -841,21 +888,21 @@ escp2_##f(const stp_vars_t *v, int rollfeed)				\
     return stp_get_int_parameter(v, "escp2_" #f);			\
   else									\
     {									\
-      int model = stp_get_model_id(v);					\
-      const res_t *res = escp2_find_resolution(v);			\
-      if (res && !(res->softweave))					\
+      stpi_escp2_printer_t *printdef = stp_escp2_get_printer(v);	\
+      const res_t *res = stp_escp2_find_resolution(v);			\
+      if (res && res->command)						\
 	{								\
 	  if (rollfeed)							\
-	    return (stpi_escp2_model_capabilities[model].m_roll_##f);	\
+	    return (printdef->m_roll_##f);				\
 	  else								\
-	    return (stpi_escp2_model_capabilities[model].m_##f);	\
+	    return (printdef->m_##f);					\
 	}								\
       else								\
 	{								\
 	  if (rollfeed)							\
-	    return (stpi_escp2_model_capabilities[model].roll_##f);	\
+	    return (printdef->roll_##f);				\
 	  else								\
-	    return (stpi_escp2_model_capabilities[model].f);		\
+	    return (printdef->f);					\
 	}								\
     }									\
 }
@@ -870,6 +917,9 @@ DEF_SIMPLE_ACCESSOR(fast_nozzles, unsigned)
 DEF_SIMPLE_ACCESSOR(min_nozzles, unsigned)
 DEF_SIMPLE_ACCESSOR(min_black_nozzles, unsigned)
 DEF_SIMPLE_ACCESSOR(min_fast_nozzles, unsigned)
+DEF_SIMPLE_ACCESSOR(nozzle_start, int)
+DEF_SIMPLE_ACCESSOR(black_nozzle_start, int)
+DEF_SIMPLE_ACCESSOR(fast_nozzle_start, int)
 DEF_SIMPLE_ACCESSOR(nozzle_separation, unsigned)
 DEF_SIMPLE_ACCESSOR(black_nozzle_separation, unsigned)
 DEF_SIMPLE_ACCESSOR(fast_nozzle_separation, unsigned)
@@ -910,56 +960,44 @@ DEF_ROLL_ACCESSOR(top_margin, unsigned)
 DEF_ROLL_ACCESSOR(bottom_margin, unsigned)
 
 DEF_RAW_ACCESSOR(preinit_sequence, const stp_raw_t *)
+DEF_RAW_ACCESSOR(preinit_remote_sequence, const stp_raw_t *)
 DEF_RAW_ACCESSOR(postinit_remote_sequence, const stp_raw_t *)
 
 DEF_RAW_ACCESSOR(vertical_borderless_sequence, const stp_raw_t *)
 
-static inline const res_t *const *
+static const resolution_list_t *
 escp2_reslist(const stp_vars_t *v)
 {
-  int model = stp_get_model_id(v);
-  return (stpi_escp2_get_reslist_named
-	  (stpi_escp2_model_capabilities[model].reslist));
+  stpi_escp2_printer_t *printdef = stp_escp2_get_printer(v);
+  return printdef->resolutions;
 }
 
 static inline const printer_weave_list_t *
 escp2_printer_weaves(const stp_vars_t *v)
 {
-  int model = stp_get_model_id(v);
-  return (stpi_escp2_get_printer_weaves_named
-	  (stpi_escp2_model_capabilities[model].printer_weaves));
+  stpi_escp2_printer_t *printdef = stp_escp2_get_printer(v);
+  return printdef->printer_weaves;
 }
 
-static inline const channel_name_t *
+static inline const stp_string_list_t *
 escp2_channel_names(const stp_vars_t *v)
 {
-  int model = stp_get_model_id(v);
-  return (stpi_escp2_get_channel_names_named
-	  (stpi_escp2_model_capabilities[model].channel_names));
+  stpi_escp2_printer_t *printdef = stp_escp2_get_printer(v);
+  return (printdef->channel_names);
 }
 
 static inline const inkgroup_t *
 escp2_inkgroup(const stp_vars_t *v)
 {
-  int model = stp_get_model_id(v);
-  return (stpi_escp2_get_inkgroup_named
-	  (stpi_escp2_model_capabilities[model].inkgroup));
+  stpi_escp2_printer_t *printdef = stp_escp2_get_printer(v);
+  return (printdef->inkgroup);
 }
 
 static inline const quality_list_t *
 escp2_quality_list(const stp_vars_t *v)
 {
-  int model = stp_get_model_id(v);
-  return (stpi_escp2_get_quality_list_named
-	  (stpi_escp2_model_capabilities[model].quality_list));
-}
-
-static inline const input_slot_list_t *
-escp2_input_slots(const stp_vars_t *v)
-{
-  int model = stp_get_model_id(v);
-  return (stpi_escp2_get_input_slot_list_named
-	  (stpi_escp2_model_capabilities[model].input_slots));
+  stpi_escp2_printer_t *printdef = stp_escp2_get_printer(v);
+  return printdef->quality_list;
 }
 
 static const channel_count_t *
@@ -983,74 +1021,116 @@ get_channel_count_by_number(unsigned count)
 }
 
 static int
-escp2_ink_type(const stp_vars_t *v, int resid)
+escp2_res_param(const stp_vars_t *v, const char *param, const res_t *res)
 {
-  if (stp_check_int_parameter(v, "escp2_ink_type", STP_PARAMETER_ACTIVE))
-    return stp_get_int_parameter(v, "escp2_ink_type");
+  if (res)
+    {
+      if (res->v &&
+	  stp_check_int_parameter(res->v, param, STP_PARAMETER_ACTIVE))
+	return stp_get_int_parameter(res->v, param);
+      else
+	return -1;
+    }
+  if (stp_check_int_parameter(v, param, STP_PARAMETER_ACTIVE))
+    return stp_get_int_parameter(v, param);
   else
     {
-      int model = stp_get_model_id(v);
-      return stpi_escp2_model_capabilities[model].dot_sizes[resid];
+      const res_t *res1 = stp_escp2_find_resolution(v);
+      if (res1->v &&
+	  stp_check_int_parameter(res1->v, param, STP_PARAMETER_ACTIVE))
+	return stp_get_int_parameter(res1->v, param);
     }
+  return -1;
+}
+
+static int
+escp2_ink_type(const stp_vars_t *v)
+{
+  return escp2_res_param(v, "escp2_ink_type", NULL);
 }
 
 static double
-escp2_density(const stp_vars_t *v, int resid)
+escp2_density(const stp_vars_t *v)
 {
   if (stp_check_float_parameter(v, "escp2_density", STP_PARAMETER_ACTIVE))
     return stp_get_float_parameter(v, "escp2_density");
   else
     {
-      int model = stp_get_model_id(v);
-      return stpi_escp2_model_capabilities[model].densities[resid];
+      const res_t *res1 = stp_escp2_find_resolution(v);
+      if (res1->v &&
+	  stp_check_float_parameter(res1->v, "escp2_density", STP_PARAMETER_ACTIVE))
+	return stp_get_float_parameter(res1->v, "escp2_density");
     }
+  return 0;
 }
 
 static int
-escp2_bits(const stp_vars_t *v, int resid)
+escp2_bits(const stp_vars_t *v)
 {
-  if (stp_check_int_parameter(v, "escp2_bits", STP_PARAMETER_ACTIVE))
-    return stp_get_int_parameter(v, "escp2_bits");
-  else
-    {
-      int model = stp_get_model_id(v);
-      return stpi_escp2_model_capabilities[model].bits[resid];
-    }
+  return escp2_res_param(v, "escp2_bits", NULL);
 }
 
 static int
-escp2_base_res(const stp_vars_t *v, int resid)
+escp2_base_res(const stp_vars_t *v)
 {
-  if (stp_check_int_parameter(v, "escp2_base_res", STP_PARAMETER_ACTIVE))
-    return stp_get_int_parameter(v, "escp2_base_res");
-  else
+  return escp2_res_param(v, "escp2_base_res", NULL);
+}
+
+static int
+escp2_ink_type_by_res(const stp_vars_t *v, const res_t *res)
+{
+  return escp2_res_param(v, "escp2_ink_type", res);
+}
+
+static double
+escp2_density_by_res(const stp_vars_t *v, const res_t *res)
+{
+  if (res)
     {
-      int model = stp_get_model_id(v);
-      return stpi_escp2_model_capabilities[model].base_resolutions[resid];
+      if (res->v &&
+	  stp_check_float_parameter(res->v, "escp2_density", STP_PARAMETER_ACTIVE))
+	return stp_get_float_parameter(res->v, "escp2_density");
     }
+  return 0.0;
+}
+
+static int
+escp2_bits_by_res(const stp_vars_t *v, const res_t *res)
+{
+  return escp2_res_param(v, "escp2_bits", res);
 }
 
-static const escp2_dropsize_t *
-escp2_dropsizes(const stp_vars_t *v, int resid)
+static int
+escp2_base_res_by_res(const stp_vars_t *v, const res_t *res)
 {
-  int model = stp_get_model_id(v);
-  const escp2_drop_list_t *drops =
-    stpi_escp2_get_drop_list_named(stpi_escp2_model_capabilities[model].drops);
-  return (*drops)[resid];
+  return escp2_res_param(v, "escp2_base_res", res);
 }
 
 static escp2_dropsize_t *
-escp2_copy_dropsizes(const stp_vars_t *v, int resid)
+escp2_copy_dropsizes(const stp_vars_t *v)
 {
-  const escp2_dropsize_t *drops = escp2_dropsizes(v, resid);
-  int i;
-  escp2_dropsize_t *ndrops = stp_zalloc(sizeof(escp2_dropsize_t));
-  if (! drops)
+  const res_t *res = stp_escp2_find_resolution(v);
+  escp2_dropsize_t *ndrops;
+  if (!res || !(res->v))
     return NULL;
-  ndrops->listname = drops->listname;
-  ndrops->numdropsizes = drops->numdropsizes;
-  for (i = 0; i < drops->numdropsizes; i++)
-    ndrops->dropsizes[i] = drops->dropsizes[i];
+  ndrops = stp_zalloc(sizeof(escp2_dropsize_t));
+  if (! ndrops)
+    return NULL;
+  if (stp_check_float_parameter(res->v, "DropSize1", STP_PARAMETER_ACTIVE))
+    {
+      ndrops->numdropsizes = 1;
+      ndrops->dropsizes[0] = stp_get_float_parameter(res->v, "DropSize1");
+    }
+  if (stp_check_float_parameter(res->v, "DropSize2", STP_PARAMETER_ACTIVE))
+    {
+      ndrops->numdropsizes = 2;
+      ndrops->dropsizes[1] = stp_get_float_parameter(res->v, "DropSize2");
+    }
+  if (stp_check_float_parameter(res->v, "DropSize3", STP_PARAMETER_ACTIVE))
+    {
+      ndrops->numdropsizes = 3;
+      ndrops->dropsizes[2] = stp_get_float_parameter(res->v, "DropSize3");
+    }
   return ndrops;
 }
 
@@ -1061,8 +1141,8 @@ escp2_free_dropsizes(escp2_dropsize_t *drops)
     stp_free(drops);
 }
 
-static const inklist_t *
-escp2_inklist(const stp_vars_t *v)
+const inklist_t *
+stp_escp2_inklist(const stp_vars_t *v)
 {
   int i;
   const char *ink_list_name = NULL;
@@ -1074,32 +1154,39 @@ escp2_inklist(const stp_vars_t *v)
     {
       for (i = 0; i < inkgroup->n_inklists; i++)
 	{
-	  if (strcmp(ink_list_name, inkgroup->inklists[i]->name) == 0)
-	    return inkgroup->inklists[i];
+	  if (strcmp(ink_list_name, inkgroup->inklists[i].name) == 0)
+	    return &(inkgroup->inklists[i]);
 	}
     }
-  return inkgroup->inklists[0];
+  if (!inkgroup)
+    {
+      stp_erprintf("Cannot find inks for printer %s!\n",
+		   stp_get_driver(v));
+      stp_abort();
+    }
+  return &(inkgroup->inklists[0]);
 }
 
 static const shade_t *
 escp2_shades(const stp_vars_t *v, int channel)
 {
-  const inklist_t *inklist = escp2_inklist(v);
-  return &((*inklist->shades)[channel]);
+  const inklist_t *inklist = stp_escp2_inklist(v);
+  return &(inklist->shades[channel]);
 }
 
 static shade_t *
 escp2_copy_shades(const stp_vars_t *v, int channel)
 {
-  const shade_t *shades = escp2_shades(v, channel);
   int i;
   shade_t *nshades;
-  if (! shades)
+  const inklist_t *inklist = stp_escp2_inklist(v);
+  if (!inklist)
     return NULL;
   nshades = stp_zalloc(sizeof(shade_t));
-  nshades->n_shades = shades->n_shades;
-  for (i = 0; i < shades->n_shades; i++)
-    nshades->shades[i] = shades->shades[i];
+  nshades->n_shades = inklist->shades[channel].n_shades;
+  nshades->shades = stp_zalloc(sizeof(double) * inklist->shades[channel].n_shades);
+  for (i = 0; i < inklist->shades[channel].n_shades; i++)
+    nshades->shades[i] = inklist->shades[channel].shades[i];
   return nshades;
 }
 
@@ -1107,73 +1194,33 @@ static void
 escp2_free_shades(shade_t *shades)
 {
   if (shades)
-    stp_free(shades);
-}
-
-static const paperlist_t *
-escp2_paperlist(const stp_vars_t *v)
-{
-  const inklist_t *inklist = escp2_inklist(v);
-  if (inklist)
-    return stpi_escp2_get_paperlist_named(inklist->papers);
-  else
-    return NULL;
-}
-
-static int
-supports_borderless(const stp_vars_t *v)
-{
-  return (escp2_has_cap(v, MODEL_ZEROMARGIN, MODEL_ZEROMARGIN_YES) ||
-	  escp2_has_cap(v, MODEL_ZEROMARGIN, MODEL_ZEROMARGIN_FULL) ||
-	  escp2_has_cap(v, MODEL_ZEROMARGIN, MODEL_ZEROMARGIN_H_ONLY));
-}
-
-static int
-compute_internal_resid(int hres, int vres)
-{
-  static const int resolutions[RES_N] =
-    {
-      0,
-      360 * 360,
-      720 * 360,
-      720 * 720,
-      1440 * 720,
-      1440 * 1440,
-      2880 * 1440,
-      2880 * 2880,
-      5760 * 2880,
-    };
-  int total_resolution = hres * vres;
-  int i;
-  for (i = 0; i < RES_N; i++)
     {
-      if (total_resolution < resolutions[i])
-	return i - 1;
+      if (shades->shades)
+	stp_free(shades->shades);
+      stp_free(shades);
     }
-  return RES_N - 1;
 }
 
-static int
-compute_resid(const res_t *res)
+static const stp_string_list_t *
+escp2_paperlist(const stp_vars_t *v)
 {
-  return compute_internal_resid(res->hres, res->vres);
+  stpi_escp2_printer_t *printdef = stp_escp2_get_printer(v);
+  return printdef->papers;
 }
 
-static int
-compute_printed_resid(const res_t *res)
+static const stp_string_list_t *
+escp2_slotlist(const stp_vars_t *v)
 {
-  return compute_internal_resid(res->printed_hres, res->printed_vres);
+  stpi_escp2_printer_t *printdef = stp_escp2_get_printer(v);
+  return printdef->input_slots;
 }
 
 static int
-compute_virtual_resid(const res_t *res)
+supports_borderless(const stp_vars_t *v)
 {
-  int virtual = compute_internal_resid(res->virtual_hres, res->virtual_vres);
-  int normal = compute_internal_resid(res->hres, res->vres);
-  if (normal == virtual)
-    return compute_internal_resid(res->printed_hres, res->printed_vres);
-  else
-    return virtual;
+  return (stp_escp2_has_cap(v, MODEL_ZEROMARGIN, MODEL_ZEROMARGIN_YES) ||
+	  stp_escp2_has_cap(v, MODEL_ZEROMARGIN, MODEL_ZEROMARGIN_FULL) ||
+	  stp_escp2_has_cap(v, MODEL_ZEROMARGIN, MODEL_ZEROMARGIN_H_ONLY));
 }
 
 static int
@@ -1191,34 +1238,11 @@ max_nozzle_span(const stp_vars_t *v)
     return nozzle_span;
 }
 
-static const input_slot_t *
-get_input_slot(const stp_vars_t *v)
-{
-  int i;
-  const char *input_slot = stp_get_string_parameter(v, "InputSlot");
-  if (input_slot && strlen(input_slot) > 0)
-    {
-      const input_slot_list_t *slots = escp2_input_slots(v);
-      if (slots)
-	{
-	  for (i = 0; i < slots->n_input_slots; i++)
-	    {
-	      if (slots->slots[i].name &&
-		  strcmp(input_slot, slots->slots[i].name) == 0)
-		{
-		  return &(slots->slots[i]);
-		  break;
-		}
-	    }
-	}
-    }
-  return NULL;
-}
-
-static const printer_weave_t *
+static const stp_raw_t *
 get_printer_weave(const stp_vars_t *v)
 {
   int i;
+  const res_t *res = stp_escp2_find_resolution(v);
   const printer_weave_list_t *p = escp2_printer_weaves(v);
   if (p)
     {
@@ -1229,47 +1253,20 @@ get_printer_weave(const stp_vars_t *v)
 	  for (i = 0; i < printer_weave_count; i++)
 	    {
 	      if (!strcmp(name, p->printer_weaves[i].name))
-		return &(p->printer_weaves[i]);
+		return p->printer_weaves[i].command;
 	    }
 	}
     }
+  if (res)
+    return res->command;
   return NULL;
 }
 
 static int
 use_printer_weave(const stp_vars_t *v)
 {
-  const res_t *res = escp2_find_resolution(v);
-  if (!res)
-    return 1;
-  else if (!(res->softweave))
-    return 1;
-  else if (res->printer_weave)
-    return 1;
-  else
-    return 0;
-}
-
-
-static const paper_t *
-get_media_type(const stp_vars_t *v)
-{
-  int i;
-  const paperlist_t *p = escp2_paperlist(v);
-  if (p)
-    {
-      const char *name = stp_get_string_parameter(v, "MediaType");
-      int paper_type_count = p->paper_count;
-      if (name)
-	{
-	  for (i = 0; i < paper_type_count; i++)
-	    {
-	      if (!strcmp(name, p->papers[i].name))
-		return &(p->papers[i]);
-	    }
-	}
-    }
-  return NULL;
+  const res_t *res = stp_escp2_find_resolution(v);
+  return (!res || res->command);
 }
 
 static void
@@ -1277,7 +1274,7 @@ get_resolution_bounds_by_paper_type(const stp_vars_t *v,
 				    unsigned *max_x, unsigned *max_y,
 				    unsigned *min_x, unsigned *min_y)
 {
-  const paper_t *paper = get_media_type(v);
+  const paper_t *paper = stp_escp2_get_media_type(v, 1);
   *min_x = 0;
   *min_y = 0;
   *max_x = 0;
@@ -1363,7 +1360,7 @@ verify_resolution(const stp_vars_t *v, const res_t *res)
   int nozzle_width =
     (escp2_base_separation(v) / escp2_nozzle_separation(v));
   int nozzles = escp2_nozzles(v);
-  if (escp2_ink_type(v, compute_printed_resid(res)) != -1 &&
+  if (escp2_ink_type_by_res(v, res) != -1 &&
       res->vres <= escp2_max_vres(v) &&
       res->hres <= escp2_max_hres(v) &&
       res->vres >= escp2_min_vres(v) &&
@@ -1372,7 +1369,7 @@ verify_resolution(const stp_vars_t *v, const res_t *res)
        ((res->vres / nozzle_width) * nozzle_width) == res->vres))
     {
       int xdpi = res->hres;
-      int physical_xdpi = escp2_base_res(v, compute_virtual_resid(res));
+      int physical_xdpi = escp2_base_res_by_res(v, res);
       int horizontal_passes, oversample;
       if (physical_xdpi > xdpi)
 	physical_xdpi = xdpi;
@@ -1383,7 +1380,7 @@ verify_resolution(const stp_vars_t *v, const res_t *res)
       if (oversample < 1)
 	oversample = 1;
       if (((horizontal_passes * res->vertical_passes) <= STP_MAX_WEAVE) &&
-	  (! res->softweave || (nozzles > 1 && nozzles > oversample)))
+	  (res->command || (nozzles > 1 && nozzles > oversample)))
 	return 1;
     }
   return 0;
@@ -1395,64 +1392,38 @@ get_printer_resolution_bounds(const stp_vars_t *v,
 			      unsigned *min_x, unsigned *min_y)
 {
   int i = 0;
-  const res_t *const *res = escp2_reslist(v);
+  const resolution_list_t *resolutions = escp2_reslist(v);
   *max_x = 0;
   *max_y = 0;
   *min_x = 0;
   *min_y = 0;
-  while (res[i])
+  for (i = 0; i < resolutions->n_resolutions; i++)
     {
-      if (verify_resolution(v, res[i]))
+      res_t *res = &(resolutions->resolutions[i]);
+      if (verify_resolution(v, res))
 	{
-	  if (res[i]->printed_hres * res[i]->vertical_passes > *max_x)
-	    *max_x = res[i]->printed_hres * res[i]->vertical_passes;
-	  if (res[i]->printed_vres > *max_y)
-	    *max_y = res[i]->printed_vres;
+	  if (res->printed_hres * res->vertical_passes > *max_x)
+	    *max_x = res->printed_hres * res->vertical_passes;
+	  if (res->printed_vres > *max_y)
+	    *max_y = res->printed_vres;
 	  if (*min_x == 0 ||
-	      res[i]->printed_hres * res[i]->vertical_passes < *min_x)
-	    *min_x = res[i]->printed_hres * res[i]->vertical_passes;
-	  if (*min_y == 0 || res[i]->printed_vres < *min_y)
-	    *min_y = res[i]->printed_vres;
+	      res->printed_hres * res->vertical_passes < *min_x)
+	    *min_x = res->printed_hres * res->vertical_passes;
+	  if (*min_y == 0 || res->printed_vres < *min_y)
+	    *min_y = res->printed_vres;
 	}
-      i++;
     }
   stp_dprintf(STP_DBG_ESCP2, v,
 	      "Printer bounds: %d %d %d %d\n", *min_x, *min_y, *max_x, *max_y);
 }
 
 static int
-printer_supports_rollfeed(const stp_vars_t *v)
-{
-  int i;
-  const input_slot_list_t *slots = escp2_input_slots(v);
-  for (i = 0; i < slots->n_input_slots; i++)
-    {
-      if (slots->slots[i].is_roll_feed)
-	return 1;
-    }
-  return 0;
-}
-
-static int
-printer_supports_print_to_cd(const stp_vars_t *v)
-{
-  int i;
-  const input_slot_list_t *slots = escp2_input_slots(v);
-  for (i = 0; i < slots->n_input_slots; i++)
-    {
-      if (slots->slots[i].is_cd)
-	return 1;
-    }
-  return 0;
-}
-
-static int
 verify_papersize(const stp_vars_t *v, const stp_papersize_t *pt)
 {
   unsigned int height_limit, width_limit;
   unsigned int min_height_limit, min_width_limit;
   unsigned int envelope_landscape =
-    escp2_has_cap(v, MODEL_ENVELOPE_LANDSCAPE, MODEL_ENVELOPE_LANDSCAPE_YES);
+    stp_escp2_has_cap(v, MODEL_ENVELOPE_LANDSCAPE, MODEL_ENVELOPE_LANDSCAPE_YES);
   width_limit = escp2_max_paper_width(v);
   height_limit = escp2_max_paper_height(v);
   min_width_limit = escp2_min_paper_width(v);
@@ -1463,14 +1434,15 @@ verify_papersize(const stp_vars_t *v, const stp_papersize_t *pt)
       pt->width <= width_limit && pt->height <= height_limit &&
       (pt->height >= min_height_limit || pt->height == 0) &&
       (pt->width >= min_width_limit || pt->width == 0) &&
-      (pt->width == 0 || pt->height > 0 || printer_supports_rollfeed(v)))
+      (pt->width == 0 || pt->height > 0 ||
+       stp_escp2_printer_supports_rollfeed(v)))
     return 1;
   else
     return 0;
 }
 
 static int
-verify_inktype(const stp_vars_t *v, const escp2_inkname_t *inks)
+verify_inktype(const stp_vars_t *v, const inkname_t *inks)
 {
   if (inks->inkset == INKSET_EXTENDED)
     return 0;
@@ -1481,43 +1453,39 @@ verify_inktype(const stp_vars_t *v, const escp2_inkname_t *inks)
 static const char *
 get_default_inktype(const stp_vars_t *v)
 {
-  const inklist_t *ink_list = escp2_inklist(v);
-  const paper_t *paper_type = get_media_type(v);
+  const inklist_t *ink_list = stp_escp2_inklist(v);
+  const paper_t *paper_type;
   if (!ink_list)
     return NULL;
+  paper_type = stp_escp2_get_media_type(v, 0);
   if (!paper_type)
-    {
-      const paperlist_t *p = escp2_paperlist(v);
-      if (p)
-	paper_type = &(p->papers[0]);
-    }
+    paper_type = stp_escp2_get_default_media_type(v);
   if (paper_type && paper_type->preferred_ink_type)
     return paper_type->preferred_ink_type;
-  else if (escp2_has_cap(v, MODEL_FAST_360, MODEL_FAST_360_YES) &&
+  else if (stp_escp2_has_cap(v, MODEL_FAST_360, MODEL_FAST_360_YES) &&
 	   stp_check_string_parameter(v, "Resolution", STP_PARAMETER_ACTIVE))
     {
-      const res_t *res = escp2_find_resolution(v);
+      const res_t *res = stp_escp2_find_resolution(v);
       if (res)
 	{
-	  int resid = compute_printed_resid(res);
-	  if (res->vres == 360 && res->hres == escp2_base_res(v, resid))
+	  if (res->vres == 360 && res->hres == escp2_base_res(v))
 	    {
 	      int i;
 	      for (i = 0; i < ink_list->n_inks; i++)
-		if (strcmp(ink_list->inknames[i]->name, "CMYK") == 0)
-		  return ink_list->inknames[i]->name;
+		if (strcmp(ink_list->inknames[i].name, "CMYK") == 0)
+		  return ink_list->inknames[i].name;
 	    }
 	}
     }
-  return ink_list->inknames[0]->name;
+  return ink_list->inknames[0].name;
 }
 
 
-static const escp2_inkname_t *
+static const inkname_t *
 get_inktype(const stp_vars_t *v)
 {
   const char	*ink_type = stp_get_string_parameter(v, "InkType");
-  const inklist_t *ink_list = escp2_inklist(v);
+  const inklist_t *ink_list = stp_escp2_inklist(v);
   int i;
 
   if (!ink_type || strcmp(ink_type, "None") == 0 ||
@@ -1528,8 +1496,8 @@ get_inktype(const stp_vars_t *v)
     {
       for (i = 0; i < ink_list->n_inks; i++)
 	{
-	  if (strcmp(ink_type, ink_list->inknames[i]->name) == 0)
-	    return ink_list->inknames[i];
+	  if (strcmp(ink_type, ink_list->inknames[i].name) == 0)
+	    return &(ink_list->inknames[i]);
 	}
     }
   /*
@@ -1539,36 +1507,25 @@ get_inktype(const stp_vars_t *v)
   ink_type = get_default_inktype(v);
   for (i = 0; i < ink_list->n_inks; i++)
     {
-      if (strcmp(ink_type, ink_list->inknames[i]->name) == 0)
-	return ink_list->inknames[i];
+      if (strcmp(ink_type, ink_list->inknames[i].name) == 0)
+	return &(ink_list->inknames[i]);
     }
-  return NULL;
+  /*
+   * If even *that* doesn't work, try using the first ink type on the list.
+   */
+  return &(ink_list->inknames[0]);
 }
 
-static const paper_adjustment_t *
+static const stp_vars_t *
 get_media_adjustment(const stp_vars_t *v)
 {
-  const paper_t *pt = get_media_type(v);
-  const inklist_t *ink_list = escp2_inklist(v);
-  if (pt && ink_list && ink_list->paper_adjustments)
-    {
-      const paper_adjustment_list_t *adjlist =
-	stpi_escp2_get_paper_adjustment_list_named(ink_list->paper_adjustments);
-      if (adjlist)
-	{
-	  const char *paper_name = pt->name;
-	  int i;
-	  for (i = 0; i < adjlist->paper_count; i++)
-	    {
-	      if (strcmp(paper_name, adjlist->papers[i].name) == 0)
-		return &(adjlist->papers[i]);
-	    }
-	}
-    }
-  return NULL;
+  const paper_t *pt = stp_escp2_get_media_type(v, 0);
+  if (pt)
+    return pt->v;
+  else
+    return NULL;
 }
 
-
 /*
  * 'escp2_parameters()' - Return the parameter values for the given parameter.
  */
@@ -1582,27 +1539,40 @@ escp2_list_parameters(const stp_vars_t *v)
     stp_parameter_list_add_param(ret, &(the_parameters[i]));
   for (i = 0; i < float_parameter_count; i++)
     stp_parameter_list_add_param(ret, &(float_parameters[i].param));
+  for (i = 0; i < int_parameter_count; i++)
+    stp_parameter_list_add_param(ret, &(int_parameters[i].param));
   return ret;
 }
 
 static void
 set_density_parameter(const stp_vars_t *v,
 		      stp_parameter_t *description,
-		      int color)
+		      const char *name)
 {
+  const inkname_t *ink_name = get_inktype(v);
   description->is_active = 0;
-  if (stp_get_string_parameter(v, "PrintingMode") &&
+  if (ink_name && stp_get_string_parameter(v, "PrintingMode") &&
       strcmp(stp_get_string_parameter(v, "PrintingMode"), "BW") != 0)
     {
-      const escp2_inkname_t *ink_name = get_inktype(v);
-      if (ink_name &&
-	  ink_name->channel_set->channel_count > color &&
-	  ink_name->channel_set->channels[color])
+      int i, j;
+      for (i = 0; i < ink_name->channel_count; i++)
 	{
-	  description->is_active = 1;
-	  description->bounds.dbl.lower = 0;
-	  description->bounds.dbl.upper = 2.0;
-	  description->deflt.dbl = 1.0;
+	  ink_channel_t *ich = &(ink_name->channels[i]);
+	  if (ich)
+	    {
+	      for (j = 0; j < ich->n_subchannels; j++)
+		{
+		  physical_subchannel_t *sch = &(ich->subchannels[j]);
+		  if (sch && sch->channel_density &&
+		      !strcmp(name, sch->channel_density))
+		    {
+		      description->is_active = 1;
+		      description->bounds.dbl.lower = 0;
+		      description->bounds.dbl.upper = 2.0;
+		      description->deflt.dbl = 1.0;
+		    }
+		}
+	    }
 	}
     }
 }
@@ -1610,28 +1580,24 @@ set_density_parameter(const stp_vars_t *v,
 static void
 set_hue_map_parameter(const stp_vars_t *v,
 		      stp_parameter_t *description,
-		      int color)
+		      const char *name)
 {
+  const inkname_t *ink_name = get_inktype(v);
   description->is_active = 0;
   description->deflt.curve = hue_curve_bounds;
   description->bounds.curve = stp_curve_create_copy(hue_curve_bounds);
-  if (stp_get_string_parameter(v, "PrintingMode") &&
+  if (ink_name && stp_get_string_parameter(v, "PrintingMode") &&
       strcmp(stp_get_string_parameter(v, "PrintingMode"), "BW") != 0)
     {
-      const escp2_inkname_t *ink_name = get_inktype(v);
-      if (ink_name &&
-	  ink_name->channel_set->channel_count > color &&
-	  ink_name->channel_set->channels[color] &&
-	  ink_name->channel_set->channels[color]->hue_curve &&
-	  ink_name->channel_set->channels[color]->hue_curve->curve)
-	{
-	  if (!ink_name->channel_set->channels[color]->hue_curve->curve_impl)
-	    ink_name->channel_set->channels[color]->hue_curve->curve_impl =
-	      stp_curve_create_from_string
-	      (ink_name->channel_set->channels[color]->hue_curve->curve);
-	  description->deflt.curve =
-	    ink_name->channel_set->channels[color]->hue_curve->curve_impl;
-	  description->is_active = 1;
+      int i;
+      for (i = 0; i < ink_name->channel_count; i++)
+	{
+	  ink_channel_t *ich = &(ink_name->channels[i]);
+	  if (ich && ich->hue_curve && !strcmp(name, ich->hue_curve_name))
+	    {
+	      description->deflt.curve = ich->hue_curve;
+	      description->is_active = 1;
+	    }
 	}
     }
 }
@@ -1642,14 +1608,14 @@ fill_value_parameters(const stp_vars_t *v,
 		      int color)
 {
   const shade_t *shades = escp2_shades(v, color);
-  const escp2_inkname_t *ink_name = get_inktype(v);
+  const inkname_t *ink_name = get_inktype(v);
   description->is_active = 1;
   description->bounds.dbl.lower = 0;
   description->bounds.dbl.upper = 1.0;
   description->deflt.dbl = 1.0;
   if (shades && ink_name)
     {
-      const ink_channel_t *channel = ink_name->channel_set->channels[color];
+      const ink_channel_t *channel = &(ink_name->channels[color]);
       int i;
       for (i = 0; i < channel->n_subchannels; i++)
 	{
@@ -1673,11 +1639,10 @@ set_color_value_parameter(const stp_vars_t *v,
   if (stp_get_string_parameter(v, "PrintingMode") &&
       strcmp(stp_get_string_parameter(v, "PrintingMode"), "BW") != 0)
     {
-      const escp2_inkname_t *ink_name = get_inktype(v);
+      const inkname_t *ink_name = get_inktype(v);
       if (ink_name &&
-	  ink_name->channel_set->channel_count == 4 &&
-	  ink_name->channel_set->channels[color] &&
-	  ink_name->channel_set->channels[color]->n_subchannels == 2)
+	  ink_name->channel_count == 4 &&
+	  ink_name->channels[color].n_subchannels == 2)
 	fill_value_parameters(v, description, color);
     }
 }
@@ -1687,10 +1652,10 @@ set_gray_value_parameter(const stp_vars_t *v,
 			 stp_parameter_t *description,
 			 int expected_channels)
 {
-  const escp2_inkname_t *ink_name = get_inktype(v);
+  const inkname_t *ink_name = get_inktype(v);
   description->is_active = 0;
-  if (ink_name && ink_name->channel_set->channels[STP_ECOLOR_K] &&
-      (ink_name->channel_set->channels[STP_ECOLOR_K]->n_subchannels ==
+  if (ink_name && 
+      (ink_name->channels[STP_ECOLOR_K].n_subchannels ==
        expected_channels))
     fill_value_parameters(v, description, STP_ECOLOR_K);
   else
@@ -1699,15 +1664,15 @@ set_gray_value_parameter(const stp_vars_t *v,
 
 static void
 fill_transition_parameters(const stp_vars_t *v,
-			       stp_parameter_t *description,
-			       int color)
+			   stp_parameter_t *description,
+			   int color)
 {
-  const paper_adjustment_t *paper_adj = get_media_adjustment(v);
+  const stp_vars_t *paper_adj = get_media_adjustment(v);
   description->is_active = 1;
   description->bounds.dbl.lower = 0;
   description->bounds.dbl.upper = 1.0;
-  if (paper_adj)
-    description->deflt.dbl = paper_adj->subchannel_cutoff;
+  if (paper_adj && stp_check_float_parameter(paper_adj, "SubchannelCutoff", STP_PARAMETER_ACTIVE))
+    description->deflt.dbl = stp_get_float_parameter(paper_adj, "SubchannelCutoff");
   else
     description->deflt.dbl = 1.0;
 }
@@ -1721,11 +1686,10 @@ set_color_transition_parameter(const stp_vars_t *v,
   if (stp_get_string_parameter(v, "PrintingMode") &&
       strcmp(stp_get_string_parameter(v, "PrintingMode"), "BW") != 0)
     {
-      const escp2_inkname_t *ink_name = get_inktype(v);
+      const inkname_t *ink_name = get_inktype(v);
       if (ink_name &&
-	  ink_name->channel_set->channel_count == 4 &&
-	  ink_name->channel_set->channels[color] &&
-	  ink_name->channel_set->channels[color]->n_subchannels == 2)
+	  ink_name->channel_count == 4 &&
+	  ink_name->channels[color].n_subchannels == 2)
 	fill_transition_parameters(v, description, color);
     }
 }
@@ -1735,10 +1699,10 @@ set_gray_transition_parameter(const stp_vars_t *v,
 			      stp_parameter_t *description,
 			      int expected_channels)
 {
-  const escp2_inkname_t *ink_name = get_inktype(v);
+  const inkname_t *ink_name = get_inktype(v);
   description->is_active = 0;
-  if (ink_name && ink_name->channel_set->channels[STP_ECOLOR_K] &&
-      (ink_name->channel_set->channels[STP_ECOLOR_K]->n_subchannels ==
+  if (ink_name && 
+      (ink_name->channels[STP_ECOLOR_K].n_subchannels ==
        expected_channels))
     fill_transition_parameters(v, description, STP_ECOLOR_K);
   else
@@ -1763,11 +1727,10 @@ set_color_scale_parameter(const stp_vars_t *v,
   if (stp_get_string_parameter(v, "PrintingMode") &&
       strcmp(stp_get_string_parameter(v, "PrintingMode"), "BW") != 0)
     {
-      const escp2_inkname_t *ink_name = get_inktype(v);
+      const inkname_t *ink_name = get_inktype(v);
       if (ink_name &&
-	  ink_name->channel_set->channel_count == 4 &&
-	  ink_name->channel_set->channels[color] &&
-	  ink_name->channel_set->channels[color]->n_subchannels == 2)
+	  ink_name->channel_count == 4 &&
+	  ink_name->channels[color].n_subchannels == 2)
 	fill_scale_parameters(description);
     }
 }
@@ -1777,10 +1740,10 @@ set_gray_scale_parameter(const stp_vars_t *v,
 			      stp_parameter_t *description,
 			      int expected_channels)
 {
-  const escp2_inkname_t *ink_name = get_inktype(v);
+  const inkname_t *ink_name = get_inktype(v);
   description->is_active = 0;
-  if (ink_name && ink_name->channel_set->channels[STP_ECOLOR_K] &&
-      (ink_name->channel_set->channels[STP_ECOLOR_K]->n_subchannels ==
+  if (ink_name &&
+      (ink_name->channels[STP_ECOLOR_K].n_subchannels ==
        expected_channels))
     fill_scale_parameters(description);
   else
@@ -1788,31 +1751,27 @@ set_gray_scale_parameter(const stp_vars_t *v,
 }
 
 static const res_t *
-find_default_resolution(const stp_vars_t *v, const quality_t *q,
-			int strict)
+find_default_resolution(const stp_vars_t *v, const quality_t *q, int strict)
 {
-  const res_t *const *res = escp2_reslist(v);
+  const resolution_list_t *resolutions = escp2_reslist(v);
   int i = 0;
   stp_dprintf(STP_DBG_ESCP2, v, "Quality %s: min %d %d max %d %d, des %d %d\n",
 	      q->name, q->min_hres, q->min_vres, q->max_hres, q->max_vres,
 	      q->desired_hres, q->desired_vres);
   if (q->desired_hres < 0 || q->desired_vres < 0)
     {
-      while (res[i])
-	i++;
-      i--;
-      while (i >= 0)
+      for (i = resolutions->n_resolutions - 1; i >= 0; i--)
 	{
+	  const res_t *res = &(resolutions->resolutions[i]);
 	  stp_dprintf(STP_DBG_ESCP2, v, "  Checking resolution %s %d...\n",
-		      res[i]->name, i);
-	  if ((q->max_hres <= 0 || res[i]->printed_hres <= q->max_hres) &&
-	      (q->max_vres <= 0 || res[i]->printed_vres <= q->max_vres) &&
-	      q->min_hres <= res[i]->printed_hres &&
-	      q->min_vres <= res[i]->printed_vres &&
-	      verify_resolution(v, res[i]) &&
-	      verify_resolution_by_paper_type(v, res[i]))
-	    return res[i];
-	  i--;
+		      res->name, i);
+	  if ((q->max_hres <= 0 || res->printed_hres <= q->max_hres) &&
+	      (q->max_vres <= 0 || res->printed_vres <= q->max_vres) &&
+	      q->min_hres <= res->printed_hres &&
+	      q->min_vres <= res->printed_vres &&
+	      verify_resolution(v, res) &&
+	      verify_resolution_by_paper_type(v, res))
+	    return res;
 	}
     }
   if (!strict)
@@ -1849,69 +1808,65 @@ find_default_resolution(const stp_vars_t *v, const quality_t *q,
 		      desired_vres, min_y);
 	  desired_vres = min_y;
 	}
-      i = 0;
-      while (res[i])
+      for (i = 0; i < resolutions->n_resolutions; i++)
 	{
-	  if (verify_resolution(v, res[i]) &&
-	      res[i]->printed_vres == desired_vres &&
-	      res[i]->printed_hres == desired_hres)
+	  res_t *res = &(resolutions->resolutions[i]);
+	  if (verify_resolution(v, res) &&
+	      res->printed_vres == desired_vres &&
+	      res->printed_hres == desired_hres)
 	    {
 	      stp_dprintf(STP_DBG_ESCP2, v,
 			  "  Found desired resolution w/o oversample: %s %d: %d * %d, %d\n",
-			  res[i]->name, i, res[i]->printed_hres,
-			  res[i]->vertical_passes, res[i]->printed_vres);
-	      return res[i];
+			  res->name, i, res->printed_hres,
+			  res->vertical_passes, res->printed_vres);
+	      return res;
 	    }
-	  i++;
 	}
-      i = 0;
-      while (res[i])
+      for (i = 0; i < resolutions->n_resolutions; i++)
 	{
-	  if (verify_resolution(v, res[i]) &&
-	      res[i]->printed_vres == desired_vres &&
-	      res[i]->printed_hres * res[i]->vertical_passes == desired_hres)
+	  res_t *res = &(resolutions->resolutions[i]);
+	  if (verify_resolution(v, res) &&
+	      res->printed_vres == desired_vres &&
+	      res->printed_hres * res->vertical_passes == desired_hres)
 	    {
 	      stp_dprintf(STP_DBG_ESCP2, v,
 			  "  Found desired resolution: %s %d: %d * %d, %d\n",
-			  res[i]->name, i, res[i]->printed_hres,
-			  res[i]->vertical_passes, res[i]->printed_vres);
-	      return res[i];
+			  res->name, i, res->printed_hres,
+			  res->vertical_passes, res->printed_vres);
+	      return res;
 	    }
-	  i++;
 	}
-      i = 0;
-      while (res[i])
+      for (i = 0; i < resolutions->n_resolutions; i++)
 	{
-	  if (verify_resolution(v, res[i]) &&
-	      (q->min_vres == 0 || res[i]->printed_vres >= q->min_vres) &&
-	      (q->max_vres == 0 || res[i]->printed_vres <= q->max_vres) &&
+	  res_t *res = &(resolutions->resolutions[i]);
+	  if (verify_resolution(v, res) &&
+	      (q->min_vres == 0 || res->printed_vres >= q->min_vres) &&
+	      (q->max_vres == 0 || res->printed_vres <= q->max_vres) &&
 	      (q->min_hres == 0 ||
-	       res[i]->printed_hres * res[i]->vertical_passes >=q->min_hres) &&
+	       res->printed_hres * res->vertical_passes >=q->min_hres) &&
 	      (q->max_hres == 0 ||
-	       res[i]->printed_hres * res[i]->vertical_passes <= q->max_hres))
+	       res->printed_hres * res->vertical_passes <= q->max_hres))
 	    {
 	      stp_dprintf(STP_DBG_ESCP2, v,
 			  "  Found acceptable resolution: %s %d: %d * %d, %d\n",
-			  res[i]->name, i, res[i]->printed_hres,
-			  res[i]->vertical_passes, res[i]->printed_vres);
-	      return res[i];
+			  res->name, i, res->printed_hres,
+			  res->vertical_passes, res->printed_vres);
+	      return res;
 	    }
-	  i++;
 	}
     }
 #if 0
   if (!strict)			/* Try again to find a match */
     {
-      i = 0;
-      while (res[i])
+      for (i = 0; i < resolutions->n_resolutions; i++)
 	{
-	  if (verify_resolution(v, res[i]) &&
-	      res[i]->printed_vres >= desired_vres &&
-	      res[i]->printed_hres * res[i]->vertical_passes >= desired_hres &&
-	      res[i]->printed_vres <= 2 * desired_vres &&
-	      res[i]->printed_hres * res[i]->vertical_passes <= 2 * desired_hres)
-	    return res[i];
-	  i++;
+	  res_t *res = &(resolutions->resolutions[i]);
+	  if (verify_resolution(v, res) &&
+	      res->printed_vres >= desired_vres &&
+	      res->printed_hres * res->vertical_passes >= desired_hres &&
+	      res->printed_vres <= 2 * desired_vres &&
+	      res->printed_hres * res->vertical_passes <= 2 * desired_hres)
+	    return res;
 	}
     }
 #endif
@@ -1977,6 +1932,16 @@ escp2_parameters(const stp_vars_t *v, const char *name,
 	description->bounds.dbl.lower = float_parameters[i].min;
 	break;
       }
+  for (i = 0; i < int_parameter_count; i++)
+    if (strcmp(name, int_parameters[i].param.name) == 0)
+      {
+	stp_fill_parameter_settings(description,
+				     &(int_parameters[i].param));
+	description->deflt.integer = int_parameters[i].defval;
+	description->bounds.integer.upper = int_parameters[i].max;
+	description->bounds.integer.lower = int_parameters[i].min;
+	break;
+      }
 
   for (i = 0; i < the_parameter_count; i++)
     if (strcmp(name, the_parameters[i].name) == 0)
@@ -2004,7 +1969,7 @@ escp2_parameters(const stp_vars_t *v, const char *name,
   else if (strcmp(name, "PageSize") == 0)
     {
       int papersizes = stp_known_papersizes();
-      const input_slot_t *slot = get_input_slot(v);
+      const input_slot_t *slot = stp_escp2_get_input_slot(v);
       description->bounds.str = stp_string_list_create();
       if (slot && slot->is_cd)
 	{
@@ -2030,9 +1995,9 @@ escp2_parameters(const stp_vars_t *v, const char *name,
     }
   else if (strcmp(name, "CDInnerRadius") == 0 )
     {
-      const input_slot_t *slot = get_input_slot(v);
+      const input_slot_t *slot = stp_escp2_get_input_slot(v);
       description->bounds.str = stp_string_list_create();
-      if (printer_supports_print_to_cd(v) &&
+      if (stp_escp2_printer_supports_print_to_cd(v) &&
 	  (!slot || slot->is_cd) &&
 	  (!stp_get_string_parameter(v, "PageSize") ||
 	   strcmp(stp_get_string_parameter(v, "PageSize"), "CDCustom") != 0))
@@ -2049,11 +2014,11 @@ escp2_parameters(const stp_vars_t *v, const char *name,
     }
   else if (strcmp(name, "CDInnerDiameter") == 0 )
     {
-      const input_slot_t *slot = get_input_slot(v);
+      const input_slot_t *slot = stp_escp2_get_input_slot(v);
       description->bounds.dimension.lower = 16 * 10 * 72 / 254;
       description->bounds.dimension.upper = 43 * 10 * 72 / 254;
       description->deflt.dimension = 43 * 10 * 72 / 254;
-      if (printer_supports_print_to_cd(v) &&
+      if (stp_escp2_printer_supports_print_to_cd(v) &&
 	  (!slot || slot->is_cd) &&
 	  (!stp_get_string_parameter(v, "PageSize") ||
 	   strcmp(stp_get_string_parameter(v, "PageSize"), "CDCustom") == 0))
@@ -2063,11 +2028,11 @@ escp2_parameters(const stp_vars_t *v, const char *name,
     }
   else if (strcmp(name, "CDOuterDiameter") == 0 )
     {
-      const input_slot_t *slot = get_input_slot(v);
+      const input_slot_t *slot = stp_escp2_get_input_slot(v);
       description->bounds.dimension.lower = 65 * 10 * 72 / 254;
       description->bounds.dimension.upper = 120 * 10 * 72 / 254;
       description->deflt.dimension = 329;
-      if (printer_supports_print_to_cd(v) &&
+      if (stp_escp2_printer_supports_print_to_cd(v) &&
 	  (!slot || slot->is_cd) &&
 	  (!stp_get_string_parameter(v, "PageSize") ||
 	   strcmp(stp_get_string_parameter(v, "PageSize"), "CDCustom") == 0))
@@ -2078,11 +2043,11 @@ escp2_parameters(const stp_vars_t *v, const char *name,
   else if (strcmp(name, "CDXAdjustment") == 0 ||
 	   strcmp(name, "CDYAdjustment") == 0)
     {
-      const input_slot_t *slot = get_input_slot(v);
+      const input_slot_t *slot = stp_escp2_get_input_slot(v);
       description->bounds.dimension.lower = -15;
       description->bounds.dimension.upper = 15;
       description->deflt.dimension = 0;
-      if (printer_supports_print_to_cd(v) && (!slot || slot->is_cd))
+      if (stp_escp2_printer_supports_print_to_cd(v) && (!slot || slot->is_cd))
 	description->is_active = 1;
       else
 	description->is_active = 0;
@@ -2110,27 +2075,26 @@ escp2_parameters(const stp_vars_t *v, const char *name,
     }
   else if (strcmp(name, "Resolution") == 0)
     {
-      const res_t *const *res = escp2_reslist(v);
+      const resolution_list_t *resolutions = escp2_reslist(v);
       description->bounds.str = stp_string_list_create();
       stp_string_list_add_string(description->bounds.str, "None",
 				 _("Default"));
       description->deflt.str = "None";
-      i = 0;
-      while (res[i])
+      for (i = 0; i < resolutions->n_resolutions; i++)
 	{
-	  if (verify_resolution(v, res[i]))
+	  res_t *res = &(resolutions->resolutions[i]);
+	  if (verify_resolution(v, res))
 	    stp_string_list_add_string(description->bounds.str,
-				       res[i]->name, gettext(res[i]->text));
-	  i++;
+				       res->name, gettext(res->text));
 	}
     }
   else if (strcmp(name, "InkType") == 0)
     {
-      const inklist_t *inks = escp2_inklist(v);
+      const inklist_t *inks = stp_escp2_inklist(v);
       int ninktypes = inks->n_inks;
       int verified_inktypes = 0;
       for (i = 0; i < ninktypes; i++)
-	if (verify_inktype(v, inks->inknames[i]))
+	if (verify_inktype(v, &(inks->inknames[i])))
 	  verified_inktypes++;
       description->bounds.str = stp_string_list_create();
       if (verified_inktypes > 1)
@@ -2138,10 +2102,10 @@ escp2_parameters(const stp_vars_t *v, const char *name,
 	  stp_string_list_add_string(description->bounds.str, "None",
 				     _("Standard"));
 	  for (i = 0; i < ninktypes; i++)
-	    if (verify_inktype(v, inks->inknames[i]))
+	    if (verify_inktype(v, &(inks->inknames[i])))
 	      stp_string_list_add_string(description->bounds.str,
-					 inks->inknames[i]->name,
-					 gettext(inks->inknames[i]->text));
+					 inks->inknames[i].name,
+					 gettext(inks->inknames[i].text));
 	  description->deflt.str = "None";
 	}
       else
@@ -2158,9 +2122,9 @@ escp2_parameters(const stp_vars_t *v, const char *name,
 	  for (i = 0; i < ninklists; i++)
 	    {
 	      stp_string_list_add_string(description->bounds.str,
-					 inks->inklists[i]->name,
-					 gettext(inks->inklists[i]->text));
-	      if (strcmp(inks->inklists[i]->name, "None") == 0)
+					 inks->inklists[i].name,
+					 gettext(inks->inklists[i].text));
+	      if (strcmp(inks->inklists[i].name, "None") == 0)
 		has_default_choice = 1;
 	    }
 	  description->deflt.str =
@@ -2171,37 +2135,43 @@ escp2_parameters(const stp_vars_t *v, const char *name,
     }
   else if (strcmp(name, "MediaType") == 0)
     {
-      const paperlist_t *p = escp2_paperlist(v);
-      int nmediatypes = p->paper_count;
-      description->bounds.str = stp_string_list_create();
-      if (nmediatypes)
+      const stp_string_list_t *p = escp2_paperlist(v);
+      description->is_active = 0;
+      if (p)
 	{
-	  for (i = 0; i < nmediatypes; i++)
-	    stp_string_list_add_string(description->bounds.str,
-				       p->papers[i].name,
-				       gettext(p->papers[i].text));
-	  description->deflt.str =
-	    stp_string_list_param(description->bounds.str, 0)->name;
+	  int nmediatypes = stp_string_list_count(p);
+	  description->bounds.str = stp_string_list_create();
+	  if (nmediatypes)
+	    {
+	      description->is_active = 1;
+	      for (i = 0; i < nmediatypes; i++)
+		stp_string_list_add_string(description->bounds.str,
+					   stp_string_list_param(p, i)->name,
+					   gettext(stp_string_list_param(p, i)->text));
+	      description->deflt.str =
+		stp_string_list_param(description->bounds.str, 0)->name;
+	    }
 	}
-      else
-	description->is_active = 0;
     }
   else if (strcmp(name, "InputSlot") == 0)
     {
-      const input_slot_list_t *slots = escp2_input_slots(v);
-      int ninputslots = slots->n_input_slots;
-      description->bounds.str = stp_string_list_create();
-      if (ninputslots)
+      const stp_string_list_t *p = escp2_slotlist(v);
+      description->is_active = 0;
+      if (p)
 	{
-	  for (i = 0; i < ninputslots; i++)
-	    stp_string_list_add_string(description->bounds.str,
-				       slots->slots[i].name,
-				       gettext(slots->slots[i].text));
-	  description->deflt.str =
-	    stp_string_list_param(description->bounds.str, 0)->name;
+	  int nslots = stp_string_list_count(p);
+	  description->bounds.str = stp_string_list_create();
+	  if (nslots)
+	    {
+	      description->is_active = 1;
+	      for (i = 0; i < nslots; i++)
+		stp_string_list_add_string(description->bounds.str,
+					   stp_string_list_param(p, i)->name,
+					   gettext(stp_string_list_param(p, i)->text));
+	      description->deflt.str =
+		stp_string_list_param(description->bounds.str, 0)->name;
+	    }
 	}
-      else
-	description->is_active = 0;
     }
   else if (strcmp(name, "PrintingDirection") == 0)
     {
@@ -2218,12 +2188,12 @@ escp2_parameters(const stp_vars_t *v, const char *name,
   else if (strcmp(name, "Weave") == 0)
     {
       description->bounds.str = stp_string_list_create();
-      if (escp2_has_cap(v, MODEL_COMMAND, MODEL_COMMAND_PRO))
+      if (stp_escp2_has_cap(v, MODEL_COMMAND, MODEL_COMMAND_PRO))
 	{
-	  const res_t *res = escp2_find_resolution(v);
+	  const res_t *res = stp_escp2_find_resolution(v);
 	  const printer_weave_list_t *printer_weaves = escp2_printer_weaves(v);
 	  int nprinter_weaves = 0;
-	  if (use_printer_weave(v) && (!res || res->printer_weave))
+	  if (printer_weaves && use_printer_weave(v) && (!res || res->command))
 	    nprinter_weaves = printer_weaves->n_printer_weaves;
 	  if (nprinter_weaves)
 	    {
@@ -2263,7 +2233,7 @@ escp2_parameters(const stp_vars_t *v, const char *name,
     }
   else if (strcmp(name, "FullBleed") == 0)
     {
-      const input_slot_t *slot = get_input_slot(v);
+      const input_slot_t *slot = stp_escp2_get_input_slot(v);
       if (slot && slot->is_cd)
 	description->is_active = 0;
       else if (supports_borderless(v))
@@ -2271,44 +2241,55 @@ escp2_parameters(const stp_vars_t *v, const char *name,
       else
 	description->is_active = 0;
     }
-  else if (strcmp(name, "AdjustDotsize") == 0)
-    {
-      description->deflt.boolean = 0;
-    }
-  else if (strcmp(name, "CyanDensity") == 0)
-    set_density_parameter(v, description, STP_ECOLOR_C);
-  else if (strcmp(name, "MagentaDensity") == 0)
-    set_density_parameter(v, description, STP_ECOLOR_M);
-  else if (strcmp(name, "YellowDensity") == 0)
-    set_density_parameter(v, description, STP_ECOLOR_Y);
-  else if (strcmp(name, "BlackDensity") == 0)
-    set_density_parameter(v, description, STP_ECOLOR_K);
-  else if (strcmp(name, "RedDensity") == 0)
-    set_density_parameter(v, description, XCOLOR_R);
-  else if (strcmp(name, "BlueDensity") == 0)
-    set_density_parameter(v, description, XCOLOR_B);
-  else if (strcmp(name, "CyanHueCurve") == 0)
-    set_hue_map_parameter(v, description, STP_ECOLOR_C);
-  else if (strcmp(name, "MagentaHueCurve") == 0)
-    set_hue_map_parameter(v, description, STP_ECOLOR_M);
-  else if (strcmp(name, "YellowHueCurve") == 0)
-    set_hue_map_parameter(v, description, STP_ECOLOR_Y);
-  else if (strcmp(name, "RedHueCurve") == 0)
-    set_hue_map_parameter(v, description, XCOLOR_R);
-  else if (strcmp(name, "BlueHueCurve") == 0)
-    set_hue_map_parameter(v, description, XCOLOR_B);
+  else if (strcmp(name, "Duplex") == 0)
+    {
+      if (stp_escp2_printer_supports_duplex(v))
+	{
+	  const input_slot_t *slot = stp_escp2_get_input_slot(v);
+	  if (slot && !slot->duplex)
+	    description->is_active = 0;
+	  else
+	    {
+	      description->bounds.str = stp_string_list_create();
+	      stp_string_list_add_string
+		(description->bounds.str, "None", _("Off"));
+	      stp_string_list_add_string
+		(description->bounds.str, "DuplexNoTumble", _("Long Edge (Standard)"));
+	      stp_string_list_add_string
+		(description->bounds.str, "DuplexTumble", _("Short Edge(Flip)"));
+	      description->deflt.str = "None";
+	    }
+	}
+      else
+	description->is_active = 0;
+    }
+  else if (strcmp(name, "CyanDensity") == 0 ||
+	   strcmp(name, "MagentaDensity") == 0 ||
+	   strcmp(name, "YellowDensity") == 0 ||
+	   strcmp(name, "BlackDensity") == 0 ||
+	   strcmp(name, "RedDensity") == 0 ||
+	   strcmp(name, "BlueDensity") == 0 ||
+	   strcmp(name, "OrangeDensity") == 0)
+    set_density_parameter(v, description, name);
+  else if (strcmp(name, "CyanHueCurve") == 0 ||
+	   strcmp(name, "MagentaHueCurve") == 0 ||
+	   strcmp(name, "YellowHueCurve") == 0 ||
+	   strcmp(name, "RedHueCurve") == 0 ||
+	   strcmp(name, "BlueHueCurve") == 0 ||
+	   strcmp(name, "OrangeHueCurve") == 0)
+    set_hue_map_parameter(v, description, name);
   else if (strcmp(name, "UseGloss") == 0)
     {
-      const escp2_inkname_t *ink_name = get_inktype(v);
-      if (ink_name && ink_name->channel_set->aux_channel_count > 0)
+      const inkname_t *ink_name = get_inktype(v);
+      if (ink_name && ink_name->aux_channel_count > 0)
 	description->is_active = 1;
       else
 	description->is_active = 0;
     }
   else if (strcmp(name, "GlossLimit") == 0)
     {
-      const escp2_inkname_t *ink_name = get_inktype(v);
-      if (ink_name && ink_name->channel_set->aux_channel_count > 0)
+      const inkname_t *ink_name = get_inktype(v);
+      if (ink_name && ink_name->aux_channel_count > 0)
 	description->is_active = 1;
       else
 	description->is_active = 0;
@@ -2317,16 +2298,12 @@ escp2_parameters(const stp_vars_t *v, const char *name,
 	   strcmp(name, "DropSize2") == 0 ||
 	   strcmp(name, "DropSize3") == 0)
     {
-      if (escp2_has_cap(v, MODEL_VARIABLE_DOT, MODEL_VARIABLE_YES))
+      if (stp_escp2_has_cap(v, MODEL_VARIABLE_DOT, MODEL_VARIABLE_YES))
 	{
-	  int resid = compute_resid(escp2_find_resolution(v));
-	  const escp2_dropsize_t *drops = escp2_dropsizes(v, resid);
-	  if (strcmp(name, "DropSize1") == 0 && drops->numdropsizes >= 1)
-	    description->deflt.dbl = drops->dropsizes[0];
-	  else if (strcmp(name, "DropSize2") == 0 && drops->numdropsizes >= 2)
-	    description->deflt.dbl = drops->dropsizes[1];
-	  else if (strcmp(name, "DropSize3") == 0 && drops->numdropsizes >= 3)
-	    description->deflt.dbl = drops->dropsizes[2];
+	  const res_t *res = stp_escp2_find_resolution(v);
+	  if (res && res->v &&
+	      stp_check_float_parameter(v, name, STP_PARAMETER_ACTIVE))
+	    description->deflt.dbl = stp_get_float_parameter(v, name);
 	  description->is_active = 1;
 	}
       else
@@ -2336,20 +2313,15 @@ escp2_parameters(const stp_vars_t *v, const char *name,
 	   strcmp(name, "GCRLower") == 0 ||
 	   strcmp(name, "GCRUpper") == 0)
     {
-      const paper_adjustment_t *paper_adj = get_media_adjustment(v);
+      const stp_vars_t *paper_adj = get_media_adjustment(v);
       if (paper_adj &&
 	  stp_get_string_parameter(v, "PrintingMode") &&
 	  strcmp(stp_get_string_parameter(v, "PrintingMode"), "BW") != 0)
 	{
-	  if (paper_adj)
-	    {
-	      if (strcmp(name, "BlackTrans") == 0)
-		description->deflt.dbl = paper_adj->k_transition;
-	      else if (strcmp(name, "GCRUpper") == 0)
-		description->deflt.dbl = paper_adj->k_upper;
-	      else if (strcmp(name, "GCRLower") == 0)
-		description->deflt.dbl = paper_adj->k_lower;
-	    }
+	  if (paper_adj && stp_check_float_parameter(paper_adj, name, STP_PARAMETER_ACTIVE))
+	    description->deflt.dbl = stp_get_float_parameter(paper_adj, name);
+	  else
+	    description->p_type = STP_PARAMETER_TYPE_INVALID;
 	}
       else
 	description->p_type = STP_PARAMETER_TYPE_INVALID;
@@ -2369,20 +2341,20 @@ escp2_parameters(const stp_vars_t *v, const char *name,
     set_color_value_parameter(v, description, STP_ECOLOR_M);
   else if (strcmp(name, "DarkYellowValue") == 0)
     set_color_value_parameter(v, description, STP_ECOLOR_Y);
-  else if (strcmp(name, "GrayTransition") == 0)
+  else if (strcmp(name, "GrayTrans") == 0)
     set_gray_transition_parameter(v, description, 2);
-  else if (strcmp(name, "DarkGrayTransition") == 0 ||
-	   strcmp(name, "LightGrayTransition") == 0)
+  else if (strcmp(name, "DarkGrayTrans") == 0 ||
+	   strcmp(name, "LightGrayTrans") == 0)
     set_gray_transition_parameter(v, description, 3);
-  else if (strcmp(name, "Gray1Transition") == 0 ||
-	   strcmp(name, "Gray2Transition") == 0 ||
-	   strcmp(name, "Gray3Transition") == 0)
+  else if (strcmp(name, "Gray1Trans") == 0 ||
+	   strcmp(name, "Gray2Trans") == 0 ||
+	   strcmp(name, "Gray3Trans") == 0)
     set_gray_transition_parameter(v, description, 4);
-  else if (strcmp(name, "LightCyanTransition") == 0)
+  else if (strcmp(name, "LightCyanTrans") == 0)
     set_color_transition_parameter(v, description, STP_ECOLOR_C);
-  else if (strcmp(name, "LightMagentaTransition") == 0)
+  else if (strcmp(name, "LightMagentaTrans") == 0)
     set_color_transition_parameter(v, description, STP_ECOLOR_M);
-  else if (strcmp(name, "DarkYellowTransition") == 0)
+  else if (strcmp(name, "DarkYellowTrans") == 0)
     set_color_transition_parameter(v, description, STP_ECOLOR_Y);
   else if (strcmp(name, "GrayScale") == 0)
     set_gray_scale_parameter(v, description, 2);
@@ -2410,7 +2382,7 @@ escp2_parameters(const stp_vars_t *v, const char *name,
   else if (strcmp(name, "SupportsInkChange") == 0)
     {
       description->deflt.integer =
-	escp2_has_cap(v, MODEL_SUPPORTS_INK_CHANGE,
+	stp_escp2_has_cap(v, MODEL_SUPPORTS_INK_CHANGE,
 		      MODEL_SUPPORTS_INK_CHANGE_YES);
     }
   else if (strcmp(name, "AlternateAlignmentPasses") == 0)
@@ -2427,27 +2399,24 @@ escp2_parameters(const stp_vars_t *v, const char *name,
     }
   else if (strcmp(name, "ChannelNames") == 0)
     {
-      const channel_name_t *channel_names = escp2_channel_names(v);
-      description->bounds.str = stp_string_list_create();
-      for (i = 0; i < channel_names->count; i++)
-	stp_string_list_add_string
-	  (description->bounds.str,
-	   channel_names->names[i], gettext(channel_names->names[i]));
-      description->deflt.str =
-	stp_string_list_param(description->bounds.str, 0)->name;
+      const stp_string_list_t *channel_names = escp2_channel_names(v);
+      if (channel_names)
+	{
+	  description->bounds.str = stp_string_list_create_copy(channel_names);
+	  description->deflt.str =
+	    stp_string_list_param(description->bounds.str, 0)->name;
+	}
     }
   else if (strcmp(name, "SupportsPacketMode") == 0)
     {
       description->deflt.boolean =
-	escp2_has_cap(v, MODEL_PACKET_MODE, MODEL_PACKET_MODE_YES);
+	stp_escp2_has_cap(v, MODEL_PACKET_MODE, MODEL_PACKET_MODE_YES);
     }
   else if (strcmp(name, "PrintingMode") == 0)
     {
-      const escp2_inkname_t *ink_name = get_inktype(v);
       description->bounds.str = stp_string_list_create();
-      if (!ink_name || ink_name->inkset != INKSET_QUADTONE)
-	stp_string_list_add_string
-	  (description->bounds.str, "Color", _("Color"));
+      stp_string_list_add_string
+	(description->bounds.str, "Color", _("Color"));
       stp_string_list_add_string
 	(description->bounds.str, "BW", _("Black and White"));
       description->deflt.str =
@@ -2455,18 +2424,18 @@ escp2_parameters(const stp_vars_t *v, const char *name,
     }
   else if (strcmp(name, "RawChannels") == 0)
     {
-      const inklist_t *inks = escp2_inklist(v);
+      const inklist_t *inks = stp_escp2_inklist(v);
       int ninktypes = inks->n_inks;
       description->bounds.str = stp_string_list_create();
       if (ninktypes > 1)
 	{
 	  stp_string_list_add_string(description->bounds.str, "None", "None");
 	  for (i = 0; i < ninktypes; i++)
-	    if (inks->inknames[i]->inkset == INKSET_EXTENDED)
+	    if (inks->inknames[i].inkset == INKSET_EXTENDED)
 	      {
 		const channel_count_t *ch =
 		  (get_channel_count_by_number
-		   (inks->inknames[i]->channel_set->channel_count));
+		   (inks->inknames[i].channel_count));
 		stp_string_list_add_string(description->bounds.str,
 					   ch->name, ch->name);
 	      }
@@ -2482,28 +2451,44 @@ escp2_parameters(const stp_vars_t *v, const char *name,
       if (stp_get_string_parameter(v, "PrintingMode") &&
 	  strcmp(stp_get_string_parameter(v, "PrintingMode"), "BW") != 0)
 	{
-	  const escp2_inkname_t *ink_name = get_inktype(v);
-	  if (ink_name && ink_name->inkset == INKSET_CMYKRB)
+	  const inkname_t *ink_name = get_inktype(v);
+	  if (ink_name && ink_name->inkset == INKSET_OTHER)
 	    description->is_active = 1;
 	}
     }
+  else if (strcmp(name, "PageDryTime") == 0 ||
+	   strcmp(name, "ScanDryTime") == 0 ||
+	   strcmp(name, "ScanMinDryTime") == 0 ||
+	   strcmp(name, "FeedAdjustment") == 0 ||
+	   strcmp(name, "PaperThickness") == 0 ||
+	   strcmp(name, "VacuumIntensity") == 0 ||
+	   strcmp(name, "FeedSequence") == 0 ||
+	   strcmp(name, "PrintMethod") == 0 ||
+	   strcmp(name, "PaperMedia") == 0 ||
+	   strcmp(name, "PaperMediaSize") == 0 ||
+	   strcmp(name, "PlatenGap") == 0)
+    {
+      description->is_active = 0;
+      if (stp_escp2_has_media_feature(v, name))
+	description->is_active = 1;
+    }
 }
 
-static const res_t *
-escp2_find_resolution(const stp_vars_t *v)
+const res_t *
+stp_escp2_find_resolution(const stp_vars_t *v)
 {
   const char *resolution = stp_get_string_parameter(v, "Resolution");
   if (resolution)
     {
-      const res_t *const *res = escp2_reslist(v);
-      int i = 0;
-      while (res[i])
+      const resolution_list_t *resolutions = escp2_reslist(v);
+      int i;
+      for (i = 0; i < resolutions->n_resolutions; i++)
 	{
-	  if (!strcmp(resolution, res[i]->name))
-	    return res[i];
-	  else if (!strcmp(res[i]->name, ""))
+	  const res_t *res = &(resolutions->resolutions[i]);
+	  if (!strcmp(resolution, res->name))
+	    return res;
+	  else if (!strcmp(res->name, ""))
 	    return NULL;
-	  i++;
 	}
     }
   if (stp_check_string_parameter(v, "Quality", STP_PARAMETER_ACTIVE))
@@ -2536,6 +2521,71 @@ imax(int a, int b)
 }
 
 static void
+escp2_media_size(const stp_vars_t *v,	/* I */
+		 int  *width,		/* O - Width in points */
+		 int  *height) 		/* O - Height in points */
+{
+  if (stp_get_page_width(v) > 0 && stp_get_page_height(v) > 0)
+    {
+      *width = stp_get_page_width(v);
+      *height = stp_get_page_height(v);
+    }
+  else
+    {
+      const char *page_size = stp_get_string_parameter(v, "PageSize");
+      const stp_papersize_t *papersize = NULL;
+      if (page_size)
+	papersize = stp_get_papersize_by_name(page_size);
+      if (!papersize)
+	{
+	  *width = 1;
+	  *height = 1;
+	}
+      else
+	{
+	  *width = papersize->width;
+	  *height = papersize->height;
+	}
+      if (*width == 0 || *height == 0)
+	{
+	  const input_slot_t *slot = stp_escp2_get_input_slot(v);
+	  if (slot && slot->is_cd)
+	    {
+	      papersize = stp_get_papersize_by_name("CDCustom");
+	      if (papersize)
+		{
+		  if (*width == 0)
+		    *width = papersize->width;
+		  if (*height == 0)
+		    *height = papersize->height;
+		}
+	    }
+	  else
+	    {
+	      int papersizes = stp_known_papersizes();
+	      int i;
+	      for (i = 0; i < papersizes; i++)
+		{
+		  papersize = stp_get_papersize_by_index(i);
+		  if (verify_papersize(v, papersize))
+		    {
+		      if (*width == 0)
+			*width = papersize->width;
+		      if (*height == 0)
+			*height = papersize->height;
+		      break;
+		    }
+		}
+	    }
+	}
+      if (*width == 0)
+	*width = 612;
+      if (*height == 0)
+	*height = 792;
+    }
+}
+
+static void
 internal_imageable_area(const stp_vars_t *v, int use_paper_margins,
 			int use_maximum_area,
 			int *left, int *right, int *bottom, int *top)
@@ -2554,14 +2604,14 @@ internal_imageable_area(const stp_vars_t *v, int use_paper_margins,
   if (media_size)
     pt = stp_get_papersize_by_name(media_size);
 
-  input_slot = get_input_slot(v);
+  input_slot = stp_escp2_get_input_slot(v);
   if (input_slot)
     {
       cd = input_slot->is_cd;
       rollfeed = input_slot->is_roll_feed;
     }
 
-  stp_default_media_size(v, &width, &height);
+  escp2_media_size(v, &width, &height);
   if (cd)
     {
       if (pt)
@@ -2675,7 +2725,7 @@ escp2_limit(const stp_vars_t *v,			/* I */
 static void
 escp2_describe_resolution(const stp_vars_t *v, int *x, int *y)
 {
-  const res_t *res = escp2_find_resolution(v);
+  const res_t *res = stp_escp2_find_resolution(v);
   if (res && verify_resolution(v, res))
     {
       *x = res->printed_hres;
@@ -2697,20 +2747,20 @@ escp2_describe_output(const stp_vars_t *v)
     return "Grayscale";
   else
     {
-      const escp2_inkname_t *ink_type = get_inktype(v);
+      const inkname_t *ink_type = get_inktype(v);
       if (ink_type)
 	{
 	  switch (ink_type->inkset)
 	    {
 	    case INKSET_QUADTONE:
 	      return "Grayscale";
-	    case INKSET_CMYKRB:
+	    case INKSET_OTHER:
 	    case INKSET_CMYK:
 	    case INKSET_CcMmYK:
 	    case INKSET_CcMmYyK:
 	    case INKSET_CcMmYKk:
 	    default:
-	      if (ink_type->channel_set->channels[0])
+	      if (ink_type->channels[0].n_subchannels > 0)
 		return "KCMY";
 	      else
 		return "CMY";
@@ -2725,23 +2775,23 @@ escp2_describe_output(const stp_vars_t *v)
 static int
 escp2_has_advanced_command_set(const stp_vars_t *v)
 {
-  return (escp2_has_cap(v, MODEL_COMMAND, MODEL_COMMAND_PRO) ||
-	  escp2_has_cap(v, MODEL_COMMAND, MODEL_COMMAND_1999) ||
-	  escp2_has_cap(v, MODEL_COMMAND, MODEL_COMMAND_2000));
+  return (stp_escp2_has_cap(v, MODEL_COMMAND, MODEL_COMMAND_PRO) ||
+	  stp_escp2_has_cap(v, MODEL_COMMAND, MODEL_COMMAND_1999) ||
+	  stp_escp2_has_cap(v, MODEL_COMMAND, MODEL_COMMAND_2000));
 }
 
 static int
 escp2_use_extended_commands(const stp_vars_t *v, int use_softweave)
 {
-  return (escp2_has_cap(v, MODEL_COMMAND, MODEL_COMMAND_PRO) ||
-	  (escp2_has_cap(v, MODEL_VARIABLE_DOT, MODEL_VARIABLE_YES) &&
+  return (stp_escp2_has_cap(v, MODEL_COMMAND, MODEL_COMMAND_PRO) ||
+	  (stp_escp2_has_cap(v, MODEL_VARIABLE_DOT, MODEL_VARIABLE_YES) &&
 	   use_softweave));
 }
 
 static int
 set_raw_ink_type(stp_vars_t *v)
 {
-  const inklist_t *inks = escp2_inklist(v);
+  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");
@@ -2756,14 +2806,14 @@ set_raw_ink_type(stp_vars_t *v)
    * If we're using raw printer output, we dummy up the appropriate inkset.
    */
   for (i = 0; i < ninktypes; i++)
-    if (inks->inknames[i]->inkset == INKSET_EXTENDED &&
-	(inks->inknames[i]->channel_set->channel_count == count->count))
+    if (inks->inknames[i].inkset == INKSET_EXTENDED &&
+	(inks->inknames[i].channel_count == count->count))
       {
 	stp_dprintf(STP_DBG_INK, v, "Changing ink type from %s to %s\n",
 		    stp_get_string_parameter(v, "InkType") ?
 		    stp_get_string_parameter(v, "InkType") : "NULL",
-		    inks->inknames[i]->name);
-	stp_set_string_parameter(v, "InkType", inks->inknames[i]->name);
+		    inks->inknames[i].name);
+	stp_set_string_parameter(v, "InkType", inks->inknames[i].name);
 	stp_set_int_parameter(v, "STPIRawChannels", count->count);
 	return 1;
       }
@@ -2774,110 +2824,32 @@ set_raw_ink_type(stp_vars_t *v)
 }
 
 static void
-adjust_density_and_ink_type(stp_vars_t *v, stp_image_t *image)
+adjust_density_and_ink_type(stp_vars_t *v)
 {
   escp2_privdata_t *pd = get_privdata(v);
-  const paper_adjustment_t *pt = pd->paper_adjustment;
+  const stp_vars_t *pv = pd->paper_type->v;
   double paper_density = .8;
-  int o_resid = compute_virtual_resid(pd->res);
-  int n_resid = compute_printed_resid(pd->res);
-  double virtual_scale = 1;
 
-  if (pt)
-    paper_density = pt->base_density;
+  if (pv && stp_check_float_parameter(pv, "Density", STP_PARAMETER_ACTIVE))
+    paper_density = stp_get_float_parameter(pv, "Density");
 
   if (!stp_check_float_parameter(v, "Density", STP_PARAMETER_DEFAULTED))
     {
       stp_set_float_parameter_active(v, "Density", STP_PARAMETER_ACTIVE);
       stp_set_float_parameter(v, "Density", 1.0);
     }
+  stp_scale_float_parameter(v, "Density", paper_density * escp2_density(v));
+  pd->drop_size = escp2_ink_type(v);
 
-  while (n_resid > o_resid)
-    {
-      virtual_scale /= 2.0;
-      n_resid--;
-    }
-  while (n_resid < o_resid)
-    {
-      virtual_scale *= 2.0;
-      n_resid++;
-    }
-  stp_scale_float_parameter
-    (v, "Density", virtual_scale * paper_density * escp2_density(v, o_resid));
-  pd->drop_size = escp2_ink_type(v, o_resid);
-  pd->ink_resid = o_resid;
-
-  /*
-   * If density is greater than 1, try to find the dot size from a lower
-   * resolution that will let us print.  This allows use of high ink levels
-   * on special paper types that need a lot of ink.
-   */
   if (stp_get_float_parameter(v, "Density") > 1.0)
-    {
-      if (stp_check_int_parameter(v, "escp2_ink_type", STP_PARAMETER_ACTIVE) ||
-	  stp_check_int_parameter(v, "escp2_density", STP_PARAMETER_ACTIVE) ||
-	  stp_check_int_parameter(v, "escp2_bits", STP_PARAMETER_ACTIVE) ||
-	  virtual_scale != 1.0 ||
-	  (stp_check_boolean_parameter(v, "AdjustDotsize",
-				       STP_PARAMETER_ACTIVE) &&
-	   ! stp_get_boolean_parameter(v, "AdjustDotsize")))
-	{
-	  stp_set_float_parameter(v, "Density", 1.0);
-	}
-      else
-	{
-	  double density = stp_get_float_parameter(v, "Density");
-	  int resid = o_resid;
-	  int xresid = resid;
-	  double xdensity = density;
-	  while (density > 1.0 && resid >= RES_360)
-	    {
-	      int tresid = xresid - 1;
-	      int base_res_now = escp2_base_res(v, resid);
-	      int bits_now = escp2_bits(v, resid);
-	      double density_now = escp2_density(v, resid);
-	      int base_res_then = escp2_base_res(v, tresid);
-	      int bits_then = escp2_bits(v, tresid);
-	      double density_then = escp2_density(v, tresid);
-	      int drop_size_then = escp2_ink_type(v, tresid);
-
-	      /*
-	       * If we would change the number of bits in the ink type,
-	       * don't try this.  Some resolutions require using a certain
-	       * number of bits!
-	       */
-
-	      if (bits_now != bits_then || density_then <= 0.0 ||
-		  base_res_now != base_res_then || drop_size_then == -1)
-		break;
-	      xdensity = density * density_then / density_now / 2;
-	      xresid = tresid;
-
-	      /*
-	       * If we wouldn't get a significant improvement by changing the
-	       * resolution, don't waste the effort trying.
-	       */
-	      if (density / xdensity > 1.001)
-		{
-		  density = xdensity;
-		  resid = tresid;
-		}
-	    }
-	  pd->drop_size = escp2_ink_type(v, resid);
-	  pd->ink_resid = resid;
-	  if (density > 1.0)
-	    density = 1.0;
-	  stp_set_float_parameter(v, "Density", density);
-	}
-    }
+    stp_set_float_parameter(v, "Density", 1.0);
 }
 
 static void
-adjust_print_quality(stp_vars_t *v, stp_image_t *image)
+adjust_print_quality(stp_vars_t *v)
 {
   escp2_privdata_t *pd = get_privdata(v);
-  stp_curve_t *adjustment = NULL;
-  const paper_adjustment_t *pt;
+  const stp_vars_t *pv = pd->paper_type->v;
   double k_upper = 1.0;
   double k_lower = 0;
   double k_transition = 1.0;
@@ -2887,24 +2859,143 @@ adjust_print_quality(stp_vars_t *v, stp_image_t *image)
    * sometimes change.
    */
 
-  pt = pd->paper_adjustment;
-  if (pt)
+  if (pv)
     {
-      k_lower = pt->k_lower;
-      k_upper = pt->k_upper;
-      k_transition = pt->k_transition;
-      if (!stp_check_float_parameter(v, "CyanBalance", STP_PARAMETER_ACTIVE))
-	stp_set_float_parameter(v, "CyanBalance", pt->cyan);
-      if (!stp_check_float_parameter(v, "MagentaBalance", STP_PARAMETER_ACTIVE))
-	stp_set_float_parameter(v, "MagentaBalance", pt->magenta);
-      if (!stp_check_float_parameter(v, "YellowBalance", STP_PARAMETER_ACTIVE))
-	stp_set_float_parameter(v, "YellowBalance", pt->yellow);
+      int i;
+      stp_string_list_t *slist;
       stp_set_default_float_parameter(v, "BlackDensity", 1.0);
-      stp_scale_float_parameter(v, "BlackDensity", pt->black);
       stp_set_default_float_parameter(v, "Saturation", 1.0);
-      stp_scale_float_parameter(v, "Saturation", pt->saturation);
       stp_set_default_float_parameter(v, "Gamma", 1.0);
-      stp_scale_float_parameter(v, "Gamma", pt->gamma);
+      slist = stp_list_parameters(pv, STP_PARAMETER_TYPE_STRING_LIST);
+      if (slist)
+	{
+	  int len = stp_string_list_count(slist);
+	  for (i = 0; i < len; i++)
+	    {
+	      const char *name = stp_string_list_param(slist, i)->name;
+	      if (!stp_check_string_parameter(v, name, STP_PARAMETER_ACTIVE))
+		stp_set_string_parameter(v, name,
+					 stp_get_string_parameter(pv, name));
+	    }
+	  stp_string_list_destroy(slist);
+	}
+      slist = stp_list_parameters(pv, STP_PARAMETER_TYPE_FILE);
+      if (slist)
+	{
+	  int len = stp_string_list_count(slist);
+	  for (i = 0; i < len; i++)
+	    {
+	      const char *name = stp_string_list_param(slist, i)->name;
+	      if (!stp_check_file_parameter(v, name, STP_PARAMETER_ACTIVE))
+		stp_set_file_parameter(v, name,
+				       stp_get_file_parameter(pv, name));
+	    }
+	  stp_string_list_destroy(slist);
+	}
+      slist = stp_list_parameters(pv, STP_PARAMETER_TYPE_INT);
+      if (slist)
+	{
+	  int len = stp_string_list_count(slist);
+	  for (i = 0; i < len; i++)
+	    {
+	      const char *name = stp_string_list_param(slist, i)->name;
+	      if (!stp_check_int_parameter(v, name, STP_PARAMETER_ACTIVE))
+		stp_set_int_parameter(v, name,
+				      stp_get_int_parameter(pv, name));
+	    }
+	  stp_string_list_destroy(slist);
+	}
+      slist = stp_list_parameters(pv, STP_PARAMETER_TYPE_DIMENSION);
+      if (slist)
+	{
+	  int len = stp_string_list_count(slist);
+	  for (i = 0; i < len; i++)
+	    {
+	      const char *name = stp_string_list_param(slist, i)->name;
+	      if (!stp_check_dimension_parameter(v, name, STP_PARAMETER_ACTIVE))
+		stp_set_dimension_parameter(v, name,
+					    stp_get_dimension_parameter(pv, name));
+	    }
+	  stp_string_list_destroy(slist);
+	}
+      slist = stp_list_parameters(pv, STP_PARAMETER_TYPE_BOOLEAN);
+      if (slist)
+	{
+	  int len = stp_string_list_count(slist);
+	  for (i = 0; i < len; i++)
+	    {
+	      const char *name = stp_string_list_param(slist, i)->name;
+	      if (!stp_check_boolean_parameter(v, name, STP_PARAMETER_ACTIVE))
+		stp_set_boolean_parameter(v, name,
+					  stp_get_boolean_parameter(pv, name));
+	    }
+	  stp_string_list_destroy(slist);
+	}
+      slist = stp_list_parameters(pv, STP_PARAMETER_TYPE_CURVE);
+      if (slist)
+	{
+	  int len = stp_string_list_count(slist);
+	  for (i = 0; i < len; i++)
+	    {
+	      const char *name = stp_string_list_param(slist, i)->name;
+	      if (!stp_check_curve_parameter(v, name, STP_PARAMETER_ACTIVE))
+		stp_set_curve_parameter(v, name,
+					stp_get_curve_parameter(pv, name));
+	    }
+	  stp_string_list_destroy(slist);
+	}
+      slist = stp_list_parameters(pv, STP_PARAMETER_TYPE_ARRAY);
+      if (slist)
+	{
+	  int len = stp_string_list_count(slist);
+	  for (i = 0; i < len; i++)
+	    {
+	      const char *name = stp_string_list_param(slist, i)->name;
+	      if (!stp_check_array_parameter(v, name, STP_PARAMETER_ACTIVE))
+		stp_set_array_parameter(v, name,
+					stp_get_array_parameter(pv, name));
+	    }
+	  stp_string_list_destroy(slist);
+	}
+      slist = stp_list_parameters(pv, STP_PARAMETER_TYPE_RAW);
+      if (slist)
+	{
+	  int len = stp_string_list_count(slist);
+	  for (i = 0; i < len; i++)
+	    {
+	      const char *name = stp_string_list_param(slist, i)->name;
+	      if (!stp_check_raw_parameter(v, name, STP_PARAMETER_ACTIVE))
+		{
+		  const stp_raw_t *r = stp_get_raw_parameter(pv, name);
+		  stp_set_raw_parameter(v, name, r->data, r->bytes);
+		}
+	    }
+	  stp_string_list_destroy(slist);
+	}
+      slist = stp_list_parameters(pv, STP_PARAMETER_TYPE_DOUBLE);
+      if (slist)
+	{
+	  int len = stp_string_list_count(slist);
+	  for (i = 0; i < len; i++)
+	    {
+	      const char *name = stp_string_list_param(slist, i)->name;
+	      if (strcmp(name, "BlackDensity") == 0 ||
+		  strcmp(name, "Saturation") == 0 ||
+		  strcmp(name, "Gamma") == 0)
+		stp_scale_float_parameter(v, name,
+					  stp_get_float_parameter(pv, name));
+	      else if (strcmp(name, "GCRLower") == 0)
+		k_lower = stp_get_float_parameter(pv, "GCRLower");
+	      else if (strcmp(name, "GCRUpper") == 0)
+		k_upper = stp_get_float_parameter(pv, "GCRUpper");
+	      else if (strcmp(name, "BlackTrans") == 0)
+		k_transition = stp_get_float_parameter(pv, "BlackTrans");
+	      else if (!stp_check_float_parameter(v, name, STP_PARAMETER_ACTIVE))
+		stp_set_float_parameter(v, name,
+					stp_get_float_parameter(pv, name));
+	    }
+	  stp_string_list_destroy(slist);
+	}
     }
 
   if (!stp_check_float_parameter(v, "GCRLower", STP_PARAMETER_ACTIVE))
@@ -2915,63 +3006,39 @@ adjust_print_quality(stp_vars_t *v, stp_image_t *image)
     stp_set_default_float_parameter(v, "BlackTrans", k_transition);
 
 
-  if (!stp_check_curve_parameter(v, "HueMap", STP_PARAMETER_ACTIVE) &&
-      pt && pt->hue_adjustment)
-    {
-      adjustment = stp_curve_create_from_string(pt->hue_adjustment);
-      stp_set_curve_parameter(v, "HueMap", adjustment);
-      stp_set_curve_parameter_active(v, "HueMap", STP_PARAMETER_ACTIVE);
-      stp_curve_destroy(adjustment);
-    }
-  if (!stp_check_curve_parameter(v, "SatMap", STP_PARAMETER_ACTIVE) &&
-      pt && pt->sat_adjustment)
-    {
-      adjustment = stp_curve_create_from_string(pt->sat_adjustment);
-      stp_set_curve_parameter(v, "SatMap", adjustment);
-      stp_set_curve_parameter_active(v, "SatMap", STP_PARAMETER_ACTIVE);
-      stp_curve_destroy(adjustment);
-    }
-  if (!stp_check_curve_parameter(v, "LumMap", STP_PARAMETER_ACTIVE) &&
-      pt && pt->lum_adjustment)
-    {
-      adjustment = stp_curve_create_from_string(pt->lum_adjustment);
-      stp_set_curve_parameter(v, "LumMap", adjustment);
-      stp_set_curve_parameter_active(v, "LumMap", STP_PARAMETER_ACTIVE);
-      stp_curve_destroy(adjustment);
-    }
 }
 
 static int
-count_channels(const escp2_inkname_t *inks, int use_aux_channels)
+count_channels(const inkname_t *inks, int use_aux_channels)
 {
   int answer = 0;
   int i;
-  for (i = 0; i < inks->channel_set->channel_count; i++)
-    if (inks->channel_set->channels[i])
-      answer += inks->channel_set->channels[i]->n_subchannels;
+  for (i = 0; i < inks->channel_count; i++)
+    if (inks->channels[i].n_subchannels > 0)
+      answer += inks->channels[i].n_subchannels;
   if (use_aux_channels)
-    for (i = 0; i < inks->channel_set->aux_channel_count; i++)
-      if (inks->channel_set->aux_channels[i])
-	answer += inks->channel_set->aux_channels[i]->n_subchannels;
+    for (i = 0; i < inks->aux_channel_count; i++)
+      if (inks->aux_channels[i].n_subchannels > 0)
+	answer += inks->aux_channels[i].n_subchannels;
   return answer;
 }
 
 static int
-compute_channel_count(const escp2_inkname_t *ink_type, int channel_limit,
+compute_channel_count(const inkname_t *ink_type, int channel_limit,
 		      int use_aux_channels)
 {
   int i;
   int physical_channels = 0;
   for (i = 0; i < channel_limit; i++)
     {
-      const ink_channel_t *channel = ink_type->channel_set->channels[i];
+      const ink_channel_t *channel = &(ink_type->channels[i]);
       if (channel)
 	physical_channels += channel->n_subchannels;
     }
   if (use_aux_channels)
-    for (i = 0; i < ink_type->channel_set->aux_channel_count; i++)
-      if (ink_type->channel_set->aux_channels[i])
-	physical_channels += ink_type->channel_set->aux_channels[i]->n_subchannels;
+    for (i = 0; i < ink_type->aux_channel_count; i++)
+      if (ink_type->aux_channels[i].n_subchannels > 0)
+	physical_channels += ink_type->aux_channels[i].n_subchannels;
   return physical_channels;
 }
 
@@ -2990,12 +3057,12 @@ setup_inks(stp_vars_t *v)
   escp2_privdata_t *pd = get_privdata(v);
   int i, j;
   escp2_dropsize_t *drops;
-  const escp2_inkname_t *ink_type = pd->inkname;
-  const paper_adjustment_t *paper = pd->paper_adjustment;
+  const inkname_t *ink_type = pd->inkname;
+  const stp_vars_t *pv = pd->paper_type->v;
   int gloss_channel = -1;
   double gloss_scale = get_double_param(v, "Density");
 
-  drops = escp2_copy_dropsizes(v, pd->ink_resid);
+  drops = escp2_copy_dropsizes(v);
   stp_init_debug_messages(v);
   if (stp_check_float_parameter(v, "DropSize1", STP_PARAMETER_ACTIVE))
     {
@@ -3023,7 +3090,7 @@ setup_inks(stp_vars_t *v)
     }
   for (i = 0; i < pd->logical_channels; i++)
     {
-      const ink_channel_t *channel = ink_type->channel_set->channels[i];
+      const ink_channel_t *channel = &(ink_type->channels[i]);
       if (channel && channel->n_subchannels > 0)
 	{
 	  int hue_curve_found = 0;
@@ -3032,7 +3099,7 @@ setup_inks(stp_vars_t *v)
 	  double userval = get_double_param(v, param);
 	  if (shades->n_shades < channel->n_subchannels)
 	    {
-	      stp_erprintf("Not enough shades!\n");
+	      stp_erprintf("Not enough shades\n");
 	    }
 	  if (ink_type->inkset != INKSET_EXTENDED)
 	    {
@@ -3068,45 +3135,31 @@ setup_inks(stp_vars_t *v)
 		  stp_check_float_parameter(v, subparam, STP_PARAMETER_ACTIVE))
 		stp_channel_set_cutoff_adjustment
 		  (v, i, j, stp_get_float_parameter(v, subparam));
-	      else if (paper)
-		stp_channel_set_cutoff_adjustment(v, i, j,
-						  paper->subchannel_cutoff);
+	      else if (pv)
+		{
+		  if (subparam &&
+		      stp_check_float_parameter(pv, subparam, STP_PARAMETER_ACTIVE))
+		    stp_channel_set_cutoff_adjustment
+		      (v, i, j, stp_get_float_parameter(pv, subparam));
+		  else if (stp_check_float_parameter(pv, "SubchannelCutoff", STP_PARAMETER_ACTIVE))
+		    stp_channel_set_cutoff_adjustment
+		      (v, i, j, stp_get_float_parameter(pv, "SubchannelCutoff"));
+		}
 	    }
 	  if (ink_type->inkset != INKSET_EXTENDED)
 	    {
-	      if (channel->hue_curve && channel->hue_curve->curve_name)
+	      if (channel->hue_curve_name)
 		{
-		  char *hue_curve_name;
 		  const stp_curve_t *curve = NULL;
-		  stp_asprintf(&hue_curve_name, "%sHueCurve",
-			       channel->hue_curve->curve_name);
-		  curve = stp_get_curve_parameter(v, hue_curve_name);
+		  curve = stp_get_curve_parameter(v, channel->hue_curve_name);
 		  if (curve)
 		    {
 		      stp_channel_set_curve(v, i, curve);
 		      hue_curve_found = 1;
 		    }
-		  stp_free(hue_curve_name);
 		}
 	      if (channel->hue_curve && !hue_curve_found)
-		{
-		  if (!channel->hue_curve->curve_impl)
-		    channel->hue_curve->curve_impl =
-		      stp_curve_create_from_string(channel->hue_curve->curve);
-		  if (channel->hue_curve->curve_impl)
-		    {
-		      stp_curve_t *curve_tmp =
-			stp_curve_create_copy(channel->hue_curve->curve_impl);
-#if 0
-		      (void) stp_curve_rescale(curve_tmp,
-					       sqrt(1.0 / stp_get_float_parameter(v, "Gamma")),
-					       STP_CURVE_COMPOSE_EXPONENTIATE,
-					       STP_CURVE_BOUNDS_RESCALE);
-#endif
-		      stp_channel_set_curve(v, i, curve_tmp);
-		      stp_curve_destroy(curve_tmp);
-		    }
-		}
+		stp_channel_set_curve(v, i, channel->hue_curve);
 	    }
 	  escp2_free_shades(shades);
 	}
@@ -3114,10 +3167,9 @@ setup_inks(stp_vars_t *v)
   if (pd->use_aux_channels)
     {
       int base_count = pd->logical_channels;
-      for (i = 0; i < ink_type->channel_set->aux_channel_count; i++)
+      for (i = 0; i < ink_type->aux_channel_count; i++)
 	{
-	  const ink_channel_t *channel =
-	    ink_type->channel_set->aux_channels[i];
+	  const ink_channel_t *channel = &(ink_type->aux_channels[i]);
 	  if (channel && channel->n_subchannels > 0)
 	    {
 	      int ch = i + base_count;
@@ -3158,14 +3210,21 @@ setup_inks(stp_vars_t *v)
 		      stp_check_float_parameter(v, subparam, STP_PARAMETER_ACTIVE))
 		    stp_channel_set_cutoff_adjustment
 		      (v, ch, j, stp_get_float_parameter(v, subparam));
-		  else if (paper)
-		    stp_channel_set_cutoff_adjustment(v, ch, j,
-						      paper->subchannel_cutoff);
+		  else if (pv)
+		    {
+		      if (subparam &&
+			  stp_check_float_parameter(pv, subparam, STP_PARAMETER_ACTIVE))
+			stp_channel_set_cutoff_adjustment
+			  (v, ch, j, stp_get_float_parameter(pv, subparam));
+		      else if (stp_check_float_parameter(pv, "SubchannelCutoff", STP_PARAMETER_ACTIVE))
+			stp_channel_set_cutoff_adjustment
+			  (v, ch, j, stp_get_float_parameter(pv, "SubchannelCutoff"));
+		    }
 		}
 	      if (channel->hue_curve)
 		{
 		  stp_curve_t *curve_tmp =
-		    stp_curve_create_copy(channel->hue_curve->curve_impl);
+		    stp_curve_create_copy(channel->hue_curve);
 		  (void) stp_curve_rescale(curve_tmp,
 					   sqrt(1.0 / stp_get_float_parameter(v, "Gamma")),
 					   STP_CURVE_COMPOSE_EXPONENTIATE,
@@ -3188,13 +3247,13 @@ setup_head_offset(stp_vars_t *v)
   int i;
   int channel_id = 0;
   int channel_limit = pd->logical_channels;
-  const escp2_inkname_t *ink_type = pd->inkname;
+  const inkname_t *ink_type = pd->inkname;
   if (pd->channels_in_use > pd->logical_channels)
     channel_limit = pd->channels_in_use;
   pd->head_offset = stp_zalloc(sizeof(int) * channel_limit);
   for (i = 0; i < pd->logical_channels; i++)
     {
-      const ink_channel_t *channel = ink_type->channel_set->channels[i];
+      const ink_channel_t *channel = &(ink_type->channels[i]);
       if (channel)
 	{
 	  int j;
@@ -3208,9 +3267,9 @@ setup_head_offset(stp_vars_t *v)
     }
   if (pd->use_aux_channels)
     {
-      for (i = 0; i < ink_type->channel_set->aux_channel_count; i++)
+      for (i = 0; i < ink_type->aux_channel_count; i++)
 	{
-	  const ink_channel_t *channel = ink_type->channel_set->aux_channels[i];
+	  const ink_channel_t *channel = &(ink_type->aux_channels[i]);
 	  if (channel)
 	    {
 	      int j;
@@ -3236,6 +3295,36 @@ setup_head_offset(stp_vars_t *v)
       }
 }
 
+static int
+supports_split_channels(stp_vars_t *v)
+{
+  escp2_privdata_t *pd = get_privdata(v);
+  int i;
+  int split_channel_count = -1;
+  for (i = 0; i < pd->logical_channels; i++)
+    {
+      int j;
+      if (pd->inkname->channels[i].n_subchannels > 0)
+	{
+	  for (j = 0; j < pd->inkname->channels[i].n_subchannels; j++)
+	    {
+	      int split_count = pd->inkname->channels[i].subchannels[j].split_channel_count;
+	      if (split_count == 0)
+		return 0;
+	      else if (split_channel_count >= 0 && split_count != split_channel_count)
+		return 0;
+	      else
+		split_channel_count = split_count;
+	    }
+	}
+    }
+  if (split_channel_count > 0)
+    return split_channel_count;
+  else
+    return 0;
+}
+
+
 static void
 setup_split_channels(stp_vars_t *v)
 {
@@ -3243,18 +3332,13 @@ setup_split_channels(stp_vars_t *v)
   /*
    * Set up the output channels
    */
-  if (pd->physical_channels == 1 &&
-      
-      pd->inkname->channel_set->channels[0]->subchannels->split_channel_count > 1)
+  pd->split_channel_count = supports_split_channels(v);
+  if (pd->split_channel_count)
     {
-      int i;
-      int incr = 1;
-      pd->split_channel_count =
-	pd->inkname->channel_set->channels[0]->subchannels->split_channel_count;
       if (pd->res->vres <
 	  (escp2_base_separation(v) / escp2_black_nozzle_separation(v)))
 	{
-	  incr =
+	  int incr =
 	    (escp2_base_separation(v) / escp2_black_nozzle_separation(v)) /
 	    pd->res->vres;
 	  pd->split_channel_count /= incr;
@@ -3262,13 +3346,7 @@ setup_split_channels(stp_vars_t *v)
 	  pd->nozzles /= incr;
 	  pd->min_nozzles /= incr;
 	}
-      pd->split_channels = stp_malloc(pd->split_channel_count * sizeof(short));
-      for (i = 0; i < pd->split_channel_count; i++)
-	pd->split_channels[i] =
-	  pd->inkname->channel_set->channels[0]->subchannels->split_channels[i * incr];
     }
-  else
-    pd->split_channel_count = 0;
 }
 
 static void
@@ -3276,12 +3354,12 @@ setup_basic(stp_vars_t *v)
 {
   escp2_privdata_t *pd = get_privdata(v);
   pd->advanced_command_set = escp2_has_advanced_command_set(v);
-  pd->command_set = escp2_get_cap(v, MODEL_COMMAND);
-  pd->variable_dots = escp2_has_cap(v, MODEL_VARIABLE_DOT, MODEL_VARIABLE_YES);
-  pd->has_vacuum = escp2_has_cap(v, MODEL_VACUUM, MODEL_VACUUM_YES);
-  pd->has_graymode = escp2_has_cap(v, MODEL_GRAYMODE, MODEL_GRAYMODE_YES);
-  pd->init_sequence = escp2_preinit_sequence(v);
-  pd->deinit_sequence = escp2_postinit_remote_sequence(v);
+  pd->command_set = stp_escp2_get_cap(v, MODEL_COMMAND);
+  pd->variable_dots = stp_escp2_has_cap(v, MODEL_VARIABLE_DOT, MODEL_VARIABLE_YES);
+  pd->has_graymode = stp_escp2_has_cap(v, MODEL_GRAYMODE, MODEL_GRAYMODE_YES);
+  pd->preinit_sequence = escp2_preinit_sequence(v);
+  pd->preinit_remote_sequence = escp2_preinit_remote_sequence(v);
+  pd->deinit_remote_sequence = escp2_postinit_remote_sequence(v);
   pd->borderless_sequence = escp2_vertical_borderless_sequence(v);
   pd->base_separation = escp2_base_separation(v);
   pd->resolution_scale = escp2_resolution_scale(v);
@@ -3291,51 +3369,93 @@ static void
 setup_misc(stp_vars_t *v)
 {
   escp2_privdata_t *pd = get_privdata(v);
-  pd->input_slot = get_input_slot(v);
-  pd->paper_type = get_media_type(v);
-  pd->paper_adjustment = get_media_adjustment(v);
+  pd->input_slot = stp_escp2_get_input_slot(v);
+  pd->paper_type = stp_escp2_get_media_type(v, 0);
   pd->ink_group = escp2_inkgroup(v);
+  pd->media_settings = stp_vars_create_copy(pd->paper_type->v);
+  stp_escp2_set_media_size(pd->media_settings, v);
+  if (stp_check_float_parameter(v, "PageDryTime", STP_PARAMETER_ACTIVE))
+    stp_set_float_parameter(pd->media_settings, "PageDryTime",
+			    stp_get_float_parameter(v, "PageDryTime"));
+  if (stp_check_float_parameter(v, "ScanDryTime", STP_PARAMETER_ACTIVE))
+    stp_set_float_parameter(pd->media_settings, "ScanDryTime",
+			    stp_get_float_parameter(v, "ScanDryTime"));
+  if (stp_check_float_parameter(v, "ScanMinDryTime", STP_PARAMETER_ACTIVE))
+    stp_set_float_parameter(pd->media_settings, "ScanMinDryTime",
+			    stp_get_float_parameter(v, "ScanMinDryTime"));
+  if (stp_check_int_parameter(v, "FeedAdjustment", STP_PARAMETER_ACTIVE))
+    stp_set_int_parameter(pd->media_settings, "FeedAdjustment",
+			  stp_get_int_parameter(v, "FeedAdjustment"));
+  if (stp_check_int_parameter(v, "PaperThickness", STP_PARAMETER_ACTIVE))
+    stp_set_int_parameter(pd->media_settings, "PaperThickness",
+			  stp_get_int_parameter(v, "PaperThickness"));
+  if (stp_check_int_parameter(v, "VacuumIntensity", STP_PARAMETER_ACTIVE))
+    stp_set_int_parameter(pd->media_settings, "VacuumIntensity",
+			  stp_get_int_parameter(v, "VacuumIntensity"));
+  if (stp_check_int_parameter(v, "FeedSequence", STP_PARAMETER_ACTIVE))
+    stp_set_int_parameter(pd->media_settings, "FeedSequence",
+			  stp_get_int_parameter(v, "FeedSequence"));
+  if (stp_check_int_parameter(v, "PrintMethod", STP_PARAMETER_ACTIVE))
+    stp_set_int_parameter(pd->media_settings, "PrintMethod",
+			  stp_get_int_parameter(v, "PrintMethod"));
+  if (stp_check_int_parameter(v, "PlatenGap", STP_PARAMETER_ACTIVE))
+    stp_set_int_parameter(pd->media_settings, "PlatenGap",
+			  stp_get_int_parameter(v, "PlatenGap"));
 }
 
 static void
 allocate_channels(stp_vars_t *v, int line_length)
 {
   escp2_privdata_t *pd = get_privdata(v);
-  const escp2_inkname_t *ink_type = pd->inkname;
-  int i;
+  const inkname_t *ink_type = pd->inkname;
+  int i, j, k;
   int channel_id = 0;
+  int split_id = 0;
 
   pd->cols = stp_zalloc(sizeof(unsigned char *) * pd->channels_in_use);
   pd->channels =
     stp_zalloc(sizeof(physical_subchannel_t *) * pd->channels_in_use);
+  if (pd->split_channel_count)
+    pd->split_channels = stp_zalloc(sizeof(short) * pd->channels_in_use *
+				    pd->split_channel_count);
 
   for (i = 0; i < pd->logical_channels; i++)
     {
-      const ink_channel_t *channel = ink_type->channel_set->channels[i];
+      const ink_channel_t *channel = &(ink_type->channels[i]);
       if (channel)
 	{
-	  int j;
 	  for (j = 0; j < channel->n_subchannels; j++)
 	    {
+	      const physical_subchannel_t *sc = &(channel->subchannels[j]);
 	      pd->cols[channel_id] = stp_zalloc(line_length);
-	      pd->channels[channel_id] = &(channel->subchannels[j]);
+	      pd->channels[channel_id] = sc;
 	      stp_dither_add_channel(v, pd->cols[channel_id], i, j);
+	      if (pd->split_channel_count)
+		{
+		  for (k = 0; k < pd->split_channel_count; k++)
+		    pd->split_channels[split_id++] = sc->split_channels[k];
+		}
 	      channel_id++;
 	    }
 	}
     }
-  if (pd->use_aux_channels && ink_type->channel_set->aux_channel_count > 0)
+  if (pd->use_aux_channels && ink_type->aux_channel_count > 0)
     {
-      for (i = 0; i < ink_type->channel_set->aux_channel_count; i++)
+      for (i = 0; i < ink_type->aux_channel_count; i++)
 	{
-	  const ink_channel_t *channel = ink_type->channel_set->aux_channels[i];
-	  int j;
+	  const ink_channel_t *channel = &(ink_type->aux_channels[i]);
 	  for (j = 0; j < channel->n_subchannels; j++)
 	    {
+	      const physical_subchannel_t *sc = &(channel->subchannels[j]);
 	      pd->cols[channel_id] = stp_zalloc(line_length);
-	      pd->channels[channel_id] = &(channel->subchannels[j]);
+	      pd->channels[channel_id] = sc;
 	      stp_dither_add_channel(v, pd->cols[channel_id],
 				     i + pd->logical_channels, j);
+	      if (pd->split_channel_count)
+		{
+		  for (k = 0; k < pd->split_channel_count; k++)
+		    pd->split_channels[split_id++] = sc->split_channels[k];
+		}
 	      channel_id++;
 	    }
 	}
@@ -3398,20 +3518,19 @@ static void
 setup_resolution(stp_vars_t *v)
 {
   escp2_privdata_t *pd = get_privdata(v);
-  const res_t *res = escp2_find_resolution(v);
-  int resid = compute_resid(res);
+  const res_t *res = stp_escp2_find_resolution(v);
 
   int vertical = adjusted_vertical_resolution(res);
   int horizontal = adjusted_horizontal_resolution(res);
 
   pd->res = res;
   pd->use_extended_commands =
-    escp2_use_extended_commands(v, pd->res->softweave);
-  pd->physical_xdpi = escp2_base_res(v, compute_virtual_resid(res));
+    escp2_use_extended_commands(v, !(pd->res->command));
+  pd->physical_xdpi = escp2_base_res(v);
   if (pd->physical_xdpi > pd->res->hres)
     pd->physical_xdpi = pd->res->hres;
 
-  if (escp2_use_extended_commands(v, pd->res->softweave))
+  if (pd->use_extended_commands)
     {
       pd->unit_scale = MAX(escp2_max_hres(v), escp2_max_vres(v));
       pd->horizontal_units = horizontal;
@@ -3427,12 +3546,11 @@ setup_resolution(stp_vars_t *v)
       pd->horizontal_units = vertical;
     }
   /* Note hard-coded 1440 -- from Epson manuals */
-  if (escp2_has_cap(v, MODEL_COMMAND, MODEL_COMMAND_1999) &&
-      escp2_has_cap(v, MODEL_VARIABLE_DOT, MODEL_VARIABLE_NO))
+  if (stp_escp2_has_cap(v, MODEL_COMMAND, MODEL_COMMAND_1999) &&
+      stp_escp2_has_cap(v, MODEL_VARIABLE_DOT, MODEL_VARIABLE_NO))
     pd->micro_units = 1440;
   pd->vertical_units = vertical;
   pd->page_management_units = vertical;
-  pd->printing_resolution = escp2_base_res(v, resid);
 }
 
 static void
@@ -3441,7 +3559,7 @@ setup_softweave_parameters(stp_vars_t *v)
   escp2_privdata_t *pd = get_privdata(v);
   pd->horizontal_passes = pd->res->printed_hres / pd->physical_xdpi;
   if (pd->physical_channels == 1 &&
-      (pd->inkname->channel_set->channels[0]->subchannels->split_channel_count > 1 ||
+      (pd->inkname->channels[0].subchannels->split_channel_count > 1 ||
        (pd->res->vres >=
 	(escp2_base_separation(v) / escp2_black_nozzle_separation(v)))) &&
       (escp2_max_black_resolution(v) < 0 ||
@@ -3454,18 +3572,21 @@ setup_softweave_parameters(stp_vars_t *v)
     {
       pd->nozzles = escp2_fast_nozzles(v);
       pd->nozzle_separation = escp2_fast_nozzle_separation(v);
+      pd->nozzle_start = escp2_fast_nozzle_start(v);
       pd->min_nozzles = escp2_min_fast_nozzles(v);
     }
   else if (pd->use_black_parameters)
     {
       pd->nozzles = escp2_black_nozzles(v);
       pd->nozzle_separation = escp2_black_nozzle_separation(v);
+      pd->nozzle_start = escp2_black_nozzle_start(v);
       pd->min_nozzles = escp2_min_black_nozzles(v);
     }
   else
     {
       pd->nozzles = escp2_nozzles(v);
       pd->nozzle_separation = escp2_nozzle_separation(v);
+      pd->nozzle_start = escp2_nozzle_start(v);
       pd->min_nozzles = escp2_min_nozzles(v);
     }
 }
@@ -3477,6 +3598,7 @@ setup_printer_weave_parameters(stp_vars_t *v)
   pd->horizontal_passes = 1;
   pd->nozzles = 1;
   pd->nozzle_separation = 1;
+  pd->nozzle_start = 0;
   pd->min_nozzles = 1;
   pd->use_black_parameters = 0;
 }
@@ -3491,7 +3613,7 @@ setup_head_parameters(stp_vars_t *v)
   if (strcmp(stp_get_string_parameter(v, "PrintingMode"), "BW") == 0)
     pd->logical_channels = 1;
   else
-    pd->logical_channels = pd->inkname->channel_set->channel_count;
+    pd->logical_channels = pd->inkname->channel_count;
 
   pd->physical_channels =
     compute_channel_count(pd->inkname, pd->logical_channels,
@@ -3504,16 +3626,9 @@ setup_head_parameters(stp_vars_t *v)
 			      pd->use_aux_channels);
     }
 
-  pd->use_printer_weave = use_printer_weave(v);
-  if (pd->use_printer_weave)
-    {
-      pd->printer_weave = get_printer_weave(v);
-      if (pd->res->softweave && pd->printer_weave && pd->printer_weave->value == 0)
-	pd->printer_weave = NULL;
-    }
-
+  pd->printer_weave = get_printer_weave(v);
 
-  if (escp2_has_cap(v, MODEL_FAST_360, MODEL_FAST_360_YES) &&
+  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)
     pd->use_fast_360 = 1;
@@ -3523,6 +3638,7 @@ setup_head_parameters(stp_vars_t *v)
   /*
    * Set up the printer-specific parameters (weaving)
    */
+  pd->use_printer_weave = use_printer_weave(v);
   if (pd->use_printer_weave)
     setup_printer_weave_parameters(v);
   else
@@ -3538,32 +3654,52 @@ setup_head_parameters(stp_vars_t *v)
   setup_head_offset(v);
   setup_split_channels(v);
 
+  if (stp_check_string_parameter(v, "Duplex", STP_PARAMETER_ACTIVE))
+    {
+      const char *duplex = stp_get_string_parameter(v, "Duplex");
+      if (strcmp(duplex, "DuplexTumble") == 0)
+	pd->duplex = DUPLEX_TUMBLE;
+      else if (strcmp(duplex, "DuplexNoTumble") == 0)
+	pd->duplex = DUPLEX_NO_TUMBLE;
+      else
+	pd->duplex = 0;
+    }
+  if (pd->duplex)
+    pd->extra_vertical_feed = 0;
+  else
+    pd->extra_vertical_feed = escp2_extra_feed(v);
+
   if (strcmp(stp_get_string_parameter(v, "PrintingMode"), "BW") == 0 &&
       pd->physical_channels == 1)
     {
       if (pd->use_black_parameters)
 	pd->initial_vertical_offset =
-	  escp2_black_initial_vertical_offset(v) * pd->page_management_units /
+	  (escp2_black_initial_vertical_offset(v) -
+	   (escp2_black_nozzle_start(v) * (int) escp2_black_nozzle_separation(v))) *
+	  pd->page_management_units /
 	  escp2_base_separation(v);
       else
 	pd->initial_vertical_offset = pd->head_offset[0] +
-	  (escp2_initial_vertical_offset(v) *
+	  ((escp2_initial_vertical_offset(v) -
+	    (escp2_nozzle_start(v) * (int) escp2_nozzle_separation(v))) *
 	   pd->page_management_units / escp2_base_separation(v));
     }
   else
     pd->initial_vertical_offset =
-      escp2_initial_vertical_offset(v) * pd->page_management_units /
+      (escp2_initial_vertical_offset(v) -
+       (escp2_nozzle_start(v) * (int) escp2_nozzle_separation(v))) *
+      pd->page_management_units /
       escp2_base_separation(v);
 
   pd->printing_initial_vertical_offset = 0;
-  pd->bitwidth = escp2_bits(v, compute_printed_resid(pd->res));
+  pd->bitwidth = escp2_bits(v);
 }
 
 static void
 setup_page(stp_vars_t *v)
 {
   escp2_privdata_t *pd = get_privdata(v);
-  const input_slot_t *input_slot = get_input_slot(v);
+  const input_slot_t *input_slot = stp_escp2_get_input_slot(v);
   int extra_left = 0;
   int extra_top = 0;
   int hub_size = 0;
@@ -3593,11 +3729,11 @@ setup_page(stp_vars_t *v)
 				   safe and print 16 mm */
     }
 
-  stp_default_media_size(v, &(pd->page_true_width), &(pd->page_true_height));
+  escp2_media_size(v, &(pd->page_true_width), &(pd->page_true_height));
   /* Don't use full bleed mode if the paper itself has a margin */
   if (pd->page_left > 0 || pd->page_top > 0)
     stp_set_boolean_parameter(v, "FullBleed", 0);
-  if (escp2_has_cap(v, MODEL_ZEROMARGIN, MODEL_ZEROMARGIN_FULL) &&
+  if (stp_escp2_has_cap(v, MODEL_ZEROMARGIN, MODEL_ZEROMARGIN_FULL) &&
       ((!input_slot || !(input_slot->is_cd))))
     {
       pd->page_extra_height =
@@ -3608,7 +3744,7 @@ setup_page(stp_vars_t *v)
       else
 	pd->paper_extra_bottom = escp2_paper_extra_bottom(v);
     }
-  else if (escp2_has_cap(v, MODEL_ZEROMARGIN, MODEL_ZEROMARGIN_YES) &&
+  else if (stp_escp2_has_cap(v, MODEL_ZEROMARGIN, MODEL_ZEROMARGIN_YES) &&
 	   (stp_get_boolean_parameter(v, "FullBleed")) &&
 	   ((!input_slot || !(input_slot->is_cd))))
     {
@@ -3617,13 +3753,20 @@ setup_page(stp_vars_t *v)
 	escp2_zero_margin_offset(v) * pd->page_management_units /
 	escp2_base_separation(v);
     }
-  else if (escp2_has_cap(v, MODEL_ZEROMARGIN, MODEL_ZEROMARGIN_H_ONLY) &&
+  else if (stp_escp2_has_cap(v, MODEL_ZEROMARGIN, MODEL_ZEROMARGIN_H_ONLY) &&
 	   (stp_get_boolean_parameter(v, "FullBleed")) &&
 	   ((!input_slot || !(input_slot->is_cd))))
     {
       pd->paper_extra_bottom = 0;
       pd->page_extra_height = 0;
     }
+  else if (stp_escp2_printer_supports_duplex(v) && !pd->duplex)
+    {
+      pd->paper_extra_bottom = escp2_paper_extra_bottom(v);
+      pd->page_extra_height =
+	max_nozzle_span(v) * pd->page_management_units /
+	escp2_base_separation(v);
+    }
   else
     {
       pd->page_extra_height = 0;
@@ -3677,7 +3820,7 @@ setup_page(stp_vars_t *v)
 	 pd->horizontal_passes);
       pd->split_channel_width = (pd->split_channel_width + 7) / 8;
       pd->split_channel_width *= pd->bitwidth;
-      if (COMPRESSION)
+      if (!(stp_get_debug_level() & STP_DBG_NO_COMPRESSION))
 	{
 	  pd->comp_buf =
 	    stp_malloc(stp_compute_tiff_linewidth(v, pd->split_channel_width));
@@ -3847,7 +3990,6 @@ static int
 escp2_print_page(stp_vars_t *v, stp_image_t *image)
 {
   int status;
-  int i;
   escp2_privdata_t *pd = get_privdata(v);
   int out_channels;		/* Output bytes per pixel */
   int line_width = (pd->image_printed_width + 7) / 8 * pd->bitwidth;
@@ -3881,18 +4023,24 @@ escp2_print_page(stp_vars_t *v, stp_image_t *image)
      ((pd->page_extra_height * pd->res->vres / pd->vertical_units) +
       (pd->image_top * pd->res->vres / 72)),
      (pd->page_extra_height +
-      (pd->page_height + escp2_extra_feed(v)) * pd->res->vres / 72),
+      (pd->page_height + pd->extra_vertical_feed) * pd->res->vres / 72),
      pd->head_offset,
      weave_pattern,
      stpi_escp2_flush_pass,
-     FILLFUNC,
-     PACKFUNC,
-     COMPUTEFUNC);
+     (((stp_get_debug_level() & STP_DBG_NO_COMPRESSION) ||
+       pd->split_channel_count > 0) ?
+      stp_fill_uncompressed : stp_fill_tiff),
+     (((stp_get_debug_level() & STP_DBG_NO_COMPRESSION) ||
+       pd->split_channel_count > 0) ?
+      stp_pack_uncompressed : stp_pack_tiff),
+     (((stp_get_debug_level() & STP_DBG_NO_COMPRESSION) ||
+       pd->split_channel_count > 0) ?
+      stp_compute_uncompressed_linewidth : stp_compute_tiff_linewidth));
 
   stp_dither_init(v, image, pd->image_printed_width, pd->res->printed_hres,
 		  pd->res->printed_vres);
   allocate_channels(v, line_width);
-  adjust_print_quality(v, image);
+  adjust_print_quality(v);
   out_channels = stp_color_init(v, image, 65536);
 
 /*  stpi_dither_set_expansion(v, pd->res->hres / pd->res->printed_hres); */
@@ -3900,22 +4048,8 @@ escp2_print_page(stp_vars_t *v, stp_image_t *image)
   setup_inks(v);
 
   status = escp2_print_data(v, image);
-  stp_image_conclude(image);
   stp_flush_all(v);
   stpi_escp2_terminate_page(v);
-
-  /*
-   * Cleanup...
-   */
-  for (i = 0; i < pd->channels_in_use; i++)
-    if (pd->cols[i])
-      stp_free(pd->cols[i]);
-  stp_free(pd->cols);
-  stp_free(pd->channels);
-  if (pd->split_channels)
-    stp_free(pd->split_channels);
-  if (pd->comp_buf)
-    stp_free(pd->comp_buf);
   return status;
 }
 
@@ -3926,27 +4060,29 @@ static int
 escp2_do_print(stp_vars_t *v, stp_image_t *image, int print_op)
 {
   int status = 1;
+  int i;
 
   escp2_privdata_t *pd;
+  int page_number = stp_get_int_parameter(v, "PageNumber");
 
   if (!stp_verify(v))
     {
       stp_eprintf(v, _("Print options not verified; cannot print.\n"));
       return 0;
     }
-  stp_image_init(image);
 
   if (strcmp(stp_get_string_parameter(v, "InputImageType"), "Raw") == 0 &&
       !set_raw_ink_type(v))
     return 0;
 
   pd = (escp2_privdata_t *) stp_zalloc(sizeof(escp2_privdata_t));
+
   pd->printed_something = 0;
   pd->last_color = -1;
   pd->last_pass_offset = 0;
   pd->last_pass = -1;
   pd->send_zero_pass_advance =
-    escp2_has_cap(v, MODEL_SEND_ZERO_ADVANCE, MODEL_SEND_ZERO_ADVANCE_YES);
+    stp_escp2_has_cap(v, MODEL_SEND_ZERO_ADVANCE, MODEL_SEND_ZERO_ADVANCE_YES);
   stp_allocate_component_data(v, "Driver", NULL, NULL, pd);
 
   pd->inkname = get_inktype(v);
@@ -3956,6 +4092,12 @@ escp2_do_print(stp_vars_t *v, stp_image_t *image, int print_op)
     pd->use_aux_channels = 1;
   else
     pd->use_aux_channels = 0;
+  if (pd->inkname && pd->inkname->inkset == INKSET_QUADTONE &&
+      strcmp(stp_get_string_parameter(v, "PrintingMode"), "BW") != 0)
+    {
+      stp_eprintf(v, "Warning: Quadtone 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);
@@ -3964,15 +4106,44 @@ escp2_do_print(stp_vars_t *v, stp_image_t *image, int print_op)
   setup_page(v);
   setup_misc(v);
 
-  adjust_density_and_ink_type(v, image);
+  adjust_density_and_ink_type(v);
   if (print_op & OP_JOB_START)
     stpi_escp2_init_printer(v);
   if (print_op & OP_JOB_PRINT)
-    status = escp2_print_page(v, image);
+    {
+      stp_image_init(image);
+      if ((page_number & 1) && pd->duplex &&
+	  ((pd->duplex & pd->input_slot->duplex) == 0))
+	  /* If the hardware can't do the duplex operation, we need to
+	     emulate it in software */
+	image = stpi_buffer_image(image, BUFFER_FLAG_FLIP_X | BUFFER_FLAG_FLIP_Y);
+      status = escp2_print_page(v, image);
+      stp_image_conclude(image);
+    }
   if (print_op & OP_JOB_END)
     stpi_escp2_deinit_printer(v);
 
-  stp_free(pd->head_offset);
+  if (pd->head_offset)
+    stp_free(pd->head_offset);
+
+  /*
+   * Cleanup...
+   */
+  if (pd->cols)
+    {
+      for (i = 0; i < pd->channels_in_use; i++)
+	if (pd->cols[i])
+	  stp_free(pd->cols[i]);
+      stp_free(pd->cols);
+    }
+  if (pd->media_settings)
+    stp_vars_destroy(pd->media_settings);
+  if (pd->channels)
+    stp_free(pd->channels);
+  if (pd->split_channels)
+    stp_free(pd->split_channels);
+  if (pd->comp_buf)
+    stp_free(pd->comp_buf);
   stp_free(pd);
 
   return status;
@@ -4019,7 +4190,7 @@ static const stp_printfuncs_t print_escp2_printfuncs =
 {
   escp2_list_parameters,
   escp2_parameters,
-  stp_default_media_size,
+  escp2_media_size,
   escp2_imageable_area,
   escp2_maximum_imageable_area,
   escp2_limit,
diff --git a/src/main/print-escp2.h b/src/main/print-escp2.h
index 622b0ab..c4a8ef9 100644
--- a/src/main/print-escp2.h
+++ b/src/main/print-escp2.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-escp2.h,v 1.117 2008/01/19 21:08:45 rlk Exp $"
+ * "$Id: print-escp2.h,v 1.132 2008/07/11 01:24:25 rlk Exp $"
  *
  *   Print plug-in EPSON ESC/P2 driver for the GIMP.
  *
@@ -44,35 +44,6 @@
 typedef unsigned long model_cap_t;
 typedef unsigned long model_featureset_t;
 
-
-#define RES_LOW		 0
-#define RES_360		 1
-#define RES_720_360	 2
-#define RES_720		 3
-#define RES_1440_720	 4
-#define RES_2880_720	 5
-#define RES_2880_1440	 6
-#define RES_2880_2880	 7
-#define RES_5760_2880	 8
-#define RES_N		 9
-
-/*
- ****************************************************************
- *                                                              *
- * DROP SIZES                                                   *
- *                                                              *
- ****************************************************************
- */
-
-typedef struct
-{
-  const char *listname;
-  short numdropsizes;
-  double dropsizes[MAX_DROP_SIZES];
-} escp2_dropsize_t;
-
-typedef const escp2_dropsize_t *escp2_drop_list_t[RES_N];
-
 /*
  ****************************************************************
  *                                                              *
@@ -81,32 +52,6 @@ typedef const escp2_dropsize_t *escp2_drop_list_t[RES_N];
  ****************************************************************
  */
 
-typedef struct
-{
-  const char *name;
-  float base_density;
-  float subchannel_cutoff;
-  float k_transition;
-  float k_lower;
-  float k_upper;
-  float cyan;
-  float magenta;
-  float yellow;
-  float black;
-  float saturation;
-  float gamma;
-  const char *hue_adjustment;
-  const char *lum_adjustment;
-  const char *sat_adjustment;
-} paper_adjustment_t;
-
-typedef struct
-{
-  const char *listname;
-  short paper_count;
-  const paper_adjustment_t *papers;
-} paper_adjustment_list_t;
-
 typedef enum
 {
   PAPER_PLAIN         = 0x01,
@@ -118,25 +63,15 @@ typedef enum
 
 typedef struct
 {
+  const char *cname;
   const char *name;
   const char *text;
   paper_class_t paper_class;
-  short paper_feed_sequence;
-  short platen_gap;
-  short feed_adjustment;
-  short vacuum_intensity;
-  short paper_thickness;
   const char *preferred_ink_type;
   const char *preferred_ink_set;
+  stp_vars_t *v;
 } paper_t;
 
-typedef struct
-{
-  const char *listname;
-  short paper_count;
-  const paper_t *papers;
-} paperlist_t;
-
 
 /*
  ****************************************************************
@@ -146,21 +81,67 @@ typedef struct
  ****************************************************************
  */
 
+/* Drop sizes are grouped under resolution because each resolution
+   has different drop sizes. */
+typedef struct
+{
+  short numdropsizes;
+  double dropsizes[MAX_DROP_SIZES];
+} escp2_dropsize_t;
+
 typedef struct
 {
   const char *name;
   const char *text;
   short hres;
   short vres;
-  short virtual_hres;
-  short virtual_vres;
   short printed_hres;
   short printed_vres;
-  short softweave;
-  short printer_weave;
   short vertical_passes;
+  stp_raw_t *command;
+  stp_vars_t *v;
 } res_t;
 
+typedef struct
+{
+  char *name;
+  res_t *resolutions;
+  size_t n_resolutions;
+} resolution_list_t;
+
+typedef struct
+{
+  char *name;
+  char *text;
+  short min_hres;
+  short min_vres;
+  short max_hres;
+  short max_vres;
+  short desired_hres;
+  short desired_vres;
+} quality_t;
+
+typedef struct
+{
+  char *name;
+  quality_t *qualities;
+  size_t n_quals;
+} quality_list_t;
+
+typedef struct
+{
+  char *name;
+  char *text;
+  stp_raw_t *command;
+} printer_weave_t;
+
+typedef struct
+{
+  char *name;
+  size_t n_printer_weaves;
+  printer_weave_t *printer_weaves;
+} printer_weave_list_t;
+
 
 /*
  ****************************************************************
@@ -180,22 +161,16 @@ typedef struct
   const char *subchannel_transition;
   const char *subchannel_value;
   const char *subchannel_scale;
-  const short split_channels[PHYSICAL_CHANNEL_LIMIT];
+  short *split_channels;
 } physical_subchannel_t;
 
 typedef struct
 {
-  const char *curve_name;
-  const char *curve;
-  stp_curve_t *curve_impl;
-} hue_curve_t;
-
-typedef struct
-{
-  const char *listname;
-  const physical_subchannel_t *subchannels;
+  const char *name;
   short n_subchannels;
-  hue_curve_t *hue_curve;
+  physical_subchannel_t *subchannels;
+  const char *hue_curve_name;
+  stp_curve_t *hue_curve;
 } ink_channel_t;
 
 typedef enum
@@ -205,179 +180,91 @@ typedef enum
   INKSET_CcMmYyK          = 2,
   INKSET_CcMmYKk          = 3,
   INKSET_QUADTONE         = 4,
-  INKSET_CMYKRB		  = 5,
+  INKSET_OTHER		  = 5,
   INKSET_EXTENDED	  = 6
 } inkset_id_t;
 
 typedef struct
 {
   const char *name;
-  const ink_channel_t *const *channels;
-  const ink_channel_t *const *aux_channels;
+  const char *text;
   short channel_count;
   short aux_channel_count;
-} channel_set_t;
-
-typedef struct
-{
-  const char *name;
-  const char *text;
   inkset_id_t inkset;
-  const channel_set_t *channel_set;
-} escp2_inkname_t;
+  ink_channel_t *channels;
+  ink_channel_t *aux_channels;
+} inkname_t;
 
 typedef struct
 {
   int n_shades;
-  double shades[PHYSICAL_CHANNEL_LIMIT];
+  double *shades;
 } shade_t;
 
-typedef shade_t shade_set_t[PHYSICAL_CHANNEL_LIMIT];
-
 typedef struct
 {
   const char *name;
   const char *text;
-  const escp2_inkname_t *const *inknames;
-  const char *papers;
-  const char *paper_adjustments;
-  const shade_set_t *shades;
+  short n_shades;
   short n_inks;
+  shade_t *shades;
+  inkname_t *inknames;
 } inklist_t;
 
 typedef struct
 {
-  const char *listname;
-  const inklist_t *const *inklists;
+  const char *name;
   short n_inklists;
+  inklist_t *inklists;
 } inkgroup_t;
-
-typedef struct
-{
-  const char *listname;
-  int count;
-  const char *const *names;
-} channel_name_t;
     
 
 /*
  ****************************************************************
  *                                                              *
- * MISCELLANEOUS                                                *
+ * INPUT SLOTS                                                  *
  *                                                              *
  ****************************************************************
  */
 
-/*
- * For each printer, we can select from a variety of dot sizes.
- * For single dot size printers, the available sizes are usually 0,
- * which is the "default", and some subset of 1-4.  For simple variable
- * dot size printers (with only one kind of variable dot size), the
- * variable dot size is specified as 0x10.  For newer printers, there
- * is a choice of variable dot sizes available, 0x10, 0x11, and 0x12 in
- * order of increasing size.
- *
- * Normally, we want to specify the smallest dot size that lets us achieve
- * a density of less than .8 or thereabouts (above that we start to get
- * some dither artifacts).  This needs to be tested for each printer and
- * resolution.
- *
- * An entry of -1 in a slot means that this resolution is not available.
- */
-
-typedef short escp2_dot_size_t[RES_N];
-
-/*
- * Choose the number of bits to use at each resolution.
- */
-
-typedef short escp2_bits_t[RES_N];
-
-/*
- * Choose the base resolution to use at each resolution.
- */
-
-typedef short escp2_base_resolutions_t[RES_N];
-
-/*
- * Specify the base density for each available resolution.
- * This obviously depends upon the dot size.
- */
-
-typedef float escp2_densities_t[RES_N];
-
 #define ROLL_FEED_CUT_ALL (1)
 #define ROLL_FEED_CUT_LAST (2)
 #define ROLL_FEED_DONT_EJECT (4)
 
+#define DUPLEX_NO_TUMBLE (1)
+#define DUPLEX_TUMBLE (2)
+
 typedef struct
 {
   const char *name;
   const char *text;
   short is_cd;
   short is_roll_feed;
+  short duplex;
   unsigned roll_feed_cut_flags;
-  const stp_raw_t init_sequence;
-  const stp_raw_t deinit_sequence;
+  const stp_raw_t *init_sequence;
+  const stp_raw_t *deinit_sequence;
 } input_slot_t;
 
-typedef struct
-{
-  const char *name;
-  const input_slot_t *slots;
-  size_t n_input_slots;
-} input_slot_list_t;
-
-typedef struct
-{
-  const char *name;
-  const char *text;
-  short min_hres;
-  short min_vres;
-  short max_hres;
-  short max_vres;
-  short desired_hres;
-  short desired_vres;
-} quality_t;
-
-typedef struct
-{
-  const char *name;
-  const quality_t *qualities;
-  size_t n_quals;
-} quality_list_t;
-
-typedef enum
-{
-  AUTO_MODE_QUALITY,
-  AUTO_MODE_MANUAL
-} auto_mode_t;
-
-typedef struct
-{
-  const char *name;
-  const char *text;
-  short value;
-} printer_weave_t;
-
-typedef struct
-{
-  const char *name;
-  size_t n_printer_weaves;
-  const printer_weave_t *printer_weaves;
-} printer_weave_list_t;
+/*
+ ****************************************************************
+ *                                                              *
+ * FLAGS                                                        *
+ *                                                              *
+ ****************************************************************
+ */
 
 #define MODEL_COMMAND_MASK	0xful /* What general command set does */
-#define MODEL_COMMAND_1998	0x0ul
-#define MODEL_COMMAND_1999	0x1ul /* The 1999 series printers */
-#define MODEL_COMMAND_2000	0x2ul /* The 2000 series printers */
+#define MODEL_COMMAND_1998	0x0ul /* Old (ESC .) printers */
+#define MODEL_COMMAND_1999	0x1ul /* ESC i printers w/o extended ESC(c */
+#define MODEL_COMMAND_2000	0x2ul /* ESC i printers with extended ESC(c */
 #define MODEL_COMMAND_PRO	0x3ul /* Stylus Pro printers */
 
 #define MODEL_ZEROMARGIN_MASK	0x30ul /* Does this printer support */
 #define MODEL_ZEROMARGIN_NO	0x00ul /* zero margin mode? */
-#define MODEL_ZEROMARGIN_YES	0x10ul /* (print to edge of the paper) */
-#define MODEL_ZEROMARGIN_FULL	0x20ul /* (print to edge of the paper) */
-#define MODEL_ZEROMARGIN_H_ONLY	0x30ul /* (print to edge of the paper) */
+#define MODEL_ZEROMARGIN_YES	0x10ul /* (print beyond bottom of page) */
+#define MODEL_ZEROMARGIN_FULL	0x20ul /* (do not print beyond bottom) */
+#define MODEL_ZEROMARGIN_H_ONLY	0x30ul /* (no special treatment for vertical) */
 
 #define MODEL_VARIABLE_DOT_MASK	0x40ul /* Does this printer support var */
 #define MODEL_VARIABLE_NO	0x00ul /* dot size printing? The newest */
@@ -387,33 +274,29 @@ typedef struct
 #define MODEL_GRAYMODE_NO	0x00ul /* fast black printing? */
 #define MODEL_GRAYMODE_YES	0x80ul
 
-#define MODEL_VACUUM_MASK	0x100ul
-#define MODEL_VACUUM_NO		0x000ul
-#define MODEL_VACUUM_YES	0x100ul
-
-#define MODEL_FAST_360_MASK	0x200ul
+#define MODEL_FAST_360_MASK	0x100ul
 #define MODEL_FAST_360_NO	0x000ul
-#define MODEL_FAST_360_YES	0x200ul
+#define MODEL_FAST_360_YES	0x100ul
 
-#define MODEL_SEND_ZERO_ADVANCE_MASK	0x400ul
+#define MODEL_SEND_ZERO_ADVANCE_MASK	0x200ul
 #define MODEL_SEND_ZERO_ADVANCE_NO	0x000ul
-#define MODEL_SEND_ZERO_ADVANCE_YES	0x400ul
+#define MODEL_SEND_ZERO_ADVANCE_YES	0x200ul
 
-#define MODEL_SUPPORTS_INK_CHANGE_MASK	0x800ul
+#define MODEL_SUPPORTS_INK_CHANGE_MASK	0x400ul
 #define MODEL_SUPPORTS_INK_CHANGE_NO	0x000ul
-#define MODEL_SUPPORTS_INK_CHANGE_YES	0x800ul
+#define MODEL_SUPPORTS_INK_CHANGE_YES	0x400ul
 
-#define MODEL_PACKET_MODE_MASK	0x1000ul
-#define MODEL_PACKET_MODE_NO	0x0000ul
-#define MODEL_PACKET_MODE_YES	0x1000ul
+#define MODEL_PACKET_MODE_MASK	0x800ul
+#define MODEL_PACKET_MODE_NO	0x000ul
+#define MODEL_PACKET_MODE_YES	0x800ul
 
-#define MODEL_INTERCHANGEABLE_INK_MASK	0x2000ul
+#define MODEL_INTERCHANGEABLE_INK_MASK	0x1000ul
 #define MODEL_INTERCHANGEABLE_INK_NO	0x0000ul
-#define MODEL_INTERCHANGEABLE_INK_YES	0x2000ul
+#define MODEL_INTERCHANGEABLE_INK_YES	0x1000ul
 
-#define MODEL_ENVELOPE_LANDSCAPE_MASK	0x4000ul
+#define MODEL_ENVELOPE_LANDSCAPE_MASK	0x2000ul
 #define MODEL_ENVELOPE_LANDSCAPE_NO	0x0000ul
-#define MODEL_ENVELOPE_LANDSCAPE_YES	0x4000ul
+#define MODEL_ENVELOPE_LANDSCAPE_YES	0x2000ul
 
 typedef enum
 {
@@ -421,7 +304,6 @@ typedef enum
   MODEL_ZEROMARGIN,
   MODEL_VARIABLE_DOT,
   MODEL_GRAYMODE,
-  MODEL_VACUUM,
   MODEL_FAST_360,
   MODEL_SEND_ZERO_ADVANCE,
   MODEL_SUPPORTS_INK_CHANGE,
@@ -433,17 +315,22 @@ typedef enum
 
 typedef struct escp2_printer
 {
+  int		active;
+/*****************************************************************************/
   model_cap_t	flags;		/* Bitmask of flags, see above */
 /*****************************************************************************/
   /* Basic head configuration */
   short		nozzles;	/* Number of nozzles per color */
   short		min_nozzles;	/* Minimum number of nozzles per color */
+  short		nozzle_start;	/* Starting usable nozzle */
   short		nozzle_separation; /* Separation between rows, in 1/360" */
   short		black_nozzles;	/* Number of black nozzles (may be extra) */
   short		min_black_nozzles;	/* # of black nozzles (may be extra) */
+  short		black_nozzle_start;	/* Starting usable nozzle */
   short		black_nozzle_separation; /* Separation between rows */
   short		fast_nozzles;	/* Number of fast nozzles */
   short		min_fast_nozzles;	/* # of fast nozzles (may be extra) */
+  short		fast_nozzle_start;	/* Starting usable nozzle */
   short		fast_nozzle_separation; /* Separation between rows */
   short		physical_channels; /* Number of ink channels */
 /*****************************************************************************/
@@ -528,39 +415,73 @@ typedef struct escp2_printer
   short		alternate_alignment_passes;
   short		alternate_alignment_choices;
 /*****************************************************************************/
-  const short *dot_sizes;	/* Vector of dot sizes for resolutions */
-  const float *densities;	/* List of densities for each printer */
-  const char *drops; /* Drop sizes */
-/*****************************************************************************/
-  const char *reslist;
-  const char *inkgroup;
-/*****************************************************************************/
-  const short *bits;
-  const short *base_resolutions;
-  const char *input_slots;
-/*****************************************************************************/
-  const char *quality_list;
-  const stp_raw_t *preinit_sequence;
-  const stp_raw_t *postinit_remote_sequence;
-/*****************************************************************************/
-  const stp_raw_t *vertical_borderless_sequence;
-  const char *const printer_weaves;
-  const char *channel_names;
+  stp_raw_t *preinit_sequence;
+  stp_raw_t *preinit_remote_sequence;
+  stp_raw_t *postinit_sequence;
+  stp_raw_t *postinit_remote_sequence;
+  stp_raw_t *vertical_borderless_sequence;
+/*****************/
+  stp_mxml_node_t *media;
+  stp_list_t *media_cache;
+  stp_string_list_t *papers;
+/*****************/
+  stp_mxml_node_t *slots;
+  stp_list_t *slots_cache;
+  stp_string_list_t *input_slots;
+/*****************/
+  stp_mxml_node_t *media_sizes;
+/*****************/
+  stp_string_list_t *channel_names;
+/*****************/
+  resolution_list_t *resolutions;
+/*****************/
+  printer_weave_list_t *printer_weaves;
+/*****************/
+  quality_list_t *quality_list;
+/*****************/
+  inkgroup_t *inkgroup;
 } stpi_escp2_printer_t;
 
-extern const stpi_escp2_printer_t stpi_escp2_model_capabilities[];
-extern const int stpi_escp2_model_limit;
+/* From escp2-channels.c: */
+
+extern const inkname_t *stpi_escp2_get_default_black_inkset(void);
+extern int stp_escp2_load_inkgroup(const stp_vars_t *v, const char *name);
+
+/* From escp2-papers.c: */
+extern int stp_escp2_load_media(const stp_vars_t *v, const char *name);
+extern int stp_escp2_has_media_feature(const stp_vars_t *v, const char *name);
+extern const paper_t *stp_escp2_get_default_media_type(const stp_vars_t *v);
+extern const paper_t *stp_escp2_get_media_type(const stp_vars_t *v, int ignore_res);
+extern int stp_escp2_printer_supports_rollfeed(const stp_vars_t *v);
+extern int stp_escp2_printer_supports_print_to_cd(const stp_vars_t *v);
+extern int stp_escp2_printer_supports_duplex(const stp_vars_t *v);
+
+extern int stp_escp2_load_input_slots(const stp_vars_t *v, const char *name);
+extern const input_slot_t *stp_escp2_get_input_slot(const stp_vars_t *v);
+
+extern int stp_escp2_load_media_sizes(const stp_vars_t *v, const char *name);
+extern void stp_escp2_set_media_size(stp_vars_t *v, const stp_vars_t *src);
+
+/* From escp2-resolutions.c: */
+extern int stp_escp2_load_resolutions(const stp_vars_t *v, const char *name);
+extern int stp_escp2_load_resolutions_from_xml(const stp_vars_t *v, stp_mxml_node_t *node);
+extern int stp_escp2_load_printer_weaves(const stp_vars_t *v, const char *name);
+extern int stp_escp2_load_printer_weaves_from_xml(const stp_vars_t *v, stp_mxml_node_t *node);
+extern int stp_escp2_load_quality_presets(const stp_vars_t *v, const char *name);
+extern int stp_escp2_load_quality_presets_from_xml(const stp_vars_t *v, stp_mxml_node_t *node);
+
+/* From print-escp2.c: */
+extern const res_t *stp_escp2_find_resolution(const stp_vars_t *v);
+extern const inklist_t *stp_escp2_inklist(const stp_vars_t *v);
+
+/* From print-escp2-data.c: */
+extern void stp_escp2_load_model(const stp_vars_t *v, int model);
+extern stpi_escp2_printer_t *stp_escp2_get_printer(const stp_vars_t *v);
+extern model_featureset_t stp_escp2_get_cap(const stp_vars_t *v,
+					    escp2_model_option_t feature);
+extern int stp_escp2_has_cap(const stp_vars_t *v, escp2_model_option_t feature,
+			     model_featureset_t class);
 
-extern const paper_adjustment_list_t *stpi_escp2_get_paper_adjustment_list_named(const char *);
-extern const paperlist_t *stpi_escp2_get_paperlist_named(const char *);
-extern const quality_list_t *stpi_escp2_get_quality_list_named(const char *);
-extern const escp2_inkname_t *stpi_escp2_get_default_black_inkset(void);
-extern const inkgroup_t *stpi_escp2_get_inkgroup_named(const char *);
-extern const input_slot_list_t *stpi_escp2_get_input_slot_list_named(const char *);
-extern const res_t *const *stpi_escp2_get_reslist_named(const char *);
-extern const escp2_drop_list_t *stpi_escp2_get_drop_list_named(const char *);
-extern const printer_weave_list_t *stpi_escp2_get_printer_weaves_named(const char *);
-extern const channel_name_t *stpi_escp2_get_channel_names_named(const char *);
 
 typedef struct
 {
@@ -568,6 +489,7 @@ typedef struct
   int nozzles;			/* Number of nozzles */
   int min_nozzles;		/* Fewest nozzles we're allowed to use */
   int nozzle_separation;	/* Nozzle separation, in dots */
+  int nozzle_start;		/* First usable nozzle */
   int *head_offset;		/* Head offset (for C80-type printers) */
   int max_head_offset;		/* Largest head offset */
   int page_management_units;	/* Page management units (dpi) */
@@ -577,15 +499,14 @@ typedef struct
   int unit_scale;		/* Scale factor for units */
   int send_zero_pass_advance;	/* Send explicit command for zero advance */
   int zero_margin_offset;	/* Zero margin offset */
-  int split_channel_count;	/* For split black channels, like C120 */
-  int split_channel_width;	/* Linewidth for split black channels */
+  int split_channel_count;	/* For split channels, like C120 */
+  int split_channel_width;	/* Linewidth for split channels */
   short *split_channels;
 
   /* Ink parameters */
   int bitwidth;			/* Number of bits per ink drop */
   int drop_size;		/* ID of the drop size we're using */
-  int ink_resid;		/* Array index for the drop set we're using */
-  const escp2_inkname_t *inkname; /* Description of the ink set */
+  const inkname_t *inkname;	/* Description of the ink set */
   int use_aux_channels;		/* Use gloss channel */
 
   /* Ink channels */
@@ -603,29 +524,31 @@ typedef struct
   int use_extended_commands;	/* Do we use the extended commands? */
   const input_slot_t *input_slot; /* Input slot description */
   const paper_t *paper_type;	/* Paper type */
-  const paper_adjustment_t *paper_adjustment;	/* Paper adjustments */
+  stp_vars_t *media_settings;	/* Hardware media settings */
   const inkgroup_t *ink_group;	/* Which set of inks */
-  const stp_raw_t *init_sequence; /* Initialization sequence */
+  const stp_raw_t *preinit_sequence; /* Initialization sequence */
+  const stp_raw_t *preinit_remote_sequence; /* Initialization sequence */
   const stp_raw_t *deinit_sequence; /* De-initialization sequence */
+  const stp_raw_t *deinit_remote_sequence; /* De-initialization sequence */
   const stp_raw_t *borderless_sequence; /* Vertical borderless sequence */
   model_featureset_t command_set; /* Which command set this printer supports */
   int variable_dots;		/* Print supports variable dot sizes */
-  int has_vacuum;		/* Printer supports vacuum command */
   int has_graymode;		/* Printer supports fast grayscale mode */
   int base_separation;		/* Basic unit of separation */
   int resolution_scale;		/* Scale factor for ESC(D command */
-  int printing_resolution;	/* Printing resolution for this resolution */
   int separation_rows;		/* Row separation scaling */
   int pseudo_separation_rows;	/* Special row separation for some printers */
   int extra_720dpi_separation;	/* Special separation needed at 720 DPI */
   int bidirectional_upper_limit; /* Max total resolution for auto-bidi */
+  int duplex;
+  int extra_vertical_feed;	/* Extra vertical feed */
 
   /* weave parameters */
   int horizontal_passes;	/* Number of horizontal passes required
 				   to print a complete row */
   int physical_xdpi;		/* Horizontal distance between dots in pass */
   const res_t *res;		/* Description of the printing resolution */
-  const printer_weave_t *printer_weave; /* Printer weave parameters */
+  const stp_raw_t *printer_weave; /* Printer weave parameters */
   int use_printer_weave;	/* Use the printer weaving mechanism */
 
   /* page parameters */		/* Indexed from top left */
@@ -686,5 +609,5 @@ extern void stpi_escp2_terminate_page(stp_vars_t *v);
 
 #endif /* GUTENPRINT_INTERNAL_ESCP2_H */
 /*
- * End of "$Id: print-escp2.h,v 1.117 2008/01/19 21:08:45 rlk Exp $".
+ * End of "$Id: print-escp2.h,v 1.132 2008/07/11 01:24:25 rlk Exp $".
  */
diff --git a/src/main/print-lexmark.c b/src/main/print-lexmark.c
index 005ed1e..1106fe7 100644
--- a/src/main/print-lexmark.c
+++ b/src/main/print-lexmark.c
@@ -1,6 +1,6 @@
 
 /*
- * "$Id: print-lexmark.c,v 1.155 2007/08/27 00:44:12 rlk Exp $"
+ * "$Id: print-lexmark.c,v 1.157 2008/07/24 00:15:33 rlk Exp $"
  *
  *   Print plug-in Lexmark driver for the GIMP.
  *
@@ -266,43 +266,43 @@ static const stp_parameter_t the_parameters[] =
     "PageSize", N_("Page Size"), N_("Basic Printer Setup"),
     N_("Size of the paper being printed to"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_CORE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "MediaType", N_("Media Type"), N_("Basic Printer Setup"),
     N_("Type of media (plain paper, photo paper, etc.)"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "InputSlot", N_("Media Source"), N_("Basic Printer Setup"),
     N_("Source (input slot) of the media"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "Resolution", N_("Resolution"), N_("Basic Printer Setup"),
     N_("Resolution and quality of the print"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "InkType", N_("Ink Type"), N_("Advanced Printer Setup"),
     N_("Type of ink in the printer"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "InkChannels", N_("Ink Channels"), N_("Advanced Printer Functionality"),
     N_("Ink Channels"),
     STP_PARAMETER_TYPE_INT, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_INTERNAL, 0, 0, -1, 0, 0
+    STP_PARAMETER_LEVEL_INTERNAL, 0, 0, STP_CHANNEL_NONE, 0, 0
   },
   {
     "PrintingMode", N_("Printing Mode"), N_("Core Parameter"),
     N_("Printing Output Mode"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_CORE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
 };
 
@@ -354,18 +354,18 @@ static const float_param_t float_parameters[] =
   },
   {
     {
-      "LightCyanTransition", N_("Light Cyan Transition"), N_("Advanced Ink Adjustment"),
+      "LightCyanTrans", N_("Light Cyan Transition"), N_("Advanced Ink Adjustment"),
       N_("Light Cyan Transition"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
-      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, -1, 1, 0
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
     }, 0.0, 5.0, 1.0, 1
   },
   {
     {
-      "LightMagentaTransition", N_("Light Magenta Transition"), N_("Advanced Ink Adjustment"),
+      "LightMagentaTrans", N_("Light Magenta Transition"), N_("Advanced Ink Adjustment"),
       N_("Light Magenta Transition"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
-      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, -1, 1, 0
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
     }, 0.0, 5.0, 1.0, 1
   },
 };    
@@ -2024,21 +2024,21 @@ densityDivisor /= 1.2;
       {
 	stp_channel_set_density_adjustment
 	  (v, STP_ECOLOR_C, 1, (get_double_param(v, "CyanDensity") *
-			    get_double_param(v, "LightCyanTransition") *
+			    get_double_param(v, "LightCyanTrans") *
 			    get_double_param(v, "Density")));
       }
     if (cols.p.M)
       {
 	stp_channel_set_density_adjustment
 	  (v, STP_ECOLOR_M, 1, (get_double_param(v, "MagentaDensity") *
-			    get_double_param(v, "LightMagentaTransition") *
+			    get_double_param(v, "LightMagentaTrans") *
 			    get_double_param(v, "Density")));
       }
     if (cols.p.Y)
       {
 	stp_channel_set_density_adjustment
 	  (v, STP_ECOLOR_Y, 1, (get_double_param(v, "YellowDensity") *
-			    get_double_param(v, "LightYellowTransition") *
+			    get_double_param(v, "LightYellowTrans") *
 			    get_double_param(v, "Density")));
       }
   }
@@ -2624,8 +2624,6 @@ lexmark_write(const stp_vars_t *v,		/* I - Print file or command */
   }
 
   /* Send a line of raster graphics... */
-
-  return 0;
 }
 
 
diff --git a/src/main/print-olympus.c b/src/main/print-olympus.c
index 29c4f20..a0dc7e0 100644
--- a/src/main/print-olympus.c
+++ b/src/main/print-olympus.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-olympus.c,v 1.83 2007/12/27 20:34:28 rlk Exp $"
+ * "$Id: print-olympus.c,v 1.89 2008/08/14 01:01:41 rlk Exp $"
  *
  *   Print plug-in DyeSub driver (formerly Olympus driver) for the GIMP.
  *
@@ -137,6 +137,8 @@ typedef struct {
   size_t n_items;
 } laminate_list_t;
 
+#define NPUTC_BUFSIZE (4096)
+
 typedef struct
 {
   int w_dpi, h_dpi;
@@ -147,6 +149,7 @@ typedef struct
   const char* pagesize;
   const laminate_t* laminate;
   int print_mode;
+  char nputc_buf[NPUTC_BUFSIZE];
 } dyesub_privdata_t;
 
 static dyesub_privdata_t privdata;
@@ -164,6 +167,7 @@ typedef struct {
   int imgh_px, imgw_px;
   int prnh_px, prnw_px, prnt_px, prnb_px, prnl_px, prnr_px;
   int print_mode;	/* portrait or landscape */
+  int image_rows;
 } dyesub_print_vars_t;
 
 typedef struct /* printer specific parameters */
@@ -970,7 +974,10 @@ static const dyesub_pagesize_t updp10_page[] =
 {
   { "w288h432", "UPC-10P23 (4x6)", -1, -1, 12, 12, 18, 18, DYESUB_LANDSCAPE},
   { "w288h387", "UPC-10P34 (4x5)", -1, 384, 12, 12, 16, 16, DYESUB_LANDSCAPE},
+#if 0
+  /* We can't have two paper sizes that are the same size --rlk 20080813 */
   { "w288h432", "UPC-10S01 (Sticker)", -1, -1, 12, 12, 18, 18, DYESUB_LANDSCAPE},
+#endif
   { "Custom", NULL, -1, -1, 12, 12, 0, 0, DYESUB_LANDSCAPE},
 };
 
@@ -1221,7 +1228,7 @@ static void updr150_printer_end_func(stp_vars_t *v)
 static const dyesub_pagesize_t cx400_page[] =
 {
   { "w288h432", NULL, 295, 428, 24, 24, 23, 22, DYESUB_PORTRAIT},
-  { "w288h387", "4x5 3/8 (Digital Camera 3:4)", 295, 386, 24, 24, 23, 23, DYESUB_PORTRAIT},
+  { "w288h387", "4x5 3/8", 295, 386, 24, 24, 23, 23, DYESUB_PORTRAIT},
   { "w288h504", NULL, 295, 513, 24, 24, 23, 22, DYESUB_PORTRAIT},
   { "Custom", NULL, 295, 428, 0, 0, 0, 0, DYESUB_PORTRAIT},
 };
@@ -1697,49 +1704,49 @@ static const stp_parameter_t the_parameters[] =
     "PageSize", N_("Page Size"), N_("Basic Printer Setup"),
     N_("Size of the paper being printed to"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_CORE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "MediaType", N_("Media Type"), N_("Basic Printer Setup"),
     N_("Type of media (plain paper, photo paper, etc.)"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "InputSlot", N_("Media Source"), N_("Basic Printer Setup"),
     N_("Source (input slot) of the media"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "Resolution", N_("Resolution"), N_("Basic Printer Setup"),
     N_("Resolution and quality of the print"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "InkType", N_("Ink Type"), N_("Advanced Printer Setup"),
     N_("Type of ink in the printer"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "Laminate", N_("Laminate Pattern"), N_("Advanced Printer Setup"),
     N_("Laminate Pattern"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 0, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 0, STP_CHANNEL_NONE, 1, 0
   },
   {
     "Borderless", N_("Borderless"), N_("Advanced Printer Setup"),
     N_("Print without borders"),
     STP_PARAMETER_TYPE_BOOLEAN, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 0, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 0, STP_CHANNEL_NONE, 1, 0
   },
   {
     "PrintingMode", N_("Printing Mode"), N_("Core Parameter"),
     N_("Printing Output Mode"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_CORE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
 };
 
@@ -2167,9 +2174,24 @@ dyesub_describe_output(const stp_vars_t *v)
 static void
 dyesub_nputc(stp_vars_t *v, char byte, int count)
 {
-  int i;
-  for (i = 0; i < count; i++)
+  if (count == 1)
     stp_putc(byte, v);
+  else
+    {
+      int i;
+      char *buf = privdata.nputc_buf;
+      int size = count;
+      int blocks = size / NPUTC_BUFSIZE;
+      int leftover = size % NPUTC_BUFSIZE;
+      if (size > NPUTC_BUFSIZE)
+	size = NPUTC_BUFSIZE;
+      (void) memset(buf, byte, size);
+      if (blocks)
+	for (i = 0; i < blocks; i++)
+	  stp_zfwrite(buf, size, 1, v);
+      if (leftover)
+	stp_zfwrite(buf, leftover, 1, v);
+    }
 }
 
 static void
@@ -2220,9 +2242,10 @@ dyesub_interpolate(int oldval, int oldsize, int newsize)
 }
 
 static void
-dyesub_free_image(unsigned short** image_data, stp_image_t *image)
+dyesub_free_image(dyesub_print_vars_t *pv, stp_image_t *image)
 {
-  int image_px_height = stp_image_height(image);
+  unsigned short** image_data = pv->image_data;
+  int image_px_height = pv->image_rows;
   int i;
 
   for (i = 0; i< image_px_height; i++)
@@ -2245,6 +2268,7 @@ dyesub_read_image(stp_vars_t *v,
   int i;
 
   image_data = stp_zalloc(image_px_height * sizeof(unsigned short *));
+  pv->image_rows = 0;
   if (!image_data)
     return NULL;	/* ? out of memory ? */
 
@@ -2255,22 +2279,21 @@ dyesub_read_image(stp_vars_t *v,
 	  stp_deprintf(STP_DBG_DYESUB,
 	  	"dyesub_read_image: "
 		"stp_color_get_row(..., %d, ...) == 0\n", i);
-	  dyesub_free_image(image_data, image);
+	  dyesub_free_image(pv, image);
 	  return NULL;
 	}	
       image_data[i] = stp_malloc(row_size);
+      pv->image_rows = i+1;
       if (!image_data[i])
         {
 	  stp_deprintf(STP_DBG_DYESUB,
 	  	"dyesub_read_image: "
 		"(image_data[%d] = stp_malloc()) == NULL\n", i);
-	  dyesub_free_image(image_data, image);
+	  dyesub_free_image(pv, image);
 	  return NULL;
 	}	
       memcpy(image_data[i], stp_channel_get_output(v), row_size);
     }
-  stp_image_conclude(image);
-
   return image_data;
 }
 
@@ -2449,6 +2472,7 @@ dyesub_do_print(stp_vars_t *v, stp_image_t *image)
       stp_eprintf(v, _("Print options not verified; cannot print.\n"));
       return 0;
     }
+  (void) memset(&pv, 0, sizeof(pv));
 
   stp_image_init(image);
   pv.imgw_px = stp_image_width(image);
@@ -2531,7 +2555,10 @@ dyesub_do_print(stp_vars_t *v, stp_image_t *image)
   pv.plane_interlacing = dyesub_feature(caps, DYESUB_FEATURE_PLANE_INTERLACE);
   pv.print_mode = page_mode;
   if (!pv.image_data)
-      return 2;	
+    {
+      stp_image_conclude(image);
+      return 2;
+    }
   /* /FIXME */
 
 
@@ -2540,7 +2567,6 @@ dyesub_do_print(stp_vars_t *v, stp_image_t *image)
   dyesub_adjust_curve(v, caps->adj_yellow, "YellowCurve");
   stp_set_float_parameter(v, "Density", 1.0);
 
-
   if (dyesub_feature(caps, DYESUB_FEATURE_FULL_HEIGHT))
     {
       pv.prnt_px = 0;
@@ -2611,7 +2637,8 @@ dyesub_do_print(stp_vars_t *v, stp_image_t *image)
   /* printer end */
   dyesub_exec(v, caps->printer_end_func, "caps->printer_end");
 
-  dyesub_free_image(pv.image_data, image);
+  dyesub_free_image(&pv, image);
+  stp_image_conclude(image);
   return status;
 }
 
diff --git a/src/main/print-papers.c b/src/main/print-papers.c
index 79dd59a..48ae5f8 100644
--- a/src/main/print-papers.c
+++ b/src/main/print-papers.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-papers.c,v 1.38 2008/01/15 03:48:46 rlk Exp $"
+ * "$Id: print-papers.c,v 1.41 2008/07/13 18:05:16 rlk Exp $"
  *
  *   Print plug-in driver utility functions for the GIMP.
  *
@@ -125,30 +125,6 @@ stpi_paper_create(stp_papersize_t *p)
   return 0;
 }
 
-static int
-stpi_paper_destroy(stp_papersize_t *p)
-{
-  stp_list_item_t *paper_item;
-  check_paperlist();
-
-  /* Check if paper exists */
-  paper_item = stp_list_get_start(paper_list);
-  while (paper_item)
-    {
-      const stp_papersize_t *ep = (const stp_papersize_t *)
-	stp_list_item_get_data(paper_item);
-      if (ep && !strcmp(p->name, ep->name))
-	{
-	  stp_list_item_destroy (paper_list, paper_item);
-	  return 0;
-	}
-      paper_item = stp_list_item_next(paper_item);
-    }
-  /* Paper did not exist */
-  return 1;
-}
-
-
 int
 stp_known_papersizes(void)
 {
@@ -187,7 +163,7 @@ paper_size_mismatch(int l, int w, const stp_papersize_t *val)
 {
   int hdiff = abs(l - (int) val->height);
   int vdiff = abs(w - (int) val->width);
-  return hdiff + vdiff;
+  return hdiff > vdiff ? hdiff : vdiff;
 }
 
 const stp_papersize_t *
@@ -203,11 +179,17 @@ stp_get_papersize_by_size(int l, int w)
       val = stp_get_papersize_by_index(i);
 
       if (val->width == w && val->height == l)
-	return val;
+	{
+	  if (val->top == 0 && val->left == 0 &&
+	      val->bottom == 0 && val->right == 0)
+	    return val;
+	  else
+	    ref = val;
+	}
       else
 	{
 	  int myscore = paper_size_mismatch(l, w, val);
-	  if (myscore < score && myscore < 20)
+	  if (myscore < score && myscore < 5)
 	    {
 	      ref = val;
 	      score = myscore;
@@ -217,6 +199,29 @@ stp_get_papersize_by_size(int l, int w)
   return ref;
 }
 
+const stp_papersize_t *
+stp_get_papersize_by_size_exact(int l, int w)
+{
+  const stp_papersize_t *ref = NULL;
+  const stp_papersize_t *val = NULL;
+  int i;
+  int sizes = stp_known_papersizes();
+  for (i = 0; i < sizes; i++)
+    {
+      val = stp_get_papersize_by_index(i);
+
+      if (val->width == w && val->height == l)
+	{
+	  if (val->top == 0 && val->left == 0 &&
+	      val->bottom == 0 && val->right == 0)
+	    return val;
+	  else
+	    ref = val;
+	}
+    }
+  return ref;
+}
+
 void
 stp_default_media_size(const stp_vars_t *v,	/* I */
 		       int  *width,		/* O - Width in points */
diff --git a/src/main/print-pcl.c b/src/main/print-pcl.c
index 2455aa6..fa107cd 100644
--- a/src/main/print-pcl.c
+++ b/src/main/print-pcl.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-pcl.c,v 1.150 2008/04/26 01:15:11 rlk Exp $"
+ * "$Id: print-pcl.c,v 1.156 2008/08/06 22:49:05 rlk Exp $"
  *
  *   Print plug-in HP PCL driver for the GIMP.
  *
@@ -37,7 +37,6 @@
 #include <string.h>
 
 /* #define DEBUG */
-/* #define PCL_DEBUG_DISABLE_COMPRESSION */
 /* #define PCL_DEBUG_DISABLE_BLANKLINE_REMOVAL */
 
 /*
@@ -274,26 +273,16 @@ static const pcl_t pcl_resolutions[] =
 };
 #define NUM_RESOLUTIONS		(sizeof(pcl_resolutions) / sizeof (pcl_t))
 
-static void
-pcl_describe_resolution(const stp_vars_t *v, int *x, int *y)
+static const pcl_t pcl_qualities[] =
 {
-  int i;
-  const char *resolution = stp_get_string_parameter(v, "Resolution");
-  if (resolution)
-    {
-      for (i = 0; i < NUM_RESOLUTIONS; i++)
-	{
-	  if (!strcmp(resolution, pcl_resolutions[i].pcl_name))
-	    {
-	      *x = pcl_resolutions[i].p0;
-	      *y = pcl_resolutions[i].p1;
-	      return;
-	    }
-	}
-    }
-  *x = -1;
-  *y = -1;
-}
+    { "Draft", N_("Draft"), PCL_RES_150_150, 150, 150},
+    { "Standard", N_("Standard"), PCL_RES_300_300, 300, 300},
+    { "High", N_("High"), PCL_RES_600_600, 600, 600},
+    { "High", N_("Standard"), PCL_RES_600_300, 600, 300},
+    { "Photo", N_("Photo"), PCL_RES_1200_600, 1200, 600},
+    { "Photo", N_("Photo"), PCL_RES_2400_600, 2400, 600},
+};
+#define NUM_QUALITIES		(sizeof(pcl_qualities) / sizeof (pcl_t))
 
 typedef struct {
   int top_margin;
@@ -1264,49 +1253,55 @@ static const stp_parameter_t the_parameters[] =
     "PageSize", N_("Page Size"), N_("Basic Printer Setup"),
     N_("Size of the paper being printed to"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_CORE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "MediaType", N_("Media Type"), N_("Basic Printer Setup"),
     N_("Type of media (plain paper, photo paper, etc.)"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "InputSlot", N_("Media Source"), N_("Basic Printer Setup"),
     N_("Source (input slot) of the media"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
+  },
+  {
+    "Quality", N_("Print Quality"), N_("Basic Output Adjustment"),
+    N_("Print Quality"),
+    STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_FEATURE,
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 0, 0
   },
   {
     "Resolution", N_("Resolution"), N_("Basic Printer Setup"),
-    N_("Resolution and quality of the print"),
+    N_("Resolution of the print"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "InkType", N_("Ink Type"), N_("Advanced Printer Setup"),
     N_("Type of ink in the printer"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "InkChannels", N_("Ink Channels"), N_("Advanced Printer Functionality"),
     N_("Ink Channels"),
     STP_PARAMETER_TYPE_INT, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_INTERNAL, 0, 0, -1, 0, 0
+    STP_PARAMETER_LEVEL_INTERNAL, 0, 0, STP_CHANNEL_NONE, 0, 0
   },
   {
     "PrintingMode", N_("Printing Mode"), N_("Core Parameter"),
     N_("Printing Output Mode"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_CORE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "Duplex", N_("Double-Sided Printing"), N_("Basic Printer Setup"),
     N_("Duplex/Tumble Setting"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
 };
 
@@ -1358,18 +1353,18 @@ static const float_param_t float_parameters[] =
   },
   {
     {
-      "LightCyanTransition", N_("Light Cyan Transition"), N_("Advanced Ink Adjustment"),
+      "LightCyanTrans", N_("Light Cyan Transition"), N_("Advanced Ink Adjustment"),
       N_("Light Cyan Transition"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
-      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, -1, 1, 0
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
     }, 0.0, 5.0, 1.0, 1
   },
   {
     {
-      "LightMagentaTransition", N_("Light Magenta Transition"), N_("Advanced Ink Adjustment"),
+      "LightMagentaTrans", N_("Light Magenta Transition"), N_("Advanced Ink Adjustment"),
       N_("Light Magenta Transition"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
-      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, -1, 1, 0
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
     }, 0.0, 5.0, 1.0, 1
   },
 };
@@ -1492,6 +1487,51 @@ pcl_get_model_capabilities(int model)	/* I: Model */
 }
 
 /*
+ * Determine the current resolution based on quality and resolution settings
+ */
+
+static void
+pcl_describe_resolution(const stp_vars_t *v, int *x, int *y)
+{
+  int i;
+  int model = stp_get_model_id(v);
+  const char *resolution = stp_get_string_parameter(v, "Resolution");
+  const char *quality;
+  const pcl_cap_t *caps = NULL;
+  if (resolution)
+    {
+      for (i = 0; i < NUM_RESOLUTIONS; i++)
+	{
+	  if (!strcmp(resolution, pcl_resolutions[i].pcl_name))
+	    {
+	      *x = pcl_resolutions[i].p0;
+	      *y = pcl_resolutions[i].p1;
+	      return;
+	    }
+	}
+    }
+  quality = stp_get_string_parameter(v, "Quality");
+  caps = pcl_get_model_capabilities(model);
+  if (quality && strcmp(quality, "None") == 0)
+    quality = "Standard";
+  if (quality)
+    {
+      for (i = 0; i < NUM_QUALITIES; i++)
+	{
+	  if ((caps->resolutions & pcl_qualities[i].pcl_code) &&
+	      !strcmp(quality, pcl_qualities[i].pcl_name))
+	    {
+	      *x = pcl_qualities[i].p0;
+	      *y = pcl_qualities[i].p1;
+	      return;
+	    }
+	}
+    }
+  *x = -1;
+  *y = -1;
+}
+
+/*
  * Convert Media size name into PCL media code for printer
  */
 
@@ -1662,6 +1702,14 @@ pcl_parameters(const stp_vars_t *v, const char *name,
   stp_deprintf(STP_DBG_PCL, "Resolutions: %d\n", caps->resolutions);
   stp_deprintf(STP_DBG_PCL, "ColorType = %d, PrinterType = %d\n", caps->color_type, caps->stp_printer_type);
 
+  for (i = 0; i < the_parameter_count; i++)
+    if (strcmp(name, the_parameters[i].name) == 0)
+      {
+	stp_fill_parameter_settings(description, &(the_parameters[i]));
+	break;
+      }
+  description->deflt.str = NULL;
+
   for (i = 0; i < float_parameter_count; i++)
     if (strcmp(name, float_parameters[i].param.name) == 0)
       {
@@ -1670,15 +1718,8 @@ pcl_parameters(const stp_vars_t *v, const char *name,
 	description->deflt.dbl = float_parameters[i].defval;
 	description->bounds.dbl.upper = float_parameters[i].max;
 	description->bounds.dbl.lower = float_parameters[i].min;
-      }
-
-  for (i = 0; i < the_parameter_count; i++)
-    if (strcmp(name, the_parameters[i].name) == 0)
-      {
-	stp_fill_parameter_settings(description, &(the_parameters[i]));
 	break;
       }
-  description->deflt.str = NULL;
 
   if (strcmp(name, "PageSize") == 0)
     {
@@ -1735,15 +1776,11 @@ pcl_parameters(const stp_vars_t *v, const char *name,
   else if (strcmp(name, "Resolution") == 0)
   {
     description->bounds.str = stp_string_list_create();
-    description->deflt.str = NULL;
+    stp_string_list_add_string(description->bounds.str, "None", _("Default"));
+    description->deflt.str = "None";
     for (i = 0; i < NUM_RESOLUTIONS; i++)
       if (caps->resolutions & pcl_resolutions[i].pcl_code)
 	{
-	  if (pcl_resolutions[i].pcl_code >= PCL_RES_300_300 &&
-	      description->deflt.str == NULL)
-	    description->deflt.str =
-	      pcl_val_to_string(pcl_resolutions[i].pcl_code,
-				pcl_resolutions, NUM_RESOLUTIONS);
 	  stp_string_list_add_string
 	    (description->bounds.str,
 	     pcl_val_to_string(pcl_resolutions[i].pcl_code,
@@ -1751,8 +1788,31 @@ pcl_parameters(const stp_vars_t *v, const char *name,
 	     pcl_val_to_text(pcl_resolutions[i].pcl_code,
 			     pcl_resolutions, NUM_RESOLUTIONS));
 	}
-    if (description->deflt.str == NULL)
-      stp_erprintf("No default resolution set!\n");
+  }
+  else if (strcmp(name, "Quality") == 0)
+  {
+    int has_standard_quality = 0;
+    description->bounds.str = stp_string_list_create();
+    stp_string_list_add_string(description->bounds.str, "None",
+			       _("Manual Control"));
+    for (i = 0; i < NUM_QUALITIES; i++)
+      if (caps->resolutions & pcl_qualities[i].pcl_code)
+	{
+	  const char *qual =
+	    pcl_val_to_string(pcl_qualities[i].pcl_code,
+			      pcl_qualities, NUM_QUALITIES);
+	  if (! stp_string_list_is_present(description->bounds.str, qual))
+	    stp_string_list_add_string
+	      (description->bounds.str, qual,
+	       pcl_val_to_text(pcl_qualities[i].pcl_code,
+			       pcl_qualities, NUM_QUALITIES));
+	  if (strcmp(qual, "Standard") == 0)
+	    has_standard_quality = 1;
+	}
+    if (has_standard_quality)
+      description->deflt.str = "Standard";
+    else
+      description->deflt.str = "None";
   }
   else if (strcmp(name, "InkType") == 0)
   {
@@ -1815,8 +1875,8 @@ pcl_parameters(const stp_vars_t *v, const char *name,
       else
 	description->is_active = 0;
     }
-  else if (strcmp(name, "LightCyanTransition") == 0 ||
-	   strcmp(name, "LightMagentaTransition") == 0)
+  else if (strcmp(name, "LightCyanTrans") == 0 ||
+	   strcmp(name, "LightMagentaTrans") == 0)
     {
       if (caps->color_type & PCL_COLOR_CMYKcm &&
 	  stp_check_string_parameter(v, "PrintingMode", STP_PARAMETER_DEFAULTED) &&
@@ -2100,11 +2160,9 @@ get_double_param(stp_vars_t *v, const char *param)
 static int
 pcl_do_print(stp_vars_t *v, stp_image_t *image)
 {
-  int i;
   pcl_privdata_t privdata;
   int		status = 1;
   int		model = stp_get_model_id(v);
-  const char	*resolution = stp_get_string_parameter(v, "Resolution");
   const char	*media_size = stp_get_string_parameter(v, "PageSize");
   const char	*media_type = stp_get_string_parameter(v, "MediaType");
   const char	*media_source = stp_get_string_parameter(v, "InputSlot");
@@ -2175,24 +2233,14 @@ pcl_do_print(stp_vars_t *v, stp_image_t *image)
   * Figure out the output resolution...
   */
 
-  xdpi = 0;
-  ydpi = 0;
-  if (resolution)
-    {
-      for (i = 0; i < NUM_RESOLUTIONS; i++)
-	{
-	  if (!strcmp(resolution, pcl_resolutions[i].pcl_name))
-	    {
-	      xdpi = pcl_resolutions[i].p0;
-	      ydpi = pcl_resolutions[i].p1;
-	      break;
-	    }
-	}
-    }
+  pcl_describe_resolution(v, &xdpi, &ydpi);
 
   stp_deprintf(STP_DBG_PCL,"pcl: resolution=%dx%d\n",xdpi,ydpi);
-  if (xdpi == 0 || ydpi == 0)
-    return 0;
+  if (xdpi <= 0 || ydpi <= 0)
+    {
+      stp_eprintf(v, "No resolution found; cannot print.\n");
+      return 0;
+    }
 
  /*
   * Choose the correct color conversion function...
@@ -2498,13 +2546,12 @@ pcl_do_print(stp_vars_t *v, stp_image_t *image)
     }
   }
 
-#ifndef PCL_DEBUG_DISABLE_COMPRESSION
-  if ((caps->stp_printer_type & PCL_PRINTER_TIFF) == PCL_PRINTER_TIFF)
+  if ((caps->stp_printer_type & PCL_PRINTER_TIFF) == PCL_PRINTER_TIFF &&
+      !(stp_get_debug_level() & STP_DBG_NO_COMPRESSION))
   {
     stp_puts("\033*b2M", v);			/* Mode 2 (TIFF) */
   }
   else
-#endif
   {
     stp_puts("\033*b0M", v);			/* Mode 0 (no compression) */
   }
@@ -2615,14 +2662,13 @@ pcl_do_print(stp_vars_t *v, stp_image_t *image)
 
 /* Allocate buffer for pcl_mode2 tiff compression */
 
-#ifndef PCL_DEBUG_DISABLE_COMPRESSION
-  if ((caps->stp_printer_type & PCL_PRINTER_TIFF) == PCL_PRINTER_TIFF)
+  if ((caps->stp_printer_type & PCL_PRINTER_TIFF) == PCL_PRINTER_TIFF &&
+      !(stp_get_debug_level() & STP_DBG_NO_COMPRESSION))
   {
     privdata.comp_buf = stp_malloc((privdata.height + 128 + 7) * 129 / 128);
     privdata.writefunc = pcl_mode2;
   }
   else
-#endif
   {
     privdata.comp_buf = NULL;
     privdata.writefunc = pcl_mode0;
@@ -2722,12 +2768,12 @@ pcl_do_print(stp_vars_t *v, stp_image_t *image)
   if (lcyan)
     stp_channel_set_density_adjustment
       (v, STP_ECOLOR_C, 1, (get_double_param(v, "CyanDensity") *
-			get_double_param(v, "LightCyanTransition") *
+			get_double_param(v, "LightCyanTrans") *
 			get_double_param(v, "Density")));
   if (lmagenta)
     stp_channel_set_density_adjustment
       (v, STP_ECOLOR_M, 1, (get_double_param(v, "MagentaDensity") *
-			get_double_param(v, "LightMagentaTransition") *
+			get_double_param(v, "LightMagentaTrans") *
 			get_double_param(v, "Density")));
 
 
diff --git a/src/main/print-ps.c b/src/main/print-ps.c
index c12bbc2..728718e 100644
--- a/src/main/print-ps.c
+++ b/src/main/print-ps.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-ps.c,v 1.99 2007/12/24 03:05:52 rlk Exp $"
+ * "$Id: print-ps.c,v 1.101 2008/08/18 02:00:18 rlk Exp $"
  *
  *   Print plug-in Adobe PostScript driver for the GIMP.
  *
@@ -68,19 +68,25 @@ static const stp_parameter_t the_parameters[] =
     "PPDFile", N_("PPDFile"), N_("Basic Printer Setup"),
     N_("PPD File"),
     STP_PARAMETER_TYPE_FILE, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
+  },
+  {
+    "PageSize", N_("Page Size"), N_("Basic Printer Setup"),
+    N_("Size of the paper being printed to"),
+    STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_CORE,
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "ModelName", N_("Model Name"), N_("Basic Printer Setup"),
     N_("PPD File Model Name"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_CORE,
-    STP_PARAMETER_LEVEL_INTERNAL, 0, 0, -1, 0, 0
+    STP_PARAMETER_LEVEL_INTERNAL, 0, 0, STP_CHANNEL_NONE, 0, 0
   },
   {
     "PrintingMode", N_("Printing Mode"), N_("Core Parameter"),
     N_("Printing Output Mode"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_CORE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
 };
 
@@ -182,6 +188,12 @@ ps_option_to_param(stp_parameter_t *param, stp_mxml_node_t *option)
  */
 
 static int
+ppd_whitespace_callback(stp_mxml_node_t *node, int where)
+{
+  return 0;
+}
+
+static int
 check_ppd_file(const stp_vars_t *v)
 {
   const char *ppd_file = stp_get_file_parameter(v, "PPDFile");
@@ -214,6 +226,12 @@ check_ppd_file(const stp_vars_t *v)
 	  stp_eprintf(v, "Unable to open PPD file %s\n", ppd_file);
 	  return 0;
 	}
+      if (stp_get_debug_level() & STP_DBG_PS)
+	{
+	  char *ppd_stuff = stp_mxmlSaveAllocString(m_ppd, ppd_whitespace_callback);
+	  stp_dprintf(STP_DBG_PS, v, "%s", ppd_stuff);
+	  stp_free(ppd_stuff);
+	}
 
       m_ppd_file = stp_strdup(ppd_file);
       return 1;
@@ -228,8 +246,8 @@ ps_list_parameters(const stp_vars_t *v)
   stp_mxml_node_t *option;
   int i;
   int status = check_ppd_file(v);
-  stp_dprintf(STP_DBG_PS, v, "Adding parameters from %s\n",
-	      m_ppd_file ? m_ppd_file : "(null)");
+  stp_dprintf(STP_DBG_PS, v, "Adding parameters from %s (%d)\n",
+	      m_ppd_file ? m_ppd_file : "(null)", status);
 
   for (i = 0; i < the_parameter_count; i++)
     stp_parameter_list_add_param(ret, &(the_parameters[i]));
@@ -237,6 +255,7 @@ ps_list_parameters(const stp_vars_t *v)
   if (status)
     {
       int num_options = stpi_xmlppd_find_option_count(m_ppd);
+      stp_dprintf(STP_DBG_PS, v, "Found %d parameters\n", num_options);
       for (i=0; i < num_options; i++)
 	{
 	  /* MEMORY LEAK!!! */
@@ -246,7 +265,8 @@ ps_list_parameters(const stp_vars_t *v)
 	    {
 	      ps_option_to_param(param, option);
 	      if (param->p_type != STP_PARAMETER_TYPE_INVALID &&
-		  strcmp(param->name, "PageRegion") != 0)
+		  strcmp(param->name, "PageRegion") != 0 &&
+		  strcmp(param->name, "PageSize") != 0)
 		{
 		  stp_dprintf(STP_DBG_PS, v, "Adding parameter %s %s\n",
 			      param->name, param->text);
@@ -288,17 +308,16 @@ ps_parameters_internal(const stp_vars_t *v, const char *name,
 	  description->is_active = 1;
 	else if (strcmp(name, "ModelName") == 0)
 	  {
+	    const char *nickname;
+	    description->bounds.str = stp_string_list_create();
 	    if (m_ppd && stp_mxmlElementGetAttr(m_ppd, "nickname"))
-	      {
-		const char *nickname = stp_mxmlElementGetAttr(m_ppd, "nickname");
-		description->bounds.str = stp_string_list_create();
-		stp_string_list_add_string(description->bounds.str,
-					   nickname, nickname);
-		description->deflt.str = nickname;
-		description->is_active = status;
-	      }
+	      nickname = stp_mxmlElementGetAttr(m_ppd, "nickname");
 	    else
-	      description->is_active = 0;
+	      nickname = _("None; please provide a PPD file");
+	    stp_string_list_add_string(description->bounds.str,
+				       nickname, nickname);
+	    description->deflt.str = nickname;
+	    description->is_active = 1;
 	    return;
 	  }
 	else if (strcmp(name, "PrintingMode") == 0)
@@ -321,20 +340,38 @@ ps_parameters_internal(const stp_vars_t *v, const char *name,
       }
   }
 
-  if (!status)
+  if (!status && strcmp(name, "PageSize") != 0)
     return;
   if ((option = stpi_xmlppd_find_option_named(m_ppd, name)) == NULL)
   {
-    char *tmp = stp_malloc(strlen(name) + 4);
-    strcpy(tmp, "Stp");
-    strncat(tmp, name, strlen(name) + 3);
-    if ((option = stpi_xmlppd_find_option_named(m_ppd, tmp)) == NULL)
+    if (strcmp(name, "PageSize") == 0)
       {
-	stp_dprintf(STP_DBG_PS, v, "no parameter %s", name);
-	stp_free(tmp);
+	/* Provide a default set of page sizes */
+	description->bounds.str = stp_string_list_create();
+	stp_string_list_add_string
+	  (description->bounds.str, "Letter", _("Letter"));
+	stp_string_list_add_string
+	  (description->bounds.str, "A4", _("A4"));
+	stp_string_list_add_string
+	  (description->bounds.str, "Custom", _("Custom"));
+	description->deflt.str =
+	  stp_string_list_param(description->bounds.str, 0)->name;
+	description->is_active = 1;
 	return;
       }
-    stp_free(tmp);
+    else
+      {
+	char *tmp = stp_malloc(strlen(name) + 4);
+	strcpy(tmp, "Stp");
+	strncat(tmp, name, strlen(name) + 3);
+	if ((option = stpi_xmlppd_find_option_named(m_ppd, tmp)) == NULL)
+	  {
+	    stp_dprintf(STP_DBG_PS, v, "no parameter %s", name);
+	    stp_free(tmp);
+	    return;
+	  }
+	stp_free(tmp);
+      }
   }
 
   ps_option_to_param(description, option);
diff --git a/src/main/print-raw.c b/src/main/print-raw.c
index c345ae1..5290390 100644
--- a/src/main/print-raw.c
+++ b/src/main/print-raw.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-raw.c,v 1.39 2007/08/27 00:44:12 rlk Exp $"
+ * "$Id: print-raw.c,v 1.41 2008/07/18 10:57:24 rlk Exp $"
  *
  *   Print plug-in RAW driver for the GIMP.
  *
@@ -80,13 +80,13 @@ static const stp_parameter_t the_parameters[] =
     "InkType", N_("Ink Type"), N_("Advanced Printer Setup"),
     N_("Type of ink in the printer"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "PrintingMode", N_("Printing Mode"), N_("Core Parameter"),
     N_("Printing Output Mode"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_CORE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
 };
 
@@ -210,18 +210,21 @@ raw_print(const stp_vars_t *v, stp_image_t *image)
   int ink_channels = 1;
   int rotate_output = 0;
   const char *ink_type = stp_get_string_parameter(nv, "InkType");
+  stp_image_init(image);
 
   stp_prune_inactive_options(nv);
   if (!stp_verify(nv))
     {
       stp_eprintf(nv, _("Print options not verified; cannot print.\n"));
       stp_vars_destroy(nv);
+      stp_image_conclude(image);
       return 0;
     }
   if (width != stp_image_width(image) || height != stp_image_height(image))
     {
       stp_eprintf(nv, _("Image dimensions must match paper dimensions"));
       stp_vars_destroy(nv);
+      stp_image_conclude(image);
       return 0;
     }
   if (ink_type)
@@ -251,6 +254,7 @@ raw_print(const stp_vars_t *v, stp_image_t *image)
     {
       stp_eprintf(nv, "Internal error!  Output channels or input channels must be 1\n");
       stp_vars_destroy(nv);
+      stp_image_conclude(image);
       return 0;
     }
 
diff --git a/src/main/print-util.c b/src/main/print-util.c
index ad4e4b9..3ab6959 100644
--- a/src/main/print-util.c
+++ b/src/main/print-util.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-util.c,v 1.115 2007/09/02 18:11:51 rlk Exp $"
+ * "$Id: print-util.c,v 1.116 2008/07/08 17:32:02 easysw Exp $"
  *
  *   Print plug-in driver utility functions for the GIMP.
  *
@@ -541,7 +541,7 @@ stp_strdup(const char *s)
 const char *
 stp_set_output_codeset(const char *codeset)
 {
-#ifdef ENABLE_NLS
+#if defined(ENABLE_NLS) && !defined(__APPLE__)
   return (const char *)(bind_textdomain_codeset(PACKAGE, codeset));
 #else
   return "US-ASCII";
diff --git a/src/main/print-vars.c b/src/main/print-vars.c
index ae0c8e4..368973b 100644
--- a/src/main/print-vars.c
+++ b/src/main/print-vars.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-vars.c,v 1.81 2008/03/05 14:08:35 rlk Exp $"
+ * "$Id: print-vars.c,v 1.89 2008/07/21 00:02:32 rlk Exp $"
  *
  *   Print plug-in driver utility functions for the GIMP.
  *
@@ -144,10 +144,10 @@ copy_to_raw(stp_raw_t *raw, const void *data, size_t bytes)
     {
       ndata = stp_malloc(bytes + 1);
       memcpy(ndata, data, bytes);
+      ndata[bytes] = '\0';
     }
   else
     bytes = 0;
-  ndata[bytes] = '\0';
   raw->data = (void *) ndata;
   raw->bytes = bytes;
 }
@@ -1197,25 +1197,70 @@ stp_scale_float_parameter(stp_vars_t *v, const char *parameter,
   stp_set_float_parameter(v, parameter, val * scale);
 }
 
-static int
-check_parameter_generic(const stp_vars_t *v, stp_parameter_type_t p_type,
-			const char *parameter, stp_parameter_activity_t active)
+void
+stp_clear_parameter(stp_vars_t *v, const char *parameter, stp_parameter_type_t type)
 {
-  const stp_list_t *list = v->params[p_type];
-  const stp_list_item_t *item = stp_list_get_item_by_name(list, parameter);
-  if (item &&
-      active <= ((const value_t *) stp_list_item_get_data(item))->active)
-    return 1;
-  else
-    return 0;
+  switch (type)
+    {
+    case STP_PARAMETER_TYPE_STRING_LIST:
+      stp_clear_string_parameter(v, parameter);
+      break;
+    case STP_PARAMETER_TYPE_FILE:
+      stp_clear_file_parameter(v, parameter);
+      break;
+    case STP_PARAMETER_TYPE_DOUBLE:
+      stp_clear_float_parameter(v, parameter);
+      break;
+    case STP_PARAMETER_TYPE_INT:
+      stp_clear_int_parameter(v, parameter);
+      break;
+    case STP_PARAMETER_TYPE_DIMENSION:
+      stp_clear_dimension_parameter(v, parameter);
+      break;
+    case STP_PARAMETER_TYPE_BOOLEAN:
+      stp_clear_boolean_parameter(v, parameter);
+      break;
+    case STP_PARAMETER_TYPE_CURVE:
+      stp_clear_curve_parameter(v, parameter);
+      break;
+    case STP_PARAMETER_TYPE_ARRAY:
+      stp_clear_array_parameter(v, parameter);
+      break;
+    case STP_PARAMETER_TYPE_RAW:
+      stp_clear_raw_parameter(v, parameter);
+      break;
+    default:
+      stp_eprintf(v, "Attempt to clear unknown type parameter!\n");
+    }
+}
+
+
+int
+stp_check_parameter(const stp_vars_t *v,
+		    const char *parameter,
+		    stp_parameter_activity_t active,
+		    stp_parameter_type_t p_type)
+{
+  if (p_type >= STP_PARAMETER_TYPE_STRING_LIST &&
+      p_type < STP_PARAMETER_TYPE_INVALID)
+    {
+      const stp_list_t *list = v->params[p_type];
+      const stp_list_item_t *item = stp_list_get_item_by_name(list, parameter);
+      if (item &&
+	  active <= ((const value_t *) stp_list_item_get_data(item))->active)
+	return 1;
+      else
+	return 0;
+    }
+  return 0;
 }
 
 #define CHECK_FUNCTION(type, index)					\
 int									\
-stp_check_##type##_parameter(const stp_vars_t *v, const char *parameter,	\
+stp_check_##type##_parameter(const stp_vars_t *v, const char *parameter, \
 			     stp_parameter_activity_t active)		\
 {									\
-  return check_parameter_generic(v, index, parameter, active);		\
+  return stp_check_parameter(v, parameter, active, index);		\
 }
 
 CHECK_FUNCTION(string, STP_PARAMETER_TYPE_STRING_LIST)
@@ -1228,23 +1273,65 @@ CHECK_FUNCTION(curve, STP_PARAMETER_TYPE_CURVE)
 CHECK_FUNCTION(array, STP_PARAMETER_TYPE_ARRAY)
 CHECK_FUNCTION(raw, STP_PARAMETER_TYPE_RAW)
 
-static stp_parameter_activity_t
-get_parameter_active_generic(const stp_vars_t *v, stp_parameter_type_t p_type,
-			     const char *parameter)
+stp_string_list_t *
+stp_list_parameters(const stp_vars_t *v, stp_parameter_type_t p_type)
 {
-  const stp_list_t *list = v->params[p_type];
-  const stp_list_item_t *item = stp_list_get_item_by_name(list, parameter);
-  if (item)
-    return ((const value_t *) stp_list_item_get_data(item))->active;
-  else
-    return 0;
+  if (p_type >= STP_PARAMETER_TYPE_STRING_LIST &&
+      p_type < STP_PARAMETER_TYPE_INVALID)
+    {
+      const stp_list_t *list = v->params[p_type];
+      stp_string_list_t *answer = stp_string_list_create();
+      const stp_list_item_t *li = stp_list_get_start(list);
+      while (li)
+	{
+	  const value_t *val = (value_t *) stp_list_item_get_data(li);
+	  stp_string_list_add_string(answer, val->name, val->name);
+	  li = stp_list_item_next(li);
+	}
+      return answer;
+    }
+  return NULL;
 }
 
-#define GET_PARAMETER_ACTIVE_FUNCTION(type, index)			     \
-stp_parameter_activity_t						     \
+#define LIST_FUNCTION(type, index)			\
+stp_string_list_t *					\
+stp_list_##type##_parameters(const stp_vars_t *v)	\
+{							\
+  return stp_list_parameters(v, index);			\
+}
+
+LIST_FUNCTION(string, STP_PARAMETER_TYPE_STRING_LIST)
+LIST_FUNCTION(file, STP_PARAMETER_TYPE_FILE)
+LIST_FUNCTION(float, STP_PARAMETER_TYPE_DOUBLE)
+LIST_FUNCTION(int, STP_PARAMETER_TYPE_INT)
+LIST_FUNCTION(dimension, STP_PARAMETER_TYPE_DIMENSION)
+LIST_FUNCTION(boolean, STP_PARAMETER_TYPE_BOOLEAN)
+LIST_FUNCTION(curve, STP_PARAMETER_TYPE_CURVE)
+LIST_FUNCTION(array, STP_PARAMETER_TYPE_ARRAY)
+LIST_FUNCTION(raw, STP_PARAMETER_TYPE_RAW)
+
+stp_parameter_activity_t
+stp_get_parameter_active(const stp_vars_t *v, const char *parameter,
+			 stp_parameter_type_t p_type)
+{
+  if (p_type >= STP_PARAMETER_TYPE_STRING_LIST &&
+      p_type < STP_PARAMETER_TYPE_INVALID)
+    {
+      const stp_list_t *list = v->params[p_type];
+      const stp_list_item_t *item = stp_list_get_item_by_name(list, parameter);
+      if (item)
+	return ((const value_t *) stp_list_item_get_data(item))->active;
+      else
+	return 0;
+    }
+  return 0;
+}
+
+#define GET_PARAMETER_ACTIVE_FUNCTION(type, index)			\
+stp_parameter_activity_t						\
 stp_get_##type##_parameter_active(const stp_vars_t *v, const char *parameter) \
-{									     \
-  return get_parameter_active_generic(v, index, parameter);		     \
+{									\
+  return stp_get_parameter_active(v, parameter, index);			\
 }
 
 GET_PARAMETER_ACTIVE_FUNCTION(string, STP_PARAMETER_TYPE_STRING_LIST)
@@ -1257,27 +1344,32 @@ GET_PARAMETER_ACTIVE_FUNCTION(curve, STP_PARAMETER_TYPE_CURVE)
 GET_PARAMETER_ACTIVE_FUNCTION(array, STP_PARAMETER_TYPE_ARRAY)
 GET_PARAMETER_ACTIVE_FUNCTION(raw, STP_PARAMETER_TYPE_RAW)
 
-static void
-set_parameter_active_generic(const stp_vars_t *v, stp_parameter_type_t p_type,
-			     const char *parameter,
-			     stp_parameter_activity_t active)
+void
+stp_set_parameter_active(stp_vars_t *v,
+			 const char *parameter,
+			 stp_parameter_activity_t active,
+			 stp_parameter_type_t p_type)
 {
-  const stp_list_t *list = v->params[p_type];
-  const stp_list_item_t *item = stp_list_get_item_by_name(list, parameter);
-  if (item && (active == STP_PARAMETER_ACTIVE ||
-	       active == STP_PARAMETER_INACTIVE))
-    ((value_t *) stp_list_item_get_data(item))->active = active;
+  if (p_type >= STP_PARAMETER_TYPE_STRING_LIST &&
+      p_type < STP_PARAMETER_TYPE_INVALID)
+    {
+      const stp_list_t *list = v->params[p_type];
+      const stp_list_item_t *item = stp_list_get_item_by_name(list, parameter);
+      if (item && (active == STP_PARAMETER_ACTIVE ||
+		   active == STP_PARAMETER_INACTIVE))
+	((value_t *) stp_list_item_get_data(item))->active = active;
+    }
 }
 
-#define SET_PARAMETER_ACTIVE_FUNCTION(type, index)			      \
-void									      \
-stp_set_##type##_parameter_active(const stp_vars_t *v, const char *parameter, \
-				  stp_parameter_activity_t active)	      \
-{									      \
-  stp_deprintf(STP_DBG_VARS,						      \
-	       "stp_set_%s_parameter_active(0x%p, %s, %d)\n",		      \
-	       #type, (const void *) v, parameter, active);			      \
-  set_parameter_active_generic(v, index, parameter, active);		      \
+#define SET_PARAMETER_ACTIVE_FUNCTION(type, index)			\
+void									\
+stp_set_##type##_parameter_active(stp_vars_t *v, const char *parameter, \
+				  stp_parameter_activity_t active)	\
+{									\
+  stp_deprintf(STP_DBG_VARS,						\
+	       "stp_set_%s_parameter_active(0x%p, %s, %d)\n",		\
+	       #type, (const void *) v, parameter, active);		\
+  stp_set_parameter_active(v, parameter, active, index);		\
 }
 
 SET_PARAMETER_ACTIVE_FUNCTION(string, STP_PARAMETER_TYPE_STRING_LIST)
@@ -1305,9 +1397,19 @@ stp_fill_parameter_settings(stp_parameter_t *desc,
       desc->verify_this_parameter = param->verify_this_parameter;
       desc->read_only = param->read_only;
       desc->name = param->name;
-      desc->text = _(param->text);
-      desc->category = _(param->category);
-      desc->help = _(param->help);
+      if (!(param->text))
+	{
+	  stp_erprintf("No text string for parameter %s!\n", desc->name);
+	  stp_abort();
+	}
+      desc->text = gettext(param->text);
+      if (!(param->category))
+	{
+	  stp_erprintf("No category string for parameter %s!\n", desc->name);
+	  stp_abort();
+	}
+      desc->category = gettext(param->category);
+      desc->help = param->help ? gettext(param->help) : NULL;
       return;
     }
 }
@@ -1609,3 +1711,375 @@ stp_parameter_list_append(stp_parameter_list_t list,
 	stp_list_item_create(ilist, NULL, param);
     }
 }
+
+static void
+fill_vars_from_xmltree(stp_mxml_node_t *prop, stp_mxml_node_t *root,
+		       stp_vars_t *v)
+{
+#ifdef HAVE_LOCALE_H
+  char *locale = stp_strdup(setlocale(LC_ALL, NULL));
+  setlocale(LC_ALL, "C");
+#endif
+  while (prop)
+    {
+      if (prop->type == STP_MXML_ELEMENT &&
+	  !strcmp(prop->value.element.name, "parameter") &&
+	  (prop->child || stp_mxmlElementGetAttr(prop, "name")))
+	{
+	  stp_mxml_node_t *child = prop->child;
+	  const char *prop_name = prop->value.element.name;
+	  const char *p_type = stp_mxmlElementGetAttr(prop, "type");
+	  const char *p_name = stp_mxmlElementGetAttr(prop, "name");
+	  if (!strcmp(prop_name, "parameter") && (!p_type || !p_name))
+	    stp_erprintf("Bad property found!\n");
+	  else if (!strcmp(prop_name, "parameter"))
+	    {
+	      const char *active = stp_mxmlElementGetAttr(prop, "active");
+	      const char *cref = stp_mxmlElementGetAttr(prop, "ref");
+	      stp_mxml_node_t *cnode = child;
+	      stp_parameter_type_t type = STP_PARAMETER_TYPE_INVALID;
+	      if (cref && root)
+		{
+		  cnode = stp_mxmlFindElement(root, root, "namedParam",
+					      "name", cref,
+					      STP_MXML_DESCEND);
+		  if (!cnode || cnode->type != STP_MXML_ELEMENT ||
+		      !(cnode->child))
+		    {
+		      stp_erprintf("Found parameter name %s type %s ref %s but no target!\n",
+				   p_name, p_type, cref);
+		      stp_abort();
+		    }
+		  else
+		    stp_deprintf(STP_DBG_XML, "Found parameter ref %s\n", cref);
+		  cnode = cnode->child;
+		}
+	      if (strcmp(p_type, "float") == 0)
+		{
+		  if (cnode->type == STP_MXML_TEXT)
+		    {
+		      stp_set_float_parameter
+			(v, p_name, stp_xmlstrtod(cnode->value.text.string));
+		      type = STP_PARAMETER_TYPE_DOUBLE;
+		      if (stp_get_debug_level() & STP_DBG_XML)
+			stp_deprintf(STP_DBG_XML, "  Set float '%s' to '%s' (%f)\n",
+				     p_name, cnode->value.text.string,
+				     stp_get_float_parameter(v, p_name));
+		    }
+		}
+	      else if (strcmp(p_type, "integer") == 0)
+		{
+		  if (cnode->type == STP_MXML_TEXT)
+		    {
+		      stp_set_int_parameter
+			(v, p_name, (int) stp_xmlstrtol(cnode->value.text.string));
+		      type = STP_PARAMETER_TYPE_DOUBLE;
+		      if (stp_get_debug_level() & STP_DBG_XML)
+			stp_deprintf(STP_DBG_XML, "  Set int '%s' to '%s' (%d)\n",
+				     p_name, cnode->value.text.string,
+				     stp_get_int_parameter(v, p_name));
+		    }
+		}
+	      else if (strcmp(p_type, "dimension") == 0)
+		{
+		  if (cnode->type == STP_MXML_TEXT)
+		    {
+		      stp_set_dimension_parameter
+			(v, p_name, (int) stp_xmlstrtol(cnode->value.text.string));
+		      type = STP_PARAMETER_TYPE_DOUBLE;
+		      if (stp_get_debug_level() & STP_DBG_XML)
+			stp_deprintf(STP_DBG_XML, "  Set dimension '%s' to '%s' (%d)\n",
+				     p_name, cnode->value.text.string,
+				     stp_get_dimension_parameter(v, p_name));
+		    }
+		}
+	      else if (strcmp(p_type, "boolean") == 0)
+		{
+		  if (cnode->type == STP_MXML_TEXT)
+		    {
+		      stp_set_boolean_parameter
+			(v, p_name, (int) stp_xmlstrtol(cnode->value.text.string));
+		      type = STP_PARAMETER_TYPE_DOUBLE;
+		      if (stp_get_debug_level() & STP_DBG_XML)
+			stp_deprintf(STP_DBG_XML, "  Set bool '%s' to '%s' (%d)\n",
+				     p_name, cnode->value.text.string,
+				     stp_get_boolean_parameter(v, p_name));
+		    }
+		}
+	      else if (strcmp(p_type, "string") == 0)
+		{
+		  if (cnode->type == STP_MXML_TEXT)
+		    {
+		      stp_set_string_parameter
+			(v, p_name, cnode->value.text.string);
+		      type = STP_PARAMETER_TYPE_DOUBLE;
+		      if (stp_get_debug_level() & STP_DBG_XML)
+			stp_deprintf(STP_DBG_XML, "  Set string '%s' to '%s' (%s)\n",
+				     p_name, cnode->value.text.string,
+				     stp_get_string_parameter(v, p_name));
+		    }
+		}
+	      else if (strcmp(p_type, "file") == 0)
+		{
+		  if (cnode->type == STP_MXML_TEXT)
+		    {
+		      stp_set_file_parameter
+			(v, p_name, cnode->value.text.string);
+		      type = STP_PARAMETER_TYPE_DOUBLE;
+		      if (stp_get_debug_level() & STP_DBG_XML)
+			stp_deprintf(STP_DBG_XML, "  Set file '%s' to '%s' (%s)\n",
+				     p_name, cnode->value.text.string,
+				     stp_get_file_parameter(v, p_name));
+		    }
+		}
+	      else if (strcmp(p_type, "raw") == 0)
+		{
+		  if (cnode->type == STP_MXML_TEXT)
+		    {
+		      stp_raw_t *raw = stp_xmlstrtoraw(cnode->value.text.string);
+		      if (raw)
+			{
+			  stp_set_raw_parameter(v, p_name, raw->data,raw->bytes);
+			  type = STP_PARAMETER_TYPE_DOUBLE;
+			  stp_deprintf(STP_DBG_XML, "  Set raw '%s' to '%s'\n",
+				       p_name, cnode->value.text.string);
+			  stp_free((void *) raw->data);
+			  stp_free(raw);
+			}
+		    }
+		}
+	      else if (strcmp(p_type, "curve") == 0)
+		{
+		  stp_curve_t *curve;
+		  while (cnode->type != STP_MXML_ELEMENT && cnode->next)
+		    cnode = cnode->next;
+		  if (!cnode)
+		    {
+		      stp_erprintf("Unable to find XML curve!\n");
+		      stp_abort();
+		    }
+		  curve = stp_curve_create_from_xmltree(cnode);
+		  if (curve)
+		    {
+		      stp_set_curve_parameter(v, p_name, curve);
+		      type = STP_PARAMETER_TYPE_DOUBLE;
+		      if (stp_get_debug_level() & STP_DBG_XML)
+			{
+			  char *cv = stp_curve_write_string(curve);
+			  stp_deprintf(STP_DBG_XML, "  Set curve '%s' (%s)\n",
+				       p_name, cv);
+			  stp_free(cv);
+			}
+		      stp_curve_destroy(curve);
+		    }
+		  else
+		    {
+		      stp_erprintf("Unable to extract curve!\n");
+		      stp_abort();
+		    }
+		}
+	      else if (strcmp(p_type, "array") == 0)
+		{
+		  stp_array_t *array;
+		  while (cnode->type != STP_MXML_ELEMENT && cnode->next)
+		    cnode = cnode->next;
+		  if (!cnode)
+		    {
+		      stp_erprintf("Unable to find XML array!\n");
+		      stp_abort();
+		    }
+		  array = stp_array_create_from_xmltree(cnode);
+		  if (array)
+		    {
+		      type = STP_PARAMETER_TYPE_DOUBLE;
+		      stp_set_array_parameter(v, p_name, array);
+		      stp_deprintf(STP_DBG_XML, "  Set array '%s'\n", p_name);
+		      stp_array_destroy(array);
+		    }
+		  else
+		    {
+		      stp_erprintf("Unable to extract array!\n");
+		      stp_abort();
+		    }
+		}
+	      else
+		{
+		  stp_erprintf("Bad property %s type %s\n", p_name, p_type);
+		}
+	      if (active && type != STP_PARAMETER_TYPE_INVALID)
+		{
+		  if (strcmp(active, "active") == 0)
+		    stp_set_parameter_active(v, p_name, STP_PARAMETER_ACTIVE, type);
+		  else if (strcmp(active, "inactive") == 0)
+		    stp_set_parameter_active(v, p_name, STP_PARAMETER_INACTIVE, type);
+		  else if (strcmp(active, "default") == 0)
+		    stp_set_parameter_active(v, p_name, STP_PARAMETER_DEFAULTED, type);
+		}
+
+	    }
+	  else if (child->type == STP_MXML_TEXT)
+	    {
+	      if (!strcmp(prop_name, "driver"))
+		stp_set_driver(v, child->value.text.string);
+	      else if (!strcmp(prop_name, "color_conversion"))
+		stp_set_color_conversion(v, child->value.text.string);
+	      else if (!strcmp(prop_name, "left"))
+		stp_set_left(v, stp_xmlstrtol(child->value.text.string));
+	      else if (!strcmp(prop_name, "top"))
+		stp_set_top(v, stp_xmlstrtol(child->value.text.string));
+	      else if (!strcmp(prop_name, "width"))
+		stp_set_width(v, stp_xmlstrtol(child->value.text.string));
+	      else if (!strcmp(prop_name, "height"))
+		stp_set_height(v, stp_xmlstrtol(child->value.text.string));
+	      else if (!strcmp(prop_name, "page_width"))
+		stp_set_page_width(v, stp_xmlstrtol(child->value.text.string));
+	      else if (!strcmp(prop_name, "page_height"))
+		stp_set_page_height(v, stp_xmlstrtol(child->value.text.string));
+	    }
+	}
+      prop = prop->next;
+    }
+#ifdef HAVE_LOCALE_H
+  setlocale(LC_ALL, locale);
+  stp_free(locale);
+#endif
+}
+
+void
+stp_vars_fill_from_xmltree(stp_mxml_node_t *prop, stp_vars_t *v)
+{
+  fill_vars_from_xmltree(prop, NULL, v);
+}
+
+stp_vars_t *
+stp_vars_create_from_xmltree(stp_mxml_node_t *da)
+{
+  stp_vars_t *v = stp_vars_create();
+  fill_vars_from_xmltree(da, NULL, v);
+  return v;
+}
+
+void
+stp_vars_fill_from_xmltree_ref(stp_mxml_node_t *prop, stp_mxml_node_t *root,
+			       stp_vars_t *v)
+{
+  fill_vars_from_xmltree(prop, root, v);
+}
+
+stp_vars_t *
+stp_vars_create_from_xmltree_ref(stp_mxml_node_t *da, stp_mxml_node_t *root)
+{
+  stp_vars_t *v = stp_vars_create();
+  fill_vars_from_xmltree(da, root, v);
+  return v;
+}
+
+static void
+add_text_node(stp_mxml_node_t *node, const char *element, const char *value)
+{
+  if (value)
+    stp_mxmlNewOpaque(stp_mxmlNewElement(node, element), value);
+}
+
+stp_mxml_node_t *
+stp_xmltree_create_from_vars(const stp_vars_t *v)
+{
+  stp_mxml_node_t *varnode;
+  int i;
+  if (!v)
+    return NULL;
+  varnode = stp_mxmlNewElement(NULL, "vars");
+  add_text_node(varnode, "driver", stp_get_driver(v));
+  add_text_node(varnode, "color_conversion", stp_get_color_conversion(v));
+  stp_mxmlNewInteger(stp_mxmlNewElement(varnode, "left"), stp_get_left(v));
+  stp_mxmlNewInteger(stp_mxmlNewElement(varnode, "top"), stp_get_top(v));
+  stp_mxmlNewInteger(stp_mxmlNewElement(varnode, "width"), stp_get_width(v));
+  stp_mxmlNewInteger(stp_mxmlNewElement(varnode, "height"), stp_get_height(v));
+  stp_mxmlNewInteger(stp_mxmlNewElement(varnode, "page_width"), stp_get_page_width(v));
+  stp_mxmlNewInteger(stp_mxmlNewElement(varnode, "page_height"), stp_get_page_height(v));
+  for (i = STP_PARAMETER_TYPE_STRING_LIST; i < STP_PARAMETER_TYPE_INVALID; i++)
+    {
+      stp_string_list_t *list = stp_list_parameters(v, i);
+      if (list)
+	{
+	  int j;
+	  int count = stp_string_list_count(list);
+	  for (j = 0; j < count; j++)
+	    {
+	      const stp_param_string_t *pstr = stp_string_list_param(list, j);
+	      const char *name = pstr->name;
+	      char *data;
+	      stp_mxml_node_t *node = stp_mxmlNewElement(varnode, "parameter");
+	      stp_parameter_activity_t active =
+		stp_get_parameter_active(v, name, i);
+	      stp_mxmlElementSetAttr(node, "name", name);
+	      stp_mxmlElementSetAttr(node, "active",
+				     (active == STP_PARAMETER_INACTIVE ?
+				      "inactive" :
+				      (active == STP_PARAMETER_DEFAULTED ?
+				       "default" : "active")));
+	      switch (i)
+		{
+		case STP_PARAMETER_TYPE_STRING_LIST:
+		  stp_mxmlElementSetAttr(node, "type", "string");
+		  data = stp_strtoxmlstr(stp_get_string_parameter(v, name));
+		  if (data)
+		    {
+		      stp_mxmlNewOpaque(node, data);
+		      stp_free(data);
+		    }
+		  break;
+		case STP_PARAMETER_TYPE_INT:
+		  stp_mxmlElementSetAttr(node, "type", "integer");
+		  stp_mxmlNewInteger(node, stp_get_int_parameter(v, name));
+		  break;
+		case STP_PARAMETER_TYPE_BOOLEAN:
+		  stp_mxmlElementSetAttr(node, "type", "boolean");
+		  stp_mxmlNewInteger(node, stp_get_boolean_parameter(v, name));
+		  break;
+		case STP_PARAMETER_TYPE_DOUBLE:
+		  stp_mxmlElementSetAttr(node, "type", "float");
+		  stp_mxmlNewReal(node, stp_get_float_parameter(v, name));
+		  break;
+		case STP_PARAMETER_TYPE_CURVE:
+		  stp_mxmlElementSetAttr(node, "type", "curve");
+		  stp_mxmlAdd(node, STP_MXML_ADD_AFTER, NULL,
+			      stp_xmltree_create_from_curve(stp_get_curve_parameter(v, name)));
+		  break;
+		case STP_PARAMETER_TYPE_FILE:
+		  stp_mxmlElementSetAttr(node, "type", "file");
+		  data = stp_strtoxmlstr(stp_get_file_parameter(v, name));
+		  if (data)
+		    {
+		      stp_mxmlNewOpaque(node, data);
+		      stp_free(data);
+		    }
+		  break;
+		case STP_PARAMETER_TYPE_RAW:
+		  stp_mxmlElementSetAttr(node, "type", "raw");
+		  data = stp_rawtoxmlstr(stp_get_raw_parameter(v, name));
+		  if (data)
+		    {
+		      stp_mxmlNewOpaque(node, data);
+		      stp_free(data);
+		    }
+		  break;
+		case STP_PARAMETER_TYPE_ARRAY:
+		  stp_mxmlElementSetAttr(node, "type", "array");
+		  stp_mxmlAdd(node, STP_MXML_ADD_AFTER, NULL,
+			      stp_xmltree_create_from_array(stp_get_array_parameter(v, name)));
+		  break;
+		case STP_PARAMETER_TYPE_DIMENSION:
+		  stp_mxmlElementSetAttr(node, "type", "dimension");
+		  stp_mxmlNewInteger(node, stp_get_dimension_parameter(v, name));
+		  break;
+		default:
+		  stp_mxmlElementSetAttr(node, "type", "INVALID!");
+		  break;
+		}
+	    }
+	  stp_string_list_destroy(list);
+	}
+    }
+  return varnode;
+}
diff --git a/src/main/print-weave.c b/src/main/print-weave.c
index ce79ee4..d77e302 100644
--- a/src/main/print-weave.c
+++ b/src/main/print-weave.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-weave.c,v 1.68 2007/12/26 18:16:25 rlk Exp $"
+ * "$Id: print-weave.c,v 1.71 2008/07/14 02:07:30 rlk Exp $"
  *
  *   Softweave calculator for Gutenprint.
  *
@@ -368,31 +368,45 @@ typedef struct cooked {
 	int *stagger_postmap;
 } cooked_t;
 
+typedef struct startmap {
+  int startrow;
+  int map;
+  int pos;			/* Secondary key for stable sort */
+} startmap_t;
+
+static int
+smap_compare(const void *p1, const void *p2)
+{
+  const startmap_t *s1 = (const startmap_t *)p1;
+  const startmap_t *s2 = (const startmap_t *)p2;
+  if (s1->startrow < s2->startrow)
+    return -1;
+  else if (s1->startrow > s2->startrow)
+    return 1;
+  else if (s1->pos < s2->pos)
+    return -1;
+  else
+    return 1;
+}
+
 static void
 sort_by_start_row(int *map, int *startrows, int count)
 {
-	/*
-	 * Yes, it's a bubble sort, but we do it no more than 4 times
-	 * per page, and we are only sorting a small number of items.
-	 */
-
-	int dirty;
-
-	do {
-		int x;
-		dirty = 0;
-		for (x = 1; x < count; x++) {
-			if (startrows[x - 1] > startrows[x]) {
-				int temp = startrows[x - 1];
-				startrows[x - 1] = startrows[x];
-				startrows[x] = temp;
-				temp = map[x - 1];
-				map[x - 1] = map[x];
-				map[x] = temp;
-				dirty = 1;
-			}
-		}
-	} while (dirty);
+  startmap_t *smap = stp_malloc(sizeof(startmap_t) * count);
+  int i;
+  for (i = 0; i < count; i++)
+    {
+      smap[i].startrow = startrows[i];
+      smap[i].map = map[i];
+      smap[i].pos = i;
+    }
+  qsort(smap, count, sizeof(startmap_t), smap_compare);
+  for (i = 0; i < count; i++)
+    {
+      startrows[i] = smap[i].startrow;
+      map[i] = smap[i].map;
+    }
+  stp_free(smap);
 }
 
 static void
@@ -1155,10 +1169,10 @@ stp_initialize_weave(stp_vars_t *v,
 	      sw->ncolors, sw->bitwidth, linewidth, sw->horizontal_width,
 	      sw->vertical_height, first_line, last_line, maxHeadOffset);
   stp_dprintf(STP_DBG_WEAVE_PARAMS, v,
-	      "      oversample %d line buffer count %d total buffer %d\n",
+	      "      oversample %d line buffer count %d total buffer %d, page_height %d\n",
 	      sw->oversample, sw->vmod,
 	      sw->vmod * sw->virtual_jets * sw->bitwidth *
-	      sw->ncolors * sw->horizontal_width);
+	      sw->ncolors * sw->horizontal_width, page_height);
   stp_allocate_component_data(v, "Weave", NULL, stpi_destroy_weave, sw);
   return;
 }
@@ -1200,12 +1214,17 @@ weave_parameters_by_row(const stp_vars_t *v, stpi_softweave_t *sw,
 	      w->physpassend, w->missingstartrows);
 }
 
+static stpi_softweave_t *
+get_sw(const stp_vars_t *v)
+{
+  return (stpi_softweave_t *) stp_get_component_data(v, "Weave");
+}
+
 void
 stp_weave_parameters_by_row(const stp_vars_t *v, int row,
 			    int vertical_subpass, stp_weave_t *w)
 {
-  stpi_softweave_t *sw =
-    (stpi_softweave_t *) stp_get_component_data(v, "Weave");
+  stpi_softweave_t *sw = get_sw(v);
   weave_parameters_by_row(v, sw, row, vertical_subpass, w);
 }
 
@@ -1267,40 +1286,35 @@ stpi_get_pass_by_row(stp_vars_t *v, stpi_softweave_t *sw,
 stp_lineoff_t *
 stp_get_lineoffsets_by_pass(const stp_vars_t *v, int pass)
 {
-  const stpi_softweave_t *sw =
-    (stpi_softweave_t *) stp_get_component_data(v, "Weave");
+  const stpi_softweave_t *sw = get_sw(v);
   return &(sw->lineoffsets[pass % sw->vmod]);
 }
 
 stp_lineactive_t *
 stp_get_lineactive_by_pass(const stp_vars_t *v, int pass)
 {
-  const stpi_softweave_t *sw =
-    (stpi_softweave_t *) stp_get_component_data(v, "Weave");
+  const stpi_softweave_t *sw = get_sw(v);
   return &(sw->lineactive[pass % sw->vmod]);
 }
 
 stp_linecount_t *
 stp_get_linecount_by_pass(const stp_vars_t *v, int pass)
 {
-  const stpi_softweave_t *sw =
-    (stpi_softweave_t *) stp_get_component_data(v, "Weave");
+  const stpi_softweave_t *sw = get_sw(v);
   return &(sw->linecounts[pass % sw->vmod]);
 }
 
 const stp_linebufs_t *
 stp_get_linebases_by_pass(const stp_vars_t *v, int pass)
 {
-  const stpi_softweave_t *sw =
-    (stpi_softweave_t *) stp_get_component_data(v, "Weave");
+  const stpi_softweave_t *sw = get_sw(v);
   return &(sw->linebases[pass % sw->vmod]);
 }
 
 stp_pass_t *
 stp_get_pass_by_pass(const stp_vars_t *v, int pass)
 {
-  const stpi_softweave_t *sw =
-    (stpi_softweave_t *) stp_get_component_data(v, "Weave");
+  const stpi_softweave_t *sw = get_sw(v);
   return &(sw->passes[pass % sw->vmod]);
 }
 
@@ -1310,8 +1324,8 @@ check_linebases(stp_vars_t *v, stpi_softweave_t *sw,
 {
   stp_linebufs_t *bufs =
     (stp_linebufs_t *) stpi_get_linebases(v, sw, row, cpass, head_offset);
-  if (!(bufs[0].v[color]))
-    bufs[0].v[color] =
+  if (!(bufs->v[color]))
+    bufs->v[color] =
       stp_zalloc (sw->virtual_jets * sw->bitwidth * sw->horizontal_width);
 }
 
@@ -1329,8 +1343,7 @@ void
 stp_fill_tiff(stp_vars_t *v, int row, int subpass,
 	      int width, int missingstartrows, int color)
 {
-  stpi_softweave_t *sw =
-    (stpi_softweave_t *) stp_get_component_data(v, "Weave");
+  stpi_softweave_t *sw = get_sw(v);
   stp_lineoff_t *lineoffs;
   stp_linecount_t *linecount;
   const stp_linebufs_t *bufs;
@@ -1348,37 +1361,36 @@ stp_fill_tiff(stp_vars_t *v, int row, int subpass,
 
       while (l < full_blocks)
 	{
-	  (bufs[0].v[color][2 * i]) = 129;
-	  (bufs[0].v[color][2 * i + 1]) = 0;
+	  (bufs->v[color][2 * i]) = 129;
+	  (bufs->v[color][2 * i + 1]) = 0;
 	  i++;
 	  l++;
 	}
       if (leftover == 1)
 	{
-	  (bufs[0].v[color][2 * i]) = 1;
-	  (bufs[0].v[color][2 * i + 1]) = 0;
+	  (bufs->v[color][2 * i]) = 1;
+	  (bufs->v[color][2 * i + 1]) = 0;
 	  i++;
 	}
       else if (leftover > 0)
 	{
-	  (bufs[0].v[color][2 * i]) = 257 - leftover;
-	  (bufs[0].v[color][2 * i + 1]) = 0;
+	  (bufs->v[color][2 * i]) = 257 - leftover;
+	  (bufs->v[color][2 * i + 1]) = 0;
 	  i++;
 	}
     }
 
   lineoffs = stpi_get_lineoffsets(v, sw, row, subpass, sw->head_offset[color]);
   linecount = stpi_get_linecount(v, sw, row, subpass, sw->head_offset[color]);
-  lineoffs[0].v[color] = 2 * i;
-  linecount[0].v[color] = missingstartrows;
+  lineoffs->v[color] = 2 * i;
+  linecount->v[color] = missingstartrows;
 }
 
 void
 stp_fill_uncompressed(stp_vars_t *v, int row, int subpass,
 		      int width, int missingstartrows, int color)
 {
-  stpi_softweave_t *sw =
-    (stpi_softweave_t *) stp_get_component_data(v, "Weave");
+  stpi_softweave_t *sw = get_sw(v);
   stp_lineoff_t *lineoffs;
   stp_linecount_t *linecount;
   const stp_linebufs_t *bufs;
@@ -1387,9 +1399,9 @@ stp_fill_uncompressed(stp_vars_t *v, int row, int subpass,
   lineoffs = stpi_get_lineoffsets(v, sw, row, subpass, sw->head_offset[color]);
   linecount = stpi_get_linecount(v, sw, row, subpass, sw->head_offset[color]);
   width *= sw->bitwidth * missingstartrows;
-  memset(bufs[0].v[color], 0, width);
-  lineoffs[0].v[color] = width;
-  linecount[0].v[color] = missingstartrows;
+  memset(bufs->v[color], 0, width);
+  lineoffs->v[color] = width;
+  linecount->v[color] = missingstartrows;
 }
 
 int
@@ -1446,23 +1458,23 @@ initialize_row(stp_vars_t *v, stpi_softweave_t *sw,
 
 		  for(jj=0; jj<sw->ncolors; jj++)
 		    {
-		      if (lineoffs[0].v[jj] != 0)
+		      if (lineoffs->v[jj] != 0)
 			stp_eprintf(v, "WARNING: pass %d subpass %d row %d: "
 				    "lineoffs %ld should be zero!\n",
-				    w.pass, i, row, lineoffs[0].v[jj]);
-		      lineoffs[0].v[jj] = 0;
-		      lineactive[0].v[jj] = 0;
-		      if (linecount[0].v[jj] != 0)
+				    w.pass, i, row, lineoffs->v[jj]);
+		      lineoffs->v[jj] = 0;
+		      lineactive->v[jj] = 0;
+		      if (linecount->v[jj] != 0)
 			stp_eprintf(v, "WARNING: pass %d subpass %d row %d: "
 				    "linecount %d should be zero!\n",
-				    w.pass, i, row, linecount[0].v[jj]);
-		      linecount[0].v[jj] = 0;
-		      linebounds[0].start_pos[jj] = INT_MAX;
-		      linebounds[0].end_pos[jj] = -1;
+				    w.pass, i, row, linecount->v[jj]);
+		      linecount->v[jj] = 0;
+		      linebounds->start_pos[jj] = INT_MAX;
+		      linebounds->end_pos[jj] = -1;
 		    }
 		}
 
-	      if((linecount[0].v[j] == 0) && (w.jet > 0))
+	      if((linecount->v[j] == 0) && (w.jet > 0))
 		{
 		  (sw->fillfunc)(v, row, i, width, w.jet, j);
 		}
@@ -1483,8 +1495,8 @@ add_to_row(stp_vars_t *v, stpi_softweave_t *sw, int row, unsigned char *buf,
     stpi_get_lineactive(v, sw, sw->lineno, h_pass, sw->head_offset[color]);
   stp_linecount_t *linecount =
     stpi_get_linecount(v, sw, sw->lineno, h_pass, sw->head_offset[color]);
-  size_t place = lineoffs[0].v[color];
-  size_t count = linecount[0].v[color];
+  size_t place = lineoffs->v[color];
+  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 %d, count %d\n",
@@ -1492,17 +1504,16 @@ add_to_row(stp_vars_t *v, stpi_softweave_t *sw, int row, unsigned char *buf,
 		  place + nbytes, count);
       stp_abort();
     }
-  memcpy(bufs[0].v[color] + lineoffs[0].v[color], buf, nbytes);
-  lineoffs[0].v[color] += nbytes;
+  memcpy(bufs->v[color] + lineoffs->v[color], buf, nbytes);
+  lineoffs->v[color] += nbytes;
   if (setactive)
-    lineactive[0].v[color] = 1;
+    lineactive->v[color] = 1;
 }
 
 static void
 stpi_flush_passes(stp_vars_t *v, int flushall)
 {
-  stpi_softweave_t *sw =
-    (stpi_softweave_t *) stp_get_component_data(v, "Weave");
+  stpi_softweave_t *sw = get_sw(v);
   while (1)
     {
       stp_pass_t *pass = stp_get_pass_by_pass(v, sw->last_pass + 1);
@@ -1527,8 +1538,7 @@ stp_flush_all(stp_vars_t *v)
 static void
 finalize_row(stp_vars_t *v, int row)
 {
-  stpi_softweave_t *sw =
-    (stpi_softweave_t *) stp_get_component_data(v, "Weave");
+  stpi_softweave_t *sw = get_sw(v);
   int i,j;
   stp_dprintf(STP_DBG_ROWS, v, "Finalizing row %d...\n", row);
   for (i = 0; i < sw->oversample; i++)
@@ -1539,7 +1549,7 @@ finalize_row(stp_vars_t *v, int row)
       for(j=0; j<sw->ncolors; j++)
         {
 	  lines = stpi_get_linecount(v, sw, row, i, sw->head_offset[j]);
-	  lines[0].v[j]++;
+	  lines->v[j]++;
         }
 
       weave_parameters_by_row(v, sw, row, i, &w);
@@ -1556,8 +1566,7 @@ finalize_row(stp_vars_t *v, int row)
 void
 stp_write_weave(stp_vars_t *v, unsigned char *const cols[])
 {
-  stpi_softweave_t *sw =
-    (stpi_softweave_t *) stp_get_component_data(v, "Weave");
+  stpi_softweave_t *sw = get_sw(v);
   int length = (sw->linewidth + 7) / 8;
   stp_lineoff_t *lineoffs[STP_MAX_WEAVE];
   stp_lineactive_t *lineactives[STP_MAX_WEAVE];
@@ -1576,7 +1585,7 @@ stp_write_weave(stp_vars_t *v, unsigned char *const cols[])
     sw->fold_buf = stp_zalloc(sw->bitwidth * ylength);
   if (!sw->comp_buf)
     sw->comp_buf = stp_zalloc(sw->bitwidth *
-			       (sw->compute_linewidth)(v,ylength));
+			      (sw->compute_linewidth)(v,ylength));
   if (sw->current_vertical_subpass == 0)
     initialize_row(v, sw, sw->lineno, xlength, cols);
 
diff --git a/src/main/printers.c b/src/main/printers.c
index 4cb0bc8..8df5ea9 100644
--- a/src/main/printers.c
+++ b/src/main/printers.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: printers.c,v 1.83 2008/01/21 23:34:25 rlk Exp $"
+ * "$Id: printers.c,v 1.85 2008/06/03 11:40:39 rlk Exp $"
  *
  *   Print plug-in driver utility functions for the GIMP.
  *
@@ -288,7 +288,7 @@ stp_printer_describe_parameter(const stp_vars_t *v, const char *name,
 }
 
 static void
-set_printer_defaults(stp_vars_t *v, int core_only)
+set_printer_defaults(stp_vars_t *v, int core_only, int soft)
 {
   stp_parameter_list_t *params;
   int count;
@@ -306,32 +306,60 @@ set_printer_defaults(stp_vars_t *v, int core_only)
 	  switch (p->p_type)
 	    {
 	    case STP_PARAMETER_TYPE_STRING_LIST:
-	      stp_set_string_parameter(v, p->name, desc.deflt.str);
-	      stp_set_string_parameter_active(v, p->name, STP_PARAMETER_ACTIVE);
+	      if (!soft ||
+		  !stp_check_string_parameter(v, p->name, STP_PARAMETER_DEFAULTED))
+		{
+		  stp_set_string_parameter(v, p->name, desc.deflt.str);
+		  stp_set_string_parameter_active(v, p->name, STP_PARAMETER_ACTIVE);
+		}
 	      break;
 	    case STP_PARAMETER_TYPE_DOUBLE:
-	      stp_set_float_parameter(v, p->name, desc.deflt.dbl);
-	      stp_set_float_parameter_active(v, p->name, STP_PARAMETER_ACTIVE);
+	      if (!soft ||
+		  !stp_check_float_parameter(v, p->name, STP_PARAMETER_DEFAULTED))
+		{
+		  stp_set_float_parameter(v, p->name, desc.deflt.dbl);
+		  stp_set_float_parameter_active(v, p->name, STP_PARAMETER_ACTIVE);
+		}
 	      break;
 	    case STP_PARAMETER_TYPE_INT:
-	      stp_set_int_parameter(v, p->name, desc.deflt.integer);
-	      stp_set_int_parameter_active(v, p->name, STP_PARAMETER_ACTIVE);
+	      if (!soft ||
+		  !stp_check_int_parameter(v, p->name, STP_PARAMETER_DEFAULTED))
+		{
+		  stp_set_int_parameter(v, p->name, desc.deflt.integer);
+		  stp_set_int_parameter_active(v, p->name, STP_PARAMETER_ACTIVE);
+		}
 	      break;
 	    case STP_PARAMETER_TYPE_DIMENSION:
-	      stp_set_dimension_parameter(v, p->name, desc.deflt.dimension);
-	      stp_set_dimension_parameter_active(v, p->name, STP_PARAMETER_ACTIVE);
+	      if (!soft ||
+		  !stp_check_dimension_parameter(v, p->name, STP_PARAMETER_DEFAULTED))
+		{
+		  stp_set_dimension_parameter(v, p->name, desc.deflt.dimension);
+		  stp_set_dimension_parameter_active(v, p->name, STP_PARAMETER_ACTIVE);
+		}
 	      break;
 	    case STP_PARAMETER_TYPE_BOOLEAN:
-	      stp_set_boolean_parameter(v, p->name, desc.deflt.boolean);
-	      stp_set_boolean_parameter_active(v, p->name, STP_PARAMETER_ACTIVE);
+	      if (!soft ||
+		  !stp_check_boolean_parameter(v, p->name, STP_PARAMETER_DEFAULTED))
+		{
+		  stp_set_boolean_parameter(v, p->name, desc.deflt.boolean);
+		  stp_set_boolean_parameter_active(v, p->name, STP_PARAMETER_ACTIVE);
+		}
 	      break;
 	    case STP_PARAMETER_TYPE_CURVE:
-	      stp_set_curve_parameter(v, p->name, desc.deflt.curve);
-	      stp_set_curve_parameter_active(v, p->name, STP_PARAMETER_ACTIVE);
+	      if (!soft ||
+		  !stp_check_curve_parameter(v, p->name, STP_PARAMETER_DEFAULTED))
+		{
+		  stp_set_curve_parameter(v, p->name, desc.deflt.curve);
+		  stp_set_curve_parameter_active(v, p->name, STP_PARAMETER_ACTIVE);
+		}
 	      break;
 	    case STP_PARAMETER_TYPE_ARRAY:
-	      stp_set_array_parameter(v, p->name, desc.deflt.array);
-	      stp_set_array_parameter_active(v, p->name, STP_PARAMETER_ACTIVE);
+	      if (!soft ||
+		  !stp_check_array_parameter(v, p->name, STP_PARAMETER_DEFAULTED))
+		{
+		  stp_set_array_parameter(v, p->name, desc.deflt.array);
+		  stp_set_array_parameter_active(v, p->name, STP_PARAMETER_ACTIVE);
+		}
 	      break;
 	    default:
 	      break;
@@ -346,7 +374,14 @@ void
 stp_set_printer_defaults(stp_vars_t *v, const stp_printer_t *printer)
 {
   stp_set_driver(v, stp_printer_get_driver(printer));
-  set_printer_defaults(v, 0);
+  set_printer_defaults(v, 0, 0);
+}
+
+void
+stp_set_printer_defaults_soft(stp_vars_t *v, const stp_printer_t *printer)
+{
+  stp_set_driver(v, stp_printer_get_driver(printer));
+  set_printer_defaults(v, 0, 1);
 }
 
 void
@@ -368,7 +403,7 @@ stp_printer_get_defaults(const stp_printer_t *printer)
     {
       stp_printer_t *nc_printer = (stp_printer_t *) printer;
       stp_deprintf(STP_DBG_PRINTERS, "  ==>init %s\n", printer->driver);
-      set_printer_defaults (nc_printer->printvars, 1);
+      set_printer_defaults (nc_printer->printvars, 1, 0);
       nc_printer->vars_initialized = 1;
     }
   return printer->printvars;
@@ -939,105 +974,6 @@ stp_family_unregister(stp_list_t *family)
   return 0;
 }
 
-static void
-stp_fill_printvars_from_xmltree(stp_mxml_node_t *prop,
-				stp_vars_t *v)
-{
-  while (prop)
-    {
-      if (prop->type == STP_MXML_ELEMENT)
-	{
-	  const char *prop_name = prop->value.element.name;
-	  if (!strcmp(prop_name, "parameter"))
-	    {
-	      const char *p_type = stp_mxmlElementGetAttr(prop, "type");
-	      const char *p_name = stp_mxmlElementGetAttr(prop, "name");
-	      stp_mxml_node_t *child = prop->child;
-	      if (!p_type || !p_name)
-		stp_erprintf("Bad property found!\n");
-	      else if (strcmp(p_type, "float") == 0)
-		{
-		  if (child->type == STP_MXML_TEXT)
-		    {
-		      stp_set_float_parameter
-			(v, p_name, stp_xmlstrtod(child->value.text.string));
-		      stp_deprintf(STP_DBG_XML, "  Set float '%s' to '%s' (%f)\n",
-				   p_name, child->value.text.string,
-				   stp_get_float_parameter(v, p_name));
-		    }
-		}
-	      else if (strcmp(p_type, "integer") == 0)
-		{
-		  if (child->type == STP_MXML_TEXT)
-		    {
-		      stp_set_int_parameter
-			(v, p_name, (int) stp_xmlstrtol(child->value.text.string));
-		      stp_deprintf(STP_DBG_XML, "  Set int '%s' to '%s' (%d)\n",
-				   p_name, child->value.text.string,
-				   stp_get_int_parameter(v, p_name));
-		    }
-		}
-	      else if (strcmp(p_type, "boolean") == 0)
-		{
-		  if (child->type == STP_MXML_TEXT)
-		    {
-		      stp_set_boolean_parameter
-			(v, p_name, (int) stp_xmlstrtol(child->value.text.string));
-		      stp_deprintf(STP_DBG_XML, "  Set bool '%s' to '%s' (%d)\n",
-				   p_name, child->value.text.string,
-				   stp_get_boolean_parameter(v, p_name));
-		    }
-		}
-	      else if (strcmp(p_type, "string") == 0)
-		{
-		  if (child->type == STP_MXML_TEXT)
-		    {
-		      stp_set_string_parameter
-			(v, p_name, child->value.text.string);
-		      stp_deprintf(STP_DBG_XML, "  Set string '%s' to '%s' (%s)\n",
-				   p_name, child->value.text.string,
-				   stp_get_string_parameter(v, p_name));
-		    }
-		}
-	      else if (strcmp(p_type, "curve") == 0)
-		{
-		  stp_curve_t *curve;
-		  while (child->type == STP_MXML_TEXT && child->next)
-		    child = child->next;
-		  curve = stp_curve_create_from_xmltree(child);
-		  if (curve)
-		    {
-		      stp_set_curve_parameter(v, p_name, curve);
-		      stp_deprintf(STP_DBG_XML, "  Set curve '%s' to '%s' (%s)\n",
-				   p_name, child->value.text.string,
-				   stp_curve_write_string(curve));
-		      stp_curve_destroy(curve);
-		    }
-		}
-	      else if (strcmp(p_type, "array") == 0)
-		{
-		  stp_array_t *array;
-		  while (child->type == STP_MXML_TEXT && child->next)
-		    child = child->next;
-		  array = stp_array_create_from_xmltree(child);
-		  if (array)
-		    {
-		      stp_set_array_parameter(v, p_name, array);
-		      stp_deprintf(STP_DBG_XML, "  Set array '%s' to '%s'\n",
-				   p_name, child->value.text.string);
-		      stp_array_destroy(array);
-		    }
-		}
-	      else
-		{
-		  stp_erprintf("Bad property %s type %s\n", p_name, p_type);
-		}
-	    }
-	}
-      prop = prop->next;
-    }
-} 
-
 static stp_printvars_t *
 stp_printvars_create_from_xmltree(stp_mxml_node_t *printer,
 				  const char *family)
@@ -1070,7 +1006,7 @@ stp_printvars_create_from_xmltree(stp_mxml_node_t *printer,
   prop = printer->child;
   stp_deprintf(STP_DBG_XML, ">>stp_printvars_create_from_xmltree: %p, %s\n",
 	       (void *) (outprintvars->printvars), outprintvars->name);
-  stp_fill_printvars_from_xmltree(prop, outprintvars->printvars);
+  stp_vars_fill_from_xmltree(prop, outprintvars->printvars);
   stp_deprintf(STP_DBG_XML, "<<stp_printvars_create_from_xmltree: %p, %s\n",
 	       (void *) (outprintvars->printvars), outprintvars->name);
   return outprintvars;
@@ -1127,7 +1063,7 @@ stp_printer_create_from_xmltree(stp_mxml_node_t *printer, /* The printer node */
   outprinter->printfuncs = printfuncs;
 
   prop = printer->child;
-  stp_fill_printvars_from_xmltree(prop, outprinter->printvars);
+  stp_vars_fill_from_xmltree(prop, outprinter->printvars);
   if (driver && long_name && printfuncs)
     {
       if (stp_get_debug_level() & STP_DBG_XML)
diff --git a/src/main/printers.xml b/src/main/printers.xml
deleted file mode 100644
index e815c23..0000000
--- a/src/main/printers.xml
+++ /dev/null
@@ -1,998 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
-   XML description of printers known to libgutenprint
-   This file was originally generated.  It should be edited by hand.
-
-   "$Id: printers.xml,v 1.227 2008/04/26 01:15:12 rlk Exp $"
--->
-
-<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">
-  <printdef>
-    <family name="ps">
-      <printer name="PostScript Level 1" driver="ps" manufacturer="Adobe" model="0" />
-      <printer name="PostScript Level 2" driver="ps2" manufacturer="Adobe" model="1" />
-    </family>
-    <family name="canon">
-      <parameters name="density_800_params">
-        <parameter type="float" name="Density">0.8</parameter>
-      </parameters>
-      <parameters name="gamma_5_density_800_params">
-        <parameter type="float" name="Density">0.8</parameter>
-        <parameter type="float" name="Gamma">0.5</parameter>
-      </parameters>
-      <parameters name="gamma_6_density_800_params">
-        <parameter type="float" name="Density">0.8</parameter>
-        <parameter type="float" name="Gamma">0.6</parameter>
-      </parameters>
-      <parameters name="gamma_8_density_900_params">
-        <parameter type="float" name="Density">0.9</parameter>
-        <parameter type="float" name="Gamma">0.8</parameter>
-      </parameters>
-      <parameters name="gamma_2_density_800_params">
-        <parameter type="float" name="Density">0.8</parameter>
-        <parameter type="float" name="Gamma">2.0</parameter>
-      </parameters>
-      <parameters name="gamma_750_params">
-        <parameter type="float" name="Gamma">0.75</parameter>
-      </parameters>
-      <parameters name="PIXMA_iP4000_params">
-        <parameter type="float" name="Gamma">0.60</parameter>
-      </parameters>
-      <parameters name="PIXMA_iP4200_params">
-        <parameter type="float" name="Brightness">1.30</parameter>
-        <parameter type="float" name="Gamma">0.70</parameter>
-        <parameter type="float" name="Density">0.80</parameter>
-      </parameters>
-      <parameters name="PIXMA_iP4300_params">
-        <parameter type="float" name="Brightness">0.7</parameter>
-        <parameter type="float" name="Density">0.6</parameter>
-        <parameter type="float" name="Contrast">1.7</parameter>
-        <parameter type="float" name="Gamma">0.9</parameter>
-        <parameter type="float" name="BlackGamma">0.6</parameter>
-      </parameters>
-      <parameters name="PIXMA_iX5000_params"> 
-        <parameter type="float" name="BlackGamma">2.0</parameter> 
-        <parameter type="float" name="YellowGamma">1.4</parameter> 
-        <parameter type="float" name="MagentaGamma">1.3</parameter> 
-        <parameter type="float" name="CyanGamma">1.3</parameter> 
-      </parameters>
-      <printer name="Canon BJ-30" driver="bjc-30" manufacturer="Canon" model="30" parameters="gamma_2_density_800_params" />
-      <printer name="Canon BJC-50" driver="bjc-50" manufacturer="Canon" model="4400" parameters="gamma_5_density_800_params" />
-      <printer name="Canon BJC-55" driver="bjc-55" manufacturer="Canon" model="4400" parameters="gamma_5_density_800_params" />
-      <printer name="Canon BJC-80" driver="bjc-80" manufacturer="Canon" model="4400" parameters="gamma_5_density_800_params" />
-      <printer name="Canon BJC-85" driver="bjc-85" manufacturer="Canon" model="85" parameters="gamma_5_density_800_params" />
-      <printer name="Canon BJC-210" driver="bjc-210" manufacturer="Canon" model="210" parameters="density_800_params" />
-      <printer name="Canon BJC-240" driver="bjc-240" manufacturer="Canon" model="240" parameters="density_800_params" />
-      <printer name="Canon BJC-250" driver="bjc-250" manufacturer="Canon" model="250" parameters="density_800_params" />
-      <printer name="Canon BJC-1000" driver="bjc-1000" manufacturer="Canon" model="1000" parameters="density_800_params" />
-      <printer name="Canon BJC-2000" driver="bjc-2000" manufacturer="Canon" model="2000" parameters="density_800_params" />
-      <printer name="Canon BJC-2010" driver="bjc-2010" manufacturer="Canon" model="2000" parameters="density_800_params" />
-      <printer name="Canon BJC-2100" driver="bjc-2100" manufacturer="Canon" model="4300" parameters="gamma_750_params" />
-      <printer name="Canon BJC-2110" driver="bjc-2110" manufacturer="Canon" model="2000" parameters="density_800_params" />
-      <printer name="Canon BJC-3000" driver="bjc-3000" manufacturer="Canon" model="3000" parameters="density_800_params" />
-      <printer name="Canon BJC-4000" driver="bjc-4000" manufacturer="Canon" model="4300" parameters="gamma_750_params" />
-      <printer name="Canon BJC-4300" driver="bjc-4300" manufacturer="Canon" model="4300" parameters="gamma_750_params" />
-      <printer name="Canon BJC-4400" driver="bjc-4400" manufacturer="Canon" model="4400" parameters="density_800_params" />
-      <printer name="Canon BJC-5100" driver="bjc-5100" manufacturer="Canon" model="5100" parameters="density_800_params" />
-      <printer name="Canon BJC-5500" driver="bjc-5500" manufacturer="Canon" model="5500" parameters="density_800_params" />
-      <printer name="Canon BJC-6000" driver="bjc-6000" manufacturer="Canon" model="6000" parameters="gamma_750_params" />
-      <printer name="Canon BJC-6100" driver="bjc-6100" manufacturer="Canon" model="6100" parameters="density_800_params" />
-      <printer name="Canon BJC-6200" driver="bjc-6200" manufacturer="Canon" model="6200" parameters="gamma_750_params" />
-      <printer name="Canon BJC-6500" driver="bjc-6500" manufacturer="Canon" model="6500" parameters="gamma_750_params" />
-      <printer name="Canon BJC-7000" driver="bjc-7000" manufacturer="Canon" model="7000" parameters="gamma_6_density_800_params" />
-      <printer name="Canon BJC-7100" driver="bjc-7100" manufacturer="Canon" model="7100" parameters="density_800_params" />
-      <printer name="Canon BJC-8200" driver="bjc-8200" manufacturer="Canon" model="8200" parameters="density_800_params" />
-      <printer name="Canon BJC-8500" driver="bjc-8500" manufacturer="Canon" model="8500" parameters="density_800_params" />
-      <printer name="Canon S100" driver="bjc-s100" manufacturer="Canon" model="4300" parameters="gamma_750_params" />
-      <printer name="Canon S200" driver="bjc-s200" manufacturer="Canon" model="1000200" parameters="gamma_8_density_900_params" />
-      <printer name="Canon S300" driver="bjc-s300" manufacturer="Canon" model="1000300" parameters="density_800_params" />
-      <printer name="Canon S400" driver="bjc-s400" manufacturer="Canon" model="3000" parameters="density_800_params" />
-      <printer name="Canon S450" driver="bjc-s450" manufacturer="Canon" model="6200" parameters="gamma_750_params" />
-      <printer name="Canon S500" driver="bjc-s500" manufacturer="Canon" model="1000500" parameters="density_800_params" />
-      <printer name="Canon S600" driver="bjc-s600" manufacturer="Canon" model="8200" parameters="density_800_params" />
-      <printer name="Canon S630" driver="bjc-s630" manufacturer="Canon" model="8200" parameters="density_800_params" />
-      <printer name="Canon S800" driver="bjc-s800" manufacturer="Canon" model="8200" parameters="density_800_params" />
-      <printer name="Canon S4500" driver="bjc-s4500" manufacturer="Canon" model="6500" parameters="gamma_750_params" />
-      <printer name="Canon PIXMA iP2000" driver="bjc-PIXMA-iP2000" manufacturer="Canon" model="3002000" parameters="PIXMA_iP4000_params" />
-      <printer name="Canon PIXMA iP3000" driver="bjc-PIXMA-iP3000" manufacturer="Canon" model="3003000" parameters="PIXMA_iP4000_params" />
-      <printer name="Canon PIXMA iP3100" driver="bjc-PIXMA-iP3100" manufacturer="Canon" model="3003000" parameters="PIXMA_iP4000_params" />
-      <printer name="Canon PIXMA iP4000" driver="bjc-iP4000" manufacturer="Canon" model="3004000" parameters="PIXMA_iP4000_params" />
-      <printer name="Canon PIXMA iP4100" driver="bjc-PIXMA-iP4100" manufacturer="Canon" model="3004000" parameters="PIXMA_iP4000_params" />
-      <printer name="Canon PIXMA iP4200" driver="bjc-PIXMA-iP4200" manufacturer="Canon" model="3004200" parameters="PIXMA_iP4200_params" />
-      <printer name="Canon PIXMA iP4300" driver="bjc-PIXMA-iP4300" manufacturer="Canon" model="3004200" parameters="PIXMA_iP4300_params" />
-      <printer name="Canon PIXMA iP4500" driver="bjc-PIXMA-iP4500" manufacturer="Canon" model="3004500" parameters="PIXMA_iP4300_params" />
-      <printer name="Canon PIXMA iP5000" driver="bjc-PIXMA-iP5000" manufacturer="Canon" model="3004000" parameters="PIXMA_iP4000_params" />
-      <printer name="Canon PIXMA iP5200" driver="bjc-PIXMA-iP5200" manufacturer="Canon" model="3004200" parameters="PIXMA_iP4000_params" />
-      <printer name="Canon PIXMA iP5300" driver="bjc-PIXMA-iP5300" manufacturer="Canon" model="3005300" parameters="PIXMA_iP4000_params" />
-      <printer name="Canon PIXMA iP6000D" driver="bjc-PIXMA-iP6000D" manufacturer="Canon" model="3006000" parameters="PIXMA_iP4000_params" />
-      <printer name="Canon PIXMA iP6700" driver="bjc-PIXMA-iP6700" manufacturer="Canon" model="3006700" parameters="PIXMA_iP4000_params" />
-      <printer name="Canon PIXMA iP8500" driver="bjc-PIXMA-iP8500" manufacturer="Canon" model="3008500" parameters="PIXMA_iP4000_params" />
-      <printer name="Canon PIXMA iX5000" driver="bjc-PIXMA-iX5000" manufacturer="Canon" model="4005000" parameters="PIXMA_iX5000_params" />
-      <printer name="Canon PIXMA Pro9500" driver="bjc-PIXMA-Pro9500" manufacturer="Canon" model="7009500" parameters="PIXMA_iP4000_params" />
-      <printer name="Canon PIXMA MP150" driver="bjc-MULTIPASS-MP150" manufacturer="Canon" model="5000150" parameters="PIXMA_iP4000_params" />
-      <printer name="Canon PIXMA MP170" driver="bjc-MULTIPASS-MP170" manufacturer="Canon" model="5000150" parameters="PIXMA_iP4000_params" />
-      <printer name="Canon PIXMA MP180" driver="bjc-MULTIPASS-MP180" manufacturer="Canon" model="5000150" parameters="PIXMA_iP4000_params" />
-      <printer name="Canon PIXMA MP500" driver="bjc-MULTIPASS-MP500" manufacturer="Canon" model="3004200" parameters="PIXMA_iP4000_params" />
-      <printer name="Canon PIXMA MP520" driver="bjc-MULTIPASS-MP520" manufacturer="Canon" model="5000520" parameters="PIXMA_iP4000_params" />
-      <printer name="Canon PIXMA MP610" driver="bjc-MULTIPASS-MP610" manufacturer="Canon" model="3005300" parameters="PIXMA_iP4000_params" />
-      <printer name="Canon PIXMA MP700" driver="bjc-MULTIPASS-MP700" manufacturer="Canon" model="3003000" parameters="PIXMA_iP4000_params" />
-      <printer name="Canon PIXMA MP710" driver="bjc-MULTIPASS-MP710" manufacturer="Canon" model="3003000" parameters="PIXMA_iP4000_params" />
-      <printer name="Canon PIXMA MP730" driver="bjc-MULTIPASS-MP730" manufacturer="Canon" model="3003000" parameters="PIXMA_iP4000_params" />
-      <printer name="Canon PIXMA MP740" driver="bjc-MULTIPASS-MP740" manufacturer="Canon" model="5000740" parameters="PIXMA_iP4000_params" />
-      <printer name="Canon PIXMA MP750" driver="bjc-MULTIPASS-MP750" manufacturer="Canon" model="3004000" parameters="PIXMA_iP4000_params" />
-      <printer name="Canon PIXMA MP760" driver="bjc-MULTIPASS-MP760" manufacturer="Canon" model="3004000" parameters="PIXMA_iP4000_params" />
-      <printer name="Canon PIXMA MP770" driver="bjc-MULTIPASS-MP770" manufacturer="Canon" model="3004000" parameters="PIXMA_iP4000_params" />
-      <printer name="Canon PIXMA MP780" driver="bjc-MULTIPASS-MP780" manufacturer="Canon" model="3004000" parameters="PIXMA_iP4000_params" />
-      <printer name="Canon PIXMA MP790" driver="bjc-MULTIPASS-MP790" manufacturer="Canon" model="3004000" parameters="PIXMA_iP4000_params" />
-      <printer name="Canon PIXMA MP830" driver="bjc-MULTIPASS-MP830" manufacturer="Canon" model="5000830" parameters="PIXMA_iP4000_params" />
-      <printer name="Canon PIXUS iP3100" driver="bjc-PIXUS-iP3100" manufacturer="Canon" model="3003000" parameters="PIXMA_iP4000_params" />
-      <printer name="Canon PIXUS iP4100" driver="bjc-PIXUS-iP4100" manufacturer="Canon" model="3004000" parameters="PIXMA_iP4000_params" />
-      <printer name="Canon i80" driver="bjc-i80"   manufacturer="Canon" model="2000080" parameters="density_800_params" />
-      <printer name="Canon i560" driver="bjc-i560" manufacturer="Canon" model="2000560" parameters="gamma_6_density_800_params" />
-      <printer name="Canon i850" driver="bjc-i850" manufacturer="Canon" model="3003000" parameters="PIXMA_iP4000_params" />
-      <printer name="Canon i860" driver="bjc-i860" manufacturer="Canon" model="3004000" parameters="PIXMA_iP4000_params" />
-      <printer name="Canon i865" driver="bjc-i865" manufacturer="Canon" model="3004000" parameters="PIXMA_iP4000_params" />
-    </family>
-    <family name="escp2">
-      <parameters name="standard_params">
-        <parameter type="float" name="Gamma">0.470</parameter>
-      </parameters>
-      <parameters name="480_params">
-        <parameter type="float" name="MagentaGamma">0.95</parameter>
-        <parameter type="float" name="YellowGamma">0.9</parameter>
-        <parameter type="float" name="Gamma">0.470</parameter>
-      </parameters>
-      <parameters name="pro_5500_params">
-        <parameter type="float" name="CyanGamma">0.8</parameter>
-        <parameter type="float" name="Gamma">0.470</parameter>
-      </parameters>
-      <parameters name="cx3500_params">
-        <parameter type="float" name="CyanGamma">0.96</parameter>
-        <parameter type="float" name="MagentaGamma">1.02</parameter>
-        <parameter type="float" name="YellowGamma">1.02</parameter>
-        <parameter type="float" name="Gamma">0.500</parameter>
-      </parameters>
-      <parameters name="claria_params">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="BlackDensity">0.8</parameter>
-      </parameters>
-      <printer name="Epson Stylus C20" driver="escp2-c20" manufacturer="Epson" model="42" parameters="480_params" />
-      <printer name="Epson Stylus C20SX" driver="escp2-c20sx" manufacturer="Epson" model="42" parameters="480_params" />
-      <printer name="Epson Stylus C20UX" driver="escp2-c20ux" manufacturer="Epson" model="42" parameters="480_params" />
-      <printer name="Epson Stylus C40" driver="escp2-c40" manufacturer="Epson" model="43" parameters="480_params" />
-      <printer name="Epson Stylus C40SX" driver="escp2-c40sx" manufacturer="Epson" model="43" parameters="480_params" />
-      <printer name="Epson Stylus C40UX" driver="escp2-c40ux" manufacturer="Epson" model="43" parameters="480_params" />
-      <printer name="Epson Stylus C41" driver="escp2-c41" manufacturer="Epson" model="43" parameters="480_params" />
-      <printer name="Epson Stylus C41SX" driver="escp2-c41sx" manufacturer="Epson" model="43" parameters="480_params" />
-      <printer name="Epson Stylus C41UX" driver="escp2-c41ux" manufacturer="Epson" model="43" parameters="480_params" />
-      <printer name="Epson Stylus C42" driver="escp2-c42" manufacturer="Epson" model="43" parameters="480_params" />
-      <printer name="Epson Stylus C42SX" driver="escp2-c42sx" manufacturer="Epson" model="43" parameters="480_params" />
-      <printer name="Epson Stylus C42UX" driver="escp2-c42ux" manufacturer="Epson" model="43" parameters="480_params" />
-      <printer name="Epson Stylus C43" driver="escp2-c43" manufacturer="Epson" model="43" parameters="480_params" />
-      <printer name="Epson Stylus C43SX" driver="escp2-c43sx" manufacturer="Epson" model="43" parameters="480_params" />
-      <printer name="Epson Stylus C43UX" driver="escp2-c43ux" manufacturer="Epson" model="43" parameters="480_params" />
-      <printer name="Epson Stylus C44" driver="escp2-c44" manufacturer="Epson" model="43" parameters="480_params" />
-      <printer name="Epson Stylus C44SX" driver="escp2-c44sx" manufacturer="Epson" model="43" parameters="480_params" />
-      <printer name="Epson Stylus C44UX" driver="escp2-c44ux" manufacturer="Epson" model="43" parameters="480_params" />
-      <printer name="Epson Stylus C45" driver="escp2-c45" manufacturer="Epson" model="43" parameters="480_params" />
-      <printer name="Epson Stylus C46" driver="escp2-c46" manufacturer="Epson" model="43" parameters="480_params" />
-      <printer name="Epson Stylus C48" driver="escp2-c48" manufacturer="Epson" model="43" parameters="480_params" />
-      <printer name="Epson Stylus C50" driver="escp2-c50" manufacturer="Epson" model="56" parameters="480_params" />
-      <printer name="Epson Stylus C60" driver="escp2-c60" manufacturer="Epson" model="33" parameters="standard_params" />
-      <printer name="Epson Stylus C61" driver="escp2-c61" manufacturer="Epson" model="52" parameters="standard_params" />
-      <printer name="Epson Stylus C62" driver="escp2-c62" manufacturer="Epson" model="52" parameters="standard_params" />
-      <printer name="Epson Stylus C63" driver="escp2-c63" manufacturer="Epson" model="61" parameters="standard_params" />
-      <printer name="Epson Stylus C64" driver="escp2-c64" manufacturer="Epson" model="61" parameters="standard_params" />
-      <printer name="Epson Stylus C65" driver="escp2-c65" manufacturer="Epson" model="66" parameters="standard_params" />
-      <printer name="Epson Stylus C66" driver="escp2-c66" manufacturer="Epson" model="66" parameters="standard_params" />
-      <printer name="Epson Stylus C68" driver="escp2-c68" manufacturer="Epson" model="66" parameters="standard_params" />
-      <printer name="Epson Stylus C70" driver="escp2-c70" manufacturer="Epson" model="44" parameters="standard_params" />
-      <printer name="Epson Stylus C79" driver="escp2-c79" manufacturer="Epson" model="66" parameters="standard_params" />
-      <printer name="Epson Stylus C80" driver="escp2-c80" manufacturer="Epson" model="44" parameters="standard_params" />
-      <printer name="Epson Stylus C82" driver="escp2-c82" manufacturer="Epson" model="55" parameters="standard_params" />
-      <printer name="Epson Stylus C83" driver="escp2-c83" manufacturer="Epson" model="60" parameters="standard_params" />
-      <printer name="Epson Stylus C84" driver="escp2-c84" manufacturer="Epson" model="60" parameters="standard_params" />
-      <printer name="Epson Stylus C85" driver="escp2-c85" manufacturer="Epson" model="69" parameters="standard_params" />
-      <printer name="Epson Stylus C86" driver="escp2-c86" manufacturer="Epson" model="69" parameters="standard_params" />
-      <printer name="Epson Stylus C87" driver="escp2-c87" manufacturer="Epson" model="69" parameters="standard_params" />
-      <printer name="Epson Stylus C88" driver="escp2-c88" manufacturer="Epson" model="69" parameters="standard_params" />
-      <printer name="Epson Stylus C110" driver="escp2-c110" manufacturer="Epson" model="85" parameters="standard_params" />
-      <printer name="Epson Stylus C120" driver="escp2-c120" manufacturer="Epson" model="85" parameters="standard_params" />
-      <printer name="Epson Stylus Color" driver="escp2" manufacturer="Epson" model="0" parameters="standard_params" />
-      <printer name="Epson Stylus Color I" driver="escp2-i" manufacturer="Epson" model="0" parameters="standard_params" />
-      <printer name="Epson Stylus Color II" driver="escp2-ii" manufacturer="Epson" model="0" parameters="standard_params" />
-      <printer name="Epson Stylus Color IIs" driver="escp2-iis" manufacturer="Epson" model="0" parameters="standard_params" />
-      <printer name="Epson Stylus Color PRO" driver="escp2-pro" manufacturer="Epson" model="45" parameters="standard_params" />
-      <printer name="Epson Stylus Pro XL" driver="escp2-pro-xl" manufacturer="Epson" model="39" parameters="standard_params" />
-      <printer name="Epson Stylus Color 400" driver="escp2-400" manufacturer="Epson" model="1" parameters="standard_params" />
-      <printer name="Epson Stylus Color 440" driver="escp2-440" manufacturer="Epson" model="10" parameters="standard_params" />
-      <printer name="Epson Stylus Color 460" driver="escp2-460" manufacturer="Epson" model="10" parameters="standard_params" />
-      <printer name="Epson Stylus Color 480" driver="escp2-480" manufacturer="Epson" model="21" parameters="480_params" />
-      <printer name="Epson Stylus Color 500" driver="escp2-500" manufacturer="Epson" model="1" parameters="standard_params" />
-      <printer name="Epson Stylus Color 580" driver="escp2-580" manufacturer="Epson" model="38" parameters="480_params" />
-      <printer name="Epson Stylus Color 600" driver="escp2-600" manufacturer="Epson" model="3" parameters="standard_params" />
-      <printer name="Epson Stylus Color 640" driver="escp2-640" manufacturer="Epson" model="11" parameters="standard_params" />
-      <printer name="Epson Stylus Color 660" driver="escp2-660" manufacturer="Epson" model="18" parameters="standard_params" />
-      <printer name="Epson Stylus Color 670" driver="escp2-670" manufacturer="Epson" model="25" parameters="standard_params" />
-      <printer name="Epson Stylus Color 680" driver="escp2-680" manufacturer="Epson" model="32" parameters="standard_params" />
-      <printer name="Epson Stylus Color 740" driver="escp2-740" manufacturer="Epson" model="12" parameters="standard_params" />
-      <printer name="Epson Stylus Color 760" driver="escp2-760" manufacturer="Epson" model="19" parameters="standard_params" />
-      <printer name="Epson Stylus Color 777" driver="escp2-777" manufacturer="Epson" model="32" parameters="standard_params" />
-      <printer name="Epson Stylus Color 800" driver="escp2-800" manufacturer="Epson" model="4" parameters="standard_params" />
-      <printer name="Epson Stylus Color 850" driver="escp2-850" manufacturer="Epson" model="5" parameters="standard_params" />
-      <printer name="Epson Stylus Color 860" driver="escp2-860" manufacturer="Epson" model="16" parameters="standard_params" />
-      <printer name="Epson Stylus Color 880" driver="escp2-880" manufacturer="Epson" model="33" parameters="standard_params" />
-      <printer name="Epson Stylus Color 8 3" driver="escp2-83" manufacturer="Epson" model="33" parameters="standard_params" />
-      <printer name="Epson Stylus Color 900" driver="escp2-900" manufacturer="Epson" model="13" parameters="standard_params" />
-      <printer name="Epson Stylus Color 980" driver="escp2-980" manufacturer="Epson" model="34" parameters="standard_params" />
-      <printer name="Epson Stylus Color 1160" driver="escp2-1160" manufacturer="Epson" model="17" parameters="standard_params" />
-      <printer name="Epson Stylus Color 1500" driver="escp2-1500" manufacturer="Epson" model="2" parameters="standard_params" />
-      <printer name="Epson Stylus Color 1520" driver="escp2-1520" manufacturer="Epson" model="6" parameters="standard_params" />
-      <printer name="Epson Stylus Color 3000" driver="escp2-3000" manufacturer="Epson" model="24" parameters="standard_params" />
-      <printer name="Epson Stylus Photo" driver="escp2-photo" manufacturer="Epson" model="9" parameters="standard_params" />
-      <printer name="Epson Stylus Photo 700" driver="escp2-700" manufacturer="Epson" model="7" parameters="standard_params" />
-      <printer name="Epson Stylus Photo EX" driver="escp2-ex" manufacturer="Epson" model="8" parameters="standard_params" />
-      <printer name="Epson Stylus Photo EX3" driver="escp2-ex3" manufacturer="Epson" model="54" parameters="standard_params" />
-      <printer name="Epson Stylus Photo 720" driver="escp2-720" manufacturer="Epson" model="20" parameters="standard_params" />
-      <printer name="Epson Stylus Photo 750" driver="escp2-750" manufacturer="Epson" model="14" parameters="standard_params" />
-      <printer name="Epson Stylus Photo 780" driver="escp2-780" manufacturer="Epson" model="35" parameters="standard_params" />
-    <!--
-         Note that the 785EPX has a roll feed holder.  It's more like the 890
-         than the 780, despite the name.
-    -->
-      <printer name="Epson Stylus Photo 785" driver="escp2-785" manufacturer="Epson" model="36" parameters="standard_params" />
-      <printer name="Epson Stylus Photo 790" driver="escp2-790" manufacturer="Epson" model="35" parameters="standard_params" />
-      <printer name="Epson Stylus Photo 810" driver="escp2-810" manufacturer="Epson" model="78" parameters="standard_params" />
-      <printer name="Epson Stylus Photo 820" driver="escp2-820" manufacturer="Epson" model="78" parameters="standard_params" />
-      <printer name="Epson Stylus Photo 825" driver="escp2-825" manufacturer="Epson" model="50" parameters="standard_params" />
-      <printer name="Epson Stylus Photo 830" driver="escp2-830" manufacturer="Epson" model="50" parameters="standard_params" />
-      <printer name="Epson Stylus Photo 830U" driver="escp2-830u" manufacturer="Epson" model="50" parameters="standard_params" />
-      <printer name="Epson Stylus Photo 870" driver="escp2-870" manufacturer="Epson" model="22" parameters="standard_params" />
-      <printer name="Epson Stylus Photo 875" driver="escp2-875" manufacturer="Epson" model="22" parameters="standard_params" />
-      <printer name="Epson Stylus Photo 890" driver="escp2-890" manufacturer="Epson" model="36" parameters="standard_params" />
-      <printer name="Epson Stylus Photo 895" driver="escp2-895" manufacturer="Epson" model="36" parameters="standard_params" />
-      <printer name="Epson Stylus Photo 900" driver="escp2-ph900" manufacturer="Epson" model="62" parameters="standard_params" />
-      <printer name="Epson Stylus Photo 915" driver="escp2-915" manufacturer="Epson" model="36" parameters="standard_params" />
-      <printer name="Epson Stylus Photo 925" driver="escp2-925" manufacturer="Epson" model="51" parameters="standard_params" />
-      <printer name="Epson Stylus Photo 935" driver="escp2-935" manufacturer="Epson" model="36" parameters="standard_params" />
-      <printer name="Epson Stylus Photo 950" driver="escp2-950" manufacturer="Epson" model="46" parameters="standard_params" />
-      <printer name="Epson Stylus Photo 960" driver="escp2-960" manufacturer="Epson" model="46" parameters="standard_params" />
-      <printer name="Epson Stylus Photo 1200" driver="escp2-1200" manufacturer="Epson" model="15" parameters="standard_params" />
-      <printer name="Epson Stylus Photo 1270" driver="escp2-1270" manufacturer="Epson" model="23" parameters="standard_params" />
-      <printer name="Epson Stylus Photo 1280" driver="escp2-1280" manufacturer="Epson" model="37" parameters="standard_params" />
-      <printer name="Epson Stylus Photo 1290" driver="escp2-1290" manufacturer="Epson" model="37" parameters="standard_params" />
-      <printer name="Epson Stylus Photo 1400" driver="escp2-1400" manufacturer="Epson" model="82" parameters="claria_params" />
-      <printer name="Epson Stylus Photo 1410" driver="escp2-1410" manufacturer="Epson" model="82" parameters="claria_params" />
-      <printer name="Epson Stylus Photo 2000P" driver="escp2-2000" manufacturer="Epson" model="26" parameters="standard_params" />
-      <printer name="Epson Stylus Photo 2100" driver="escp2-2100" manufacturer="Epson" model="47" parameters="standard_params" />
-      <printer name="Epson Stylus Photo 2200" driver="escp2-2200" manufacturer="Epson" model="47" parameters="standard_params" />
-      <printer name="Epson Stylus Photo R200" driver="escp2-r200" manufacturer="Epson" model="63" parameters="standard_params" />
-      <printer name="Epson Stylus Photo R210" driver="escp2-r210" manufacturer="Epson" model="63" parameters="standard_params" />
-      <printer name="Epson Stylus Photo R220" driver="escp2-r220" manufacturer="Epson" model="84" parameters="standard_params" />
-      <printer name="Epson Stylus Photo R230" driver="escp2-r230" manufacturer="Epson" model="84" parameters="standard_params" />
-      <printer name="Epson Stylus Photo R240" driver="escp2-r240" manufacturer="Epson" model="83" parameters="standard_params" />
-      <printer name="Epson Stylus Photo R245" driver="escp2-r245" manufacturer="Epson" model="83" parameters="standard_params" />
-      <printer name="Epson Stylus Photo R260" driver="escp2-r260" manufacturer="Epson" model="81" parameters="claria_params" />
-      <printer name="Epson Stylus Photo R265" driver="escp2-r265" manufacturer="Epson" model="81" parameters="claria_params" />
-      <printer name="Epson Stylus Photo R270" driver="escp2-r270" manufacturer="Epson" model="81" parameters="claria_params" />
-      <printer name="Epson Stylus Photo R280" driver="escp2-r280" manufacturer="Epson" model="81" parameters="claria_params" />
-      <printer name="Epson Stylus Photo R285" driver="escp2-r285" manufacturer="Epson" model="81" parameters="claria_params" />
-      <printer name="Epson Stylus Photo R300" driver="escp2-r300" manufacturer="Epson" model="63" parameters="standard_params" />
-      <printer name="Epson Stylus Photo R310" driver="escp2-r310" manufacturer="Epson" model="63" parameters="standard_params" />
-      <printer name="Epson Stylus Photo R320" driver="escp2-r320" manufacturer="Epson" model="63" parameters="standard_params" />
-      <printer name="Epson Stylus Photo R340" driver="escp2-r340" manufacturer="Epson" model="84" parameters="standard_params" />
-      <printer name="Epson Stylus Photo R350" driver="escp2-r350" manufacturer="Epson" model="84" parameters="standard_params" />
-      <printer name="Epson Stylus Photo R360" driver="escp2-r360" manufacturer="Epson" model="81" parameters="claria_params" />
-      <printer name="Epson Stylus Photo R380" driver="escp2-r380" manufacturer="Epson" model="81" parameters="claria_params" />
-      <printer name="Epson Stylus Photo R390" driver="escp2-r390" manufacturer="Epson" model="81" parameters="claria_params" />
-      <printer name="Epson Stylus Photo RX400" driver="escp2-rx400" manufacturer="Epson" model="84" parameters="standard_params" />
-      <printer name="Epson Stylus Photo RX420" driver="escp2-rx420" manufacturer="Epson" model="84" parameters="standard_params" />
-      <printer name="Epson Stylus Photo RX425" driver="escp2-rx425" manufacturer="Epson" model="84" parameters="standard_params" />
-      <printer name="Epson Stylus Photo RX430" driver="escp2-rx430" manufacturer="Epson" model="84" parameters="standard_params" />
-      <printer name="Epson Stylus Photo RX500" driver="escp2-rx500" manufacturer="Epson" model="84" parameters="standard_params" />
-      <printer name="Epson Stylus Photo RX510" driver="escp2-rx510" manufacturer="Epson" model="84" parameters="standard_params" />
-      <printer name="Epson Stylus Photo RX560" driver="escp2-rx560" manufacturer="Epson" model="81" parameters="claria_params" />
-      <printer name="Epson Stylus Photo RX580" driver="escp2-rx580" manufacturer="Epson" model="81" parameters="claria_params" />
-      <printer name="Epson Stylus Photo RX585" driver="escp2-rx585" manufacturer="Epson" model="81" parameters="claria_params" />
-      <printer name="Epson Stylus Photo RX590" driver="escp2-rx590" manufacturer="Epson" model="81" parameters="claria_params" />
-      <printer name="Epson Stylus Photo RX595" driver="escp2-rx595" manufacturer="Epson" model="81" parameters="claria_params" />
-      <printer name="Epson Stylus Photo RX600" driver="escp2-rx600" manufacturer="Epson" model="84" parameters="standard_params" />
-      <printer name="Epson Stylus Photo RX620" driver="escp2-rx620" manufacturer="Epson" model="84" parameters="standard_params" />
-      <printer name="Epson Stylus Photo RX630" driver="escp2-rx630" manufacturer="Epson" model="84" parameters="standard_params" />
-      <printer name="Epson Stylus Photo RX640" driver="escp2-rx640" manufacturer="Epson" model="81" parameters="claria_params" />
-      <printer name="Epson Stylus Photo RX680" driver="escp2-rx680" manufacturer="Epson" model="81" parameters="claria_params" />
-      <printer name="Epson Stylus Photo RX685" driver="escp2-rx685" manufacturer="Epson" model="81" parameters="claria_params" />
-      <printer name="Epson Stylus Photo RX700" driver="escp2-rx700" manufacturer="Epson" model="70" parameters="standard_params" />
-      <printer name="Epson Stylus Photo R800" driver="escp2-r800" manufacturer="Epson" model="64" parameters="standard_params" />
-      <printer name="Epson Stylus Photo R1800" driver="escp2-r1800" manufacturer="Epson" model="67" parameters="standard_params" />
-      <printer name="Epson Stylus Photo R2400" driver="escp2-r2400" manufacturer="Epson" model="71" parameters="standard_params" />
-      <printer name="Epson Stylus Pro 5000" driver="escp2-5000" manufacturer="Epson" model="27" parameters="standard_params" />
-      <printer name="Epson Stylus Pro 5500" driver="escp2-5500" manufacturer="Epson" model="40" parameters="pro_5500_params" />
-      <printer name="Epson Stylus Pro 7000" driver="escp2-7000" manufacturer="Epson" model="28" parameters="standard_params" />
-      <printer name="Epson Stylus Pro 7500" driver="escp2-7500" manufacturer="Epson" model="29" parameters="pro_5500_params" />
-      <printer name="Epson Stylus Pro 7600" driver="escp2-7600" manufacturer="Epson" model="48" parameters="standard_params" />
-      <printer name="Epson Stylus Pro 9000" driver="escp2-9000" manufacturer="Epson" model="30" parameters="standard_params" />
-      <printer name="Epson Stylus Pro 9500" driver="escp2-9500" manufacturer="Epson" model="31" parameters="pro_5500_params" />
-      <printer name="Epson Stylus Pro 9600" driver="escp2-9600" manufacturer="Epson" model="49" parameters="standard_params" />
-      <printer name="Epson Stylus Pro 10000" driver="escp2-10000" manufacturer="Epson" model="41" parameters="standard_params" />
-      <printer name="Epson Stylus Scan 2000" driver="escp2-scan2000" manufacturer="Epson" model="12" parameters="standard_params" />
-      <printer name="Epson Stylus Scan 2500" driver="escp2-scan2500" manufacturer="Epson" model="12" parameters="standard_params" />
-      <printer name="Epson Stylus CX1500" driver="escp2-cx1500" manufacturer="Epson" model="43" parameters="480_params" />
-      <printer name="Epson Stylus CX3100" driver="escp2-cx3100" manufacturer="Epson" model="52" parameters="standard_params" />
-      <printer name="Epson Stylus CX3200" driver="escp2-cx3200" manufacturer="Epson" model="52" parameters="standard_params" />
-      <printer name="Epson Stylus CX3500" driver="escp2-cx3500" manufacturer="Epson" model="65" parameters="cx3500_params" />
-      <printer name="Epson Stylus CX3600" driver="escp2-cx3600" manufacturer="Epson" model="65" parameters="cx3500_params" />
-      <printer name="Epson Stylus CX3650" driver="escp2-cx3650" manufacturer="Epson" model="65" parameters="cx3500_params" />
-      <printer name="Epson Stylus CX3700" driver="escp2-cx3700" manufacturer="Epson" model="72" parameters="standard_params" />
-      <printer name="Epson Stylus CX3800" driver="escp2-cx3800" manufacturer="Epson" model="72" parameters="standard_params" />
-      <printer name="Epson Stylus CX3805" driver="escp2-cx3805" manufacturer="Epson" model="72" parameters="standard_params" />
-      <printer name="Epson Stylus CX3810" driver="escp2-cx3810" manufacturer="Epson" model="72" parameters="standard_params" />
-      <printer name="Epson Stylus CX4100" driver="escp2-cx4100" manufacturer="Epson" model="65" parameters="cx3500_params" />
-      <printer name="Epson Stylus CX4200" driver="escp2-cx4200" manufacturer="Epson" model="65" parameters="cx3500_params" />
-      <printer name="Epson Stylus CX4400" driver="escp2-cx4400" manufacturer="Epson" model="72" parameters="standard_params" />
-      <printer name="Epson Stylus CX4500" driver="escp2-cx4500" manufacturer="Epson" model="65" parameters="cx3500_params" />
-      <printer name="Epson Stylus CX4600" driver="escp2-cx4600" manufacturer="Epson" model="65" parameters="cx3500_params" />
-      <printer name="Epson Stylus CX4700" driver="escp2-cx4700" manufacturer="Epson" model="65" parameters="cx3500_params" />
-      <printer name="Epson Stylus CX4800" driver="escp2-cx4800" manufacturer="Epson" model="65" parameters="cx3500_params" />
-      <printer name="Epson Stylus CX4900" driver="escp2-cx4900" manufacturer="Epson" model="65" parameters="cx3500_params" />
-      <printer name="Epson Stylus CX5000" driver="escp2-cx5000" manufacturer="Epson" model="65" parameters="cx3500_params" />
-      <printer name="Epson Stylus CX5000F" driver="escp2-cx5000f" manufacturer="Epson" model="65" parameters="cx3500_params" />
-      <printer name="Epson Stylus CX5100" driver="escp2-cx5100" manufacturer="Epson" model="55" parameters="cx3500_params" />
-      <printer name="Epson Stylus CX5200" driver="escp2-cx5200" manufacturer="Epson" model="55" parameters="cx3500_params" />
-      <printer name="Epson Stylus CX5300" driver="escp2-cx5300" manufacturer="Epson" model="55" parameters="cx3500_params" />
-      <printer name="Epson Stylus CX5400" driver="escp2-cx5400" manufacturer="Epson" model="55" parameters="cx3500_params" />
-      <printer name="Epson Stylus CX5600" driver="escp2-cx5600" manufacturer="Epson" model="72" parameters="standard_params" />
-      <printer name="Epson Stylus CX5700" driver="escp2-cx5700" manufacturer="Epson" model="65" parameters="cx3500_params" />
-      <printer name="Epson Stylus CX5800" driver="escp2-cx5800" manufacturer="Epson" model="65" parameters="cx3500_params" />
-      <printer name="Epson Stylus CX6000" driver="escp2-cx6000" manufacturer="Epson" model="65" parameters="cx3500_params" />
-      <printer name="Epson Stylus CX6300" driver="escp2-cx6300" manufacturer="Epson" model="79" parameters="cx3500_params" />
-      <printer name="Epson Stylus CX6400" driver="escp2-cx6400" manufacturer="Epson" model="79" parameters="cx3500_params" />
-      <printer name="Epson Stylus CX6500" driver="escp2-cx6500" manufacturer="Epson" model="80" parameters="cx3500_params" />
-      <printer name="Epson Stylus CX6600" driver="escp2-cx6600" manufacturer="Epson" model="80" parameters="cx3500_params" />
-      <printer name="Epson Stylus CX7000F" driver="escp2-cx7000f" manufacturer="Epson" model="65" parameters="cx3500_params" />
-      <printer name="Epson Stylus CX7400" driver="escp2-cx7400" manufacturer="Epson" model="65" parameters="cx3500_params" />
-      <printer name="Epson Stylus CX7700" driver="escp2-cx7700" manufacturer="Epson" model="80" parameters="cx3500_params" />
-      <printer name="Epson Stylus CX7800" driver="escp2-cx7800" manufacturer="Epson" model="65" parameters="cx3500_params" />
-      <printer name="Epson Stylus CX8300" driver="escp2-cx8300" manufacturer="Epson" model="79" parameters="cx3500_params" />
-      <printer name="Epson Stylus CX8400" driver="escp2-cx8400" manufacturer="Epson" model="79" parameters="cx3500_params" />
-      <printer name="Epson Stylus CX9400" driver="escp2-cx9400" manufacturer="Epson" model="65" parameters="cx3500_params" />
-      <printer name="Epson Stylus D68" driver="escp2-d68" manufacturer="Epson" model="66" parameters="standard_params" />
-      <printer name="Epson Stylus D88" driver="escp2-d88" manufacturer="Epson" model="69" parameters="standard_params" />
-      <printer name="Epson Stylus D92" driver="escp2-d92" manufacturer="Epson" model="66" parameters="standard_params" />
-      <printer name="Epson Stylus D120" driver="escp2-d120" manufacturer="Epson" model="85" parameters="standard_params" />
-      <printer name="Epson Stylus DX3800" driver="escp2-dx3800" manufacturer="Epson" model="72" parameters="standard_params" />
-      <printer name="Epson Stylus DX3850" driver="escp2-dx3850" manufacturer="Epson" model="72" parameters="standard_params" />
-      <printer name="Epson Stylus DX4050" driver="escp2-dx4050" manufacturer="Epson" model="72" parameters="standard_params" />
-      <printer name="Epson Stylus DX4200" driver="escp2-dx4200" manufacturer="Epson" model="65" parameters="cx3500_params" />
-      <printer name="Epson Stylus DX4250" driver="escp2-dx4250" manufacturer="Epson" model="65" parameters="cx3500_params" />
-      <printer name="Epson Stylus DX4400" driver="escp2-dx4400" manufacturer="Epson" model="72" parameters="standard_params" />
-      <printer name="Epson Stylus DX4450" driver="escp2-dx4450" manufacturer="Epson" model="72" parameters="standard_params" />
-      <printer name="Epson Stylus DX4800" driver="escp2-dx4800" manufacturer="Epson" model="65" parameters="standard_params" />
-      <printer name="Epson Stylus DX7000F" driver="escp2-dx7000f" manufacturer="Epson" model="65" parameters="cx3500_params" />
-      <printer name="Epson Stylus DX7400" driver="escp2-dx7400" manufacturer="Epson" model="65" parameters="cx3500_params" />
-      <printer name="Epson Stylus DX7450" driver="escp2-dx7450" manufacturer="Epson" model="65" parameters="cx3500_params" />
-      <printer name="Epson Stylus DX8400" driver="escp2-dx8400" manufacturer="Epson" model="79" parameters="cx3500_params" />
-      <printer name="Epson Stylus DX8450" driver="escp2-dx8450" manufacturer="Epson" model="79" parameters="cx3500_params" />
-      <printer name="Epson PictureMate" driver="escp2-picmate" manufacturer="Epson" model="73" parameters="standard_params" />
-      <printer name="Epson PictureMate Dash" driver="escp2-picmatedash" manufacturer="Epson" model="86" parameters="standard_params" />
-      <printer name="Epson PictureMate Deluxe" driver="escp2-picmated" manufacturer="Epson" model="73" parameters="standard_params" />
-      <printer name="Epson PictureMate Flash" driver="escp2-picmateflash" manufacturer="Epson" model="86" parameters="standard_params" />
-      <printer name="Epson PictureMate Pal" driver="escp2-picmatepal" manufacturer="Epson" model="86" parameters="standard_params" />
-      <printer name="Epson PictureMate Snap" driver="escp2-picmatesnap" manufacturer="Epson" model="86" parameters="standard_params" />
-      <printer name="Epson PictureMate 100" driver="escp2-picmate100" manufacturer="Epson" model="86" parameters="standard_params" />
-      <printer name="Epson PictureMate 200" driver="escp2-picmate200" manufacturer="Epson" model="73" parameters="standard_params" />
-      <printer name="Epson PictureMate 210" driver="escp2-picmate210" manufacturer="Epson" model="86" parameters="standard_params" />
-      <printer name="Epson PictureMate 240" driver="escp2-picmate240" manufacturer="Epson" model="86" parameters="standard_params" />
-      <printer name="Epson PictureMate 250" driver="escp2-picmate250" manufacturer="Epson" model="86" parameters="standard_params" />
-      <printer name="Epson PictureMate 260" driver="escp2-picmate260" manufacturer="Epson" model="86" parameters="standard_params" />
-      <printer name="Epson PictureMate 270" driver="escp2-picmate270" manufacturer="Epson" model="86" parameters="standard_params" />
-      <printer name="Epson PictureMate 280" driver="escp2-picmate280" manufacturer="Epson" model="86" parameters="standard_params" />
-      <printer name="Epson PictureMate 290" driver="escp2-picmate290" manufacturer="Epson" model="86" parameters="standard_params" />
-      <printer name="Epson PictureMate 500" driver="escp2-picmate500" manufacturer="Epson" model="73" parameters="standard_params" />
-      <printer name="Epson PictureMate 2005" driver="escp2-picmate2005" manufacturer="Epson" model="73" parameters="standard_params" />
-      <printer name="Epson CL 700" driver="escp2-cl700" manufacturer="Epson" model="38" parameters="480_params" />
-      <printer name="Epson CL 750" driver="escp2-cl750" manufacturer="Epson" model="43" parameters="480_params" />
-      <printer name="Epson CL 760" driver="escp2-cl760" manufacturer="Epson" model="56" parameters="480_params" />
-      <printer name="Epson E 100" driver="escp2-e100" manufacturer="Epson" model="73" parameters="standard_params" />
-      <printer name="Epson E 150" driver="escp2-e150" manufacturer="Epson" model="86" parameters="standard_params" />
-      <printer name="Epson E 200" driver="escp2-e200" manufacturer="Epson" model="73" parameters="standard_params" />
-      <printer name="Epson E 300" driver="escp2-e300" manufacturer="Epson" model="86" parameters="standard_params" />
-      <printer name="Epson E 500" driver="escp2-e500" manufacturer="Epson" model="86" parameters="standard_params" />
-      <printer name="Epson E 520" driver="escp2-e520" manufacturer="Epson" model="86" parameters="standard_params" />
-      <printer name="Epson E 700" driver="escp2-e700" manufacturer="Epson" model="86" parameters="standard_params" />
-      <printer name="Epson E 720" driver="escp2-e720" manufacturer="Epson" model="86" parameters="standard_params" />
-      <printer name="Epson EM 900C" driver="escp2-em900c" manufacturer="Epson" model="13" parameters="standard_params" />
-      <printer name="Epson EM 930C" driver="escp2-em930c" manufacturer="Epson" model="34" parameters="standard_params" />
-      <printer name="Epson MC 2000" driver="escp2-mc2000" manufacturer="Epson" model="26" parameters="standard_params" />
-      <printer name="Epson MC 5000" driver="escp2-mc5000" manufacturer="Epson" model="40" parameters="pro_5500_params" />
-      <printer name="Epson MC 7000" driver="escp2-mc7000" manufacturer="Epson" model="29" parameters="pro_5500_params" />
-      <printer name="Epson MC 9000" driver="escp2-mc9000" manufacturer="Epson" model="31" parameters="pro_5500_params" />
-      <printer name="Epson MC 10000" driver="escp2-mc10000" manufacturer="Epson" model="41" parameters="standard_params" />
-      <printer name="Epson MJ 930C" driver="escp2-mj930c" manufacturer="Epson" model="4" parameters="standard_params" />
-      <printer name="Epson MJ 5100C" driver="escp2-mj5100c" manufacturer="Epson" model="39" parameters="standard_params" />
-      <printer name="Epson MJ 6000C" driver="escp2-mj6000c" manufacturer="Epson" model="6" parameters="standard_params" />
-      <printer name="Epson MJ 8000C" driver="escp2-mj8000c" manufacturer="Epson" model="24" parameters="standard_params" />
-      <printer name="Epson PM 670C" driver="escp2-pm670c" manufacturer="Epson" model="7" parameters="standard_params" />
-      <printer name="Epson PM 700C" driver="escp2-pm700c" manufacturer="Epson" model="9" parameters="standard_params" />
-      <printer name="Epson PM 730C" driver="escp2-pm730c" manufacturer="Epson" model="35" parameters="standard_params" />
-      <printer name="Epson PM 740C" driver="escp2-pm740c" manufacturer="Epson" model="35" parameters="standard_params" />
-      <printer name="Epson PM 750C" driver="escp2-pm750c" manufacturer="Epson" model="7" parameters="standard_params" />
-      <printer name="Epson PM 760C" driver="escp2-pm760c" manufacturer="Epson" model="20" parameters="standard_params" />
-      <printer name="Epson PM 770C" driver="escp2-pm770c" manufacturer="Epson" model="14" parameters="standard_params" />
-      <printer name="Epson PM 780C" driver="escp2-pm780c" manufacturer="Epson" model="35" parameters="standard_params" />
-      <printer name="Epson PM 790PT" driver="escp2-pm790pt" manufacturer="Epson" model="36" parameters="standard_params" />
-      <printer name="Epson PM 800C" driver="escp2-pm800c" manufacturer="Epson" model="22" parameters="standard_params" />
-      <printer name="Epson PM 850PT" driver="escp2-pm850pt" manufacturer="Epson" model="51" parameters="standard_params" />
-      <printer name="Epson PM 870C" driver="escp2-pm870c" manufacturer="Epson" model="36" parameters="standard_params" />
-      <printer name="Epson PM 880C" driver="escp2-pm880c" manufacturer="Epson" model="36" parameters="standard_params" />
-      <printer name="Epson PM 930C" driver="escp2-pm930c" manufacturer="Epson" model="58" parameters="standard_params" />
-      <printer name="Epson PM 940C" driver="escp2-pm940c" manufacturer="Epson" model="58" parameters="standard_params" />
-      <printer name="Epson PM 950C" driver="escp2-pm950c" manufacturer="Epson" model="53" parameters="standard_params" />
-      <printer name="Epson PM 970C" driver="escp2-pm970c" manufacturer="Epson" model="57" parameters="standard_params" />
-      <printer name="Epson PM 980C" driver="escp2-pm980c" manufacturer="Epson" model="57" parameters="standard_params" />
-      <printer name="Epson PM 2000C" driver="escp2-pm2000c" manufacturer="Epson" model="8" parameters="standard_params" />
-      <printer name="Epson PM 2200C" driver="escp2-pm2200c" manufacturer="Epson" model="54" parameters="standard_params" />
-      <printer name="Epson PM 3000C" driver="escp2-pm3000c" manufacturer="Epson" model="15" parameters="standard_params" />
-      <printer name="Epson PM 3300C" driver="escp2-pm3300c" manufacturer="Epson" model="23" parameters="standard_params" />
-      <printer name="Epson PM 3500C" driver="escp2-pm3500c" manufacturer="Epson" model="37" parameters="standard_params" />
-      <printer name="Epson PM 3700C" driver="escp2-pm3700c" manufacturer="Epson" model="37" parameters="standard_params" />
-      <printer name="Epson PM 4000PX" driver="escp2-pm4000px" manufacturer="Epson" model="47" parameters="standard_params" />
-      <printer name="Epson PM 5000C" driver="escp2-pm5000c" manufacturer="Epson" model="27" parameters="standard_params" />
-      <printer name="Epson PM 7000C" driver="escp2-pm7000c" manufacturer="Epson" model="28" parameters="standard_params" />
-      <printer name="Epson PM 9000C" driver="escp2-pm9000c" manufacturer="Epson" model="30" parameters="standard_params" />
-      <printer name="Epson PM 10000" driver="escp2-pm10000" manufacturer="Epson" model="41" parameters="standard_params" />
-      <printer name="Epson PM A650" driver="escp2-pma650" manufacturer="Epson" model="74" parameters="standard_params" />
-      <printer name="Epson PM A750" driver="escp2-pma750" manufacturer="Epson" model="75" parameters="standard_params" />
-      <printer name="Epson PM A820" driver="escp2-pma820" manufacturer="Epson" model="81" parameters="claria_params" />
-      <printer name="Epson PM A890" driver="escp2-pma890" manufacturer="Epson" model="76" parameters="standard_params" />
-      <printer name="Epson PM A900" driver="escp2-pma900" manufacturer="Epson" model="70" parameters="standard_params" />
-      <printer name="Epson PM A950" driver="escp2-pma950" manufacturer="Epson" model="70" parameters="standard_params" />
-      <printer name="Epson PM D600" driver="escp2-pmd600" manufacturer="Epson" model="77" parameters="standard_params" />
-      <printer name="Epson PM D750" driver="escp2-pmd750" manufacturer="Epson" model="63" parameters="standard_params" />
-      <printer name="Epson PM D770" driver="escp2-pmd770" manufacturer="Epson" model="84" parameters="standard_params" />
-      <printer name="Epson PM D800" driver="escp2-pmd800" manufacturer="Epson" model="84" parameters="standard_params" />
-      <printer name="Epson PM D870" driver="escp2-pmd870" manufacturer="Epson" model="81" parameters="claria_params" />
-      <printer name="Epson PM D1000" driver="escp2-pmd1000" manufacturer="Epson" model="84" parameters="standard_params" />
-      <printer name="Epson PM G700" driver="escp2-pmg700" manufacturer="Epson" model="84" parameters="standard_params" />
-      <printer name="Epson PM G720" driver="escp2-pmg720" manufacturer="Epson" model="84" parameters="standard_params" />
-      <printer name="Epson PM G730" driver="escp2-pmg730" manufacturer="Epson" model="84" parameters="standard_params" />
-      <printer name="Epson PM G800" driver="escp2-pmg800" manufacturer="Epson" model="68" parameters="standard_params" />
-      <printer name="Epson PM G820" driver="escp2-pmg820" manufacturer="Epson" model="68" parameters="standard_params" />
-      <printer name="Epson PM G850" driver="escp2-pmg850" manufacturer="Epson" model="81" parameters="claria_params" />
-      <printer name="Epson PM G4500" driver="escp2-pmg4500" manufacturer="Epson" model="82" parameters="standard_params" />
-      <printer name="Epson PX A650" driver="escp2-pxa650" manufacturer="Epson" model="65" parameters="cx3500_params" />
-      <printer name="Epson PX G900" driver="escp2-pxg900" manufacturer="Epson" model="64" parameters="standard_params" />
-      <printer name="Epson PX G920" driver="escp2-pxg920" manufacturer="Epson" model="64" parameters="standard_params" />
-      <printer name="Epson PX G5000" driver="escp2-pxg5000" manufacturer="Epson" model="67" parameters="standard_params" />
-      <printer name="Epson PX V500" driver="escp2-pxv500" manufacturer="Epson" model="61" parameters="standard_params" />
-      <printer name="Epson PX V600" driver="escp2-pxv600" manufacturer="Epson" model="69" parameters="standard_params" />
-      <printer name="Epson PX V630" driver="escp2-pxv630" manufacturer="Epson" model="69" parameters="standard_params" />
-      <printer name="Epson PX V780" driver="escp2-pxv780" manufacturer="Epson" model="85" parameters="standard_params" />
-      <printer name="Epson PX 5500" driver="escp2-px5500" manufacturer="Epson" model="71" parameters="standard_params" />
-      <printer name="Epson PX 7000" driver="escp2-px7000" manufacturer="Epson" model="48" parameters="standard_params" />
-      <printer name="Epson PX 9000" driver="escp2-px9000" manufacturer="Epson" model="49" parameters="standard_params" />
-    </family>
-    <family name="pcl">
-      <parameters name="pcl_inkjet_params">
-        <parameter type="float" name="Gamma">0.818</parameter>
-        <parameter type="float" name="Density">0.786</parameter>
-      </parameters>
-      <parameters name="pcl_laser_params">
-        <parameter type="float" name="Gamma">1.000</parameter>
-        <parameter type="float" name="Density">1.000</parameter>
-      </parameters>
-      <printer name="Apollo P-2100" driver="pcl-apollo-p2100" manufacturer="Apollo" model="690" parameters="pcl_inkjet_params" />
-      <printer name="Apollo P-2150" driver="pcl-apollo-p2150" manufacturer="Apollo" model="690" parameters="pcl_inkjet_params" />
-      <printer name="Apollo P-2200" driver="pcl-apollo-p2200" manufacturer="Apollo" model="690" parameters="pcl_inkjet_params" />
-      <printer name="Apollo P-2250" driver="pcl-apollo-p2250" manufacturer="Apollo" model="690" parameters="pcl_inkjet_params" />
-      <printer name="Apollo P-2500" driver="pcl-apollo-p2500" manufacturer="Apollo" model="690" parameters="pcl_inkjet_params" />
-      <printer name="Apollo P-2550" driver="pcl-apollo-p2550" manufacturer="Apollo" model="690" parameters="pcl_inkjet_params" />
-      <printer name="Apollo P-2600" driver="pcl-apollo-p2600" manufacturer="Apollo" model="690" parameters="pcl_inkjet_params" />
-      <printer name="Apollo P-2650" driver="pcl-apollo-p2650" manufacturer="Apollo" model="690" parameters="pcl_inkjet_params" />
-      <printer name="Apple Color StyleWriter 4100" driver="pcl-apple-4100" manufacturer="Apple" model="601" parameters="pcl_inkjet_params" />	<!-- Uses 600 series driver -->
-      <printer name="Apple Color StyleWriter 4500" driver="pcl-apple-4500" manufacturer="Apple" model="690" parameters="pcl_inkjet_params" />	<!-- Uses 690 driver -->
-      <printer name="Apple Color StyleWriter 6500" driver="pcl-apple-6500" manufacturer="Apple" model="800" parameters="pcl_inkjet_params" />	<!-- Uses 850 driver -->
-      <printer name="Apple LaserWriter Select 360" driver="pcl-apple-lw360" manufacturer="Apple" model="2" parameters="pcl_laser_params" />
-      <printer name="Brother DCP-1200" driver="brother-dcp-1200" manufacturer="Brother" model="2" parameters="pcl_laser_params" />
-      <printer name="Brother HL-4Ve" driver="brother-hl-4ve" manufacturer="Brother" model="2" parameters="pcl_laser_params" />
-      <printer name="Brother HL-10V" driver="brother-hl-10v" manufacturer="Brother" model="3" parameters="pcl_laser_params" />
-      <printer name="Brother HL-10h" driver="brother-hl-10h" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
-      <printer name="Brother HL-630" driver="brother-hl-630" manufacturer="Brother" model="2" parameters="pcl_laser_params" />
-      <printer name="Brother HL-660" driver="brother-hl-660" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
-      <printer name="Brother HL-760" driver="brother-hl-760" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
-      <printer name="Brother HL-960" driver="brother-hl-960" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
-      <printer name="Brother HL-1040" driver="brother-hl-1040" manufacturer="Brother" model="2" parameters="pcl_laser_params" />
-      <printer name="Brother HL-1050" driver="brother-hl-1050" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
-      <printer name="Brother HL-1060" driver="brother-hl-1060" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
-      <printer name="Brother HL-1070" driver="brother-hl-1070" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
-      <printer name="Brother HL-1240" driver="brother-hl-1240" manufacturer="Brother" model="2" parameters="pcl_laser_params" />
-      <printer name="Brother HL-1250" driver="brother-hl-1250" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
-      <printer name="Brother HL-1260" driver="brother-hl-1260" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
-      <printer name="Brother HL-1270N" driver="brother-hl-1270n" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
-      <printer name="Brother HL-1440" driver="brother-hl-1440" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
-      <printer name="Brother HL-1660e" driver="brother-hl-1660e" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
-      <printer name="Brother HL-2060" driver="brother-hl-2060" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
-      <printer name="Brother MFC-6550MC" driver="brother-mfc-6550mc" manufacturer="Brother" model="2" parameters="pcl_laser_params" />
-      <printer name="Brother MFC-8300" driver="brother-mfc-8300" manufacturer="Brother" model="3" parameters="pcl_laser_params" />
-      <printer name="Brother MFC-9500" driver="brother-mfc-9500" manufacturer="Brother" model="2" parameters="pcl_laser_params" />
-      <printer name="Brother MFC-9600" driver="brother-mfc-9600" manufacturer="Brother" model="2" parameters="pcl_laser_params" />
-      <printer name="Canon GP 335" driver="canon-gp_335" manufacturer="Canon" model="6" parameters="pcl_laser_params" />
-      <printer name="Canon LBP-4sx" driver="canon-lbp-4sx" manufacturer="Canon" model="3" parameters="pcl_laser_params" />
-      <printer name="Canon LBP-430" driver="canon-lbp-430" manufacturer="Canon" model="4" parameters="pcl_laser_params" />
-      <printer name="Canon LBP-1000" driver="canon-lbp-1000" manufacturer="Canon" model="6" parameters="pcl_laser_params" />
-      <printer name="Canon LBP-1260" driver="canon-lbp-1260" manufacturer="Canon" model="6" parameters="pcl_laser_params" />
-      <printer name="Canon LBP-1760" driver="canon-lbp-1760" manufacturer="Canon" model="6" parameters="pcl_laser_params" />
-      <printer name="Canon imageRunner 330s" driver="canon-ir_330s" manufacturer="Canon" model="6" parameters="pcl_laser_params" />
-      <printer name="Citizen ProJet II" driver="citizen-projet_ii" manufacturer="Citizen" model="2" parameters="pcl_laser_params" />
-      <printer name="DEC 1800" driver="dec-1800" manufacturer="DEC" model="3" parameters="pcl_laser_params" />
-      <printer name="DEC LN17" driver="dec-ln17" manufacturer="DEC" model="6" parameters="pcl_laser_params" />
-      <printer name="Epson ActionLaser 1100" driver="epson-actl_1100" manufacturer="Epson" model="3" parameters="pcl_laser_params" />
-      <printer name="Epson ActionLaser II" driver="epson-actl_ii" manufacturer="Epson" model="2" parameters="pcl_laser_params" />
-      <printer name="Epson AcuLaser C2000" driver="epson-acl_c2000" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
-      <printer name="Epson AcuLaser C2000PS" driver="epson-acl_c2000ps" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
-      <printer name="Epson AcuLaser C8500" driver="epson-acl_c8500" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
-      <printer name="Epson AcuLaser C8500PS" driver="epson-acl_c8500ps" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
-      <printer name="Epson AcuLaser C8600" driver="epson-acl_c8600" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
-      <printer name="Epson AcuLaser C8600PS" driver="epson-acl_c8600ps" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
-      <printer name="Epson EPL-5200" driver="epson-epl-5200" manufacturer="Epson" model="3" parameters="pcl_laser_params" />
-      <printer name="Epson EPL-5200+" driver="epson-epl-5200plus" manufacturer="Epson" model="3" parameters="pcl_laser_params" />
-      <printer name="Epson EPL-5700" driver="epson-epl-5700" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
-      <printer name="Epson EPL-5700PS" driver="epson-epl-5700ps" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
-      <printer name="Epson EPL-5800" driver="epson-epl-5800" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
-      <printer name="Epson EPL-5800PS" driver="epson-epl-5800ps" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
-      <printer name="Epson EPL-5900" driver="epson-epl-5900" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
-      <printer name="Epson EPL-5900PS" driver="epson-epl-5900ps" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
-      <printer name="Epson EPL-6100" driver="epson-epl-6100" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
-      <printer name="Epson EPL-6100PS" driver="epson-epl-6100ps" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
-      <printer name="Epson EPL-7100" driver="epson-epl-7100" manufacturer="Epson" model="2" parameters="pcl_laser_params" />
-      <printer name="Fujitsu PrintPartner 10V" driver="fujitsu-pp_10v" manufacturer="Fujitsu" model="6" parameters="pcl_laser_params" />
-      <printer name="Fujitsu PrintPartner 16DV" driver="fujitsu-pp_16dv" manufacturer="Fujitsu" model="6" parameters="pcl_laser_params" />
-      <printer name="Fujitsu PrintPartner 20W" driver="fujitsu-pp_20w" manufacturer="Fujitsu" model="6" parameters="pcl_laser_params" />
-      <printer name="Fujitsu PrintPartner 8000" driver="fujitsu-pp_8000" manufacturer="Fujitsu" model="3" parameters="pcl_laser_params" />
-      <printer name="Generic PCL 4 Printer" driver="pcl-g_4" manufacturer="Generic" model="2" parameters="pcl_laser_params" />
-      <printer name="Generic PCL 4 LF Printer" driver="pcl-g_4_l" manufacturer="Generic" model="23" parameters="pcl_laser_params" />
-      <printer name="Generic PCL 5 Printer" driver="pcl-g_5" manufacturer="Generic" model="3" parameters="pcl_laser_params" />
-      <printer name="Generic PCL 5 LF Printer" driver="pcl-g_5_l" manufacturer="Generic" model="33" parameters="pcl_laser_params" />
-      <printer name="Generic PCL 5c Printer" driver="pcl-g_5c" manufacturer="Generic" model="6" parameters="pcl_laser_params" />
-      <printer name="Generic PCL 5c LF Printer" driver="pcl-g_5c_l" manufacturer="Generic" model="61" parameters="pcl_laser_params" />
-      <printer name="Generic PCL 5e Printer" driver="pcl-g_5e" manufacturer="Generic" model="6" parameters="pcl_laser_params" />
-      <printer name="Generic PCL 5e LF Printer" driver="pcl-g_5e_l" manufacturer="Generic" model="61" parameters="pcl_laser_params" />
-      <printer name="Generic PCL 6/PCL XL Printer" driver="pcl-g_6" manufacturer="Generic" model="6" parameters="pcl_laser_params" />
-      <printer name="Generic PCL 6/PCL XL LF Printer" driver="pcl-g_6_l" manufacturer="Generic" model="61" parameters="pcl_laser_params" />
-      <printer name="HP Business Inkjet 2200" driver="hp-bij_2200" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP Business Inkjet 2230" driver="hp-bij_2230" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP Business Inkjet 2250" driver="hp-bij_2250" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP Business Inkjet 2250TN" driver="hp-bij_2250tn" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP Business Inkjet 2280" driver="hp-bij_2280" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP Color Inkjet Printer CP1160" driver="hp-cij_cp1160" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP Color Inkjet Printer CP1700" driver="hp-cij_cp1700" manufacturer="HP" model="901" parameters="pcl_inkjet_params" />
-      <printer name="HP Color LaserJet 2500" driver="hp-clj_2500" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP Color LaserJet 4500" driver="hp-clj_4500" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP Color LaserJet 4550" driver="hp-clj_4550" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP Color LaserJet 4600" driver="hp-clj_4600" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP Color LaserJet 5" driver="hp-clj_5" manufacturer="HP" model="3" parameters="pcl_laser_params" />
-      <printer name="HP Color LaserJet 5000" driver="hp-clj_5000" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP Color LaserJet 5500" driver="hp-clj_5500" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP Color LaserJet 8550GN" driver="hp-clj_8550gn" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP DesignJet 230" driver="pcl-desnj-230" manufacturer="HP" model="10230" parameters="pcl_inkjet_params" />
-      <printer name="HP DesignJet 250C" driver="pcl-desnj-250" manufacturer="HP" model="10250" parameters="pcl_inkjet_params" />
-      <printer name="HP DesignJet 430" driver="pcl-desnj-430" manufacturer="HP" model="10230" parameters="pcl_inkjet_params" />
-      <printer name="HP DesignJet 450C" driver="pcl-desnj-450" manufacturer="HP" model="10250" parameters="pcl_inkjet_params" />
-      <printer name="HP DesignJet 455CA" driver="pcl-desnj-455" manufacturer="HP" model="10250" parameters="pcl_inkjet_params" />
-      <printer name="HP DesignJet 488CA" driver="pcl-desnj-488" manufacturer="HP" model="10250" parameters="pcl_inkjet_params" />
-      <printer name="HP DesignJet 700" driver="pcl-desnj-700" manufacturer="HP" model="10700" parameters="pcl_inkjet_params" />
-      <printer name="HP DesignJet 750C Plus" driver="hp-desnj_750c_plus" manufacturer="HP" model="10750" parameters="pcl_inkjet_params" />
-      <printer name="HP DesignJet 750C" driver="pcl-750" manufacturer="HP" model="10750" parameters="pcl_inkjet_params" />
-      <printer name="HP DesignJet 2500CP" driver="pcl-desnj-2500" manufacturer="HP" model="12500" parameters="pcl_inkjet_params" />
-      <printer name="HP DesignJet 3500CP" driver="pcl-desnj-3500" manufacturer="HP" model="13500" parameters="pcl_inkjet_params" />
-      <printer name="HP DesignJet ColorPro CAD" driver="hp-desnj_cp_cad" manufacturer="HP" model="2500" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 400" driver="pcl-400" manufacturer="HP" model="400" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 420C" driver="hp-dj_420c" manufacturer="HP" model="540" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 450" driver="hp-dj_450" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 500" driver="pcl-500" manufacturer="HP" model="500" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 500C" driver="pcl-501" manufacturer="HP" model="501" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 505J Plus" driver="hp-dj_505j_plus" manufacturer="HP" model="500" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 510" driver="hp-dj_510" manufacturer="HP" model="500" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 520" driver="pcl-520" manufacturer="HP" model="500" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 540C" driver="pcl-540" manufacturer="HP" model="540" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 550C" driver="pcl-550" manufacturer="HP" model="550" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 5550" driver="hp-dj_5550" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 5551" driver="hp-dj_5551" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 560C" driver="pcl-560" manufacturer="HP" model="550" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 600" driver="pcl-600" manufacturer="HP" model="600" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 600C" driver="pcl-601" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 610C" driver="hp-dj_610c" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 610CL" driver="hp-dj_610cl" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 6122" driver="hp-dj_6122" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 6127" driver="hp-dj_6127" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 612C" driver="hp-dj_612c" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 640C" driver="hp-dj_640c" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 648C" driver="hp-dj_648c" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 660C" driver="hp-dj_660c" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 670C" driver="hp-dj_670c" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 670TV" driver="hp-dj_670tv" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 672C" driver="hp-dj_672c" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 680C" driver="hp-dj_680c" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 682C" driver="hp-dj_682c" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 690C" driver="pcl-690" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 692C" driver="hp-dj_692c" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 693C" driver="hp-dj_693c" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 694C" driver="hp-dj_694c" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 695C" driver="hp-dj_695c" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 697C" driver="hp-dj_697c" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 810C" driver="pcl-810" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />  <!-- Uses 840 driver -->
-      <printer name="HP DeskJet 812C" driver="pcl-812" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />  <!-- Uses 840 driver -->
-      <printer name="HP DeskJet 815C" driver="hp-dj_815c" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 816C" driver="hp-dj_816c" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 825C" driver="hp-dj_825c" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 830C" driver="hp-dj_830c" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 832C" driver="hp-dj_832c" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 840C" driver="pcl-840" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />  <!-- Uses 840 driver -->
-      <printer name="HP DeskJet 841C" driver="hp-dj_841c" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 842C" driver="pcl-842" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />  <!-- Uses 840 driver -->
-      <printer name="HP DeskJet 843C" driver="hp-dj_843c" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 845C" driver="pcl-845" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />  <!-- Uses 840 driver -->
-      <printer name="HP DeskJet 850C" driver="pcl-850" manufacturer="HP" model="800" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 855C" driver="pcl-855" manufacturer="HP" model="800" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 870C" driver="pcl-870" manufacturer="HP" model="800" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 880C" driver="hp-dj_880c" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 882C" driver="hp-dj_882c" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 890C" driver="pcl-890" manufacturer="HP" model="800" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 895C" driver="pcl-895" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />  <!-- Uses 840 driver -->
-      <printer name="HP DeskJet 916C" driver="pcl-900" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 920C" driver="hp-dj_920c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 9300" driver="hp-dj_9300" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 930C" driver="hp-dj_930c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 932C" driver="hp-dj_932c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 933C" driver="hp-dj_933c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 934C" driver="hp-dj_934c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 935C" driver="hp-dj_935c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 940C" driver="hp-dj_940c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 948C" driver="hp-dj_948c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 950C" driver="hp-dj_950c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 952C" driver="hp-dj_952c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 955C" driver="hp-dj_955c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 957C" driver="hp-dj_957c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 959C" driver="hp-dj_959c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 960C" driver="hp-dj_960c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 970C" driver="hp-dj_970c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 975C" driver="hp-dj_975c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 980C" driver="hp-dj_980c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 990C" driver="hp-dj_990c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 995C" driver="hp-dj_995c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 1100C" driver="pcl-1100" manufacturer="HP" model="1100" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 1120C" driver="pcl-1120" manufacturer="HP" model="1100" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 1125C" driver="hp-dj_1125c" manufacturer="HP" model="1100" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 1200C" driver="pcl-1200" manufacturer="HP" model="1200" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 1220C" driver="pcl-1220" manufacturer="HP" model="901" parameters="pcl_inkjet_params" />  <!-- Uses 900 series driver (large) -->
-      <printer name="HP DeskJet 1600C" driver="pcl-1600" manufacturer="HP" model="1600" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 1600CM" driver="hp-dj_1600cm" manufacturer="HP" model="1600" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 2000" driver="pcl-2000" manufacturer="HP" model="2000" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 2500" driver="pcl-2500" manufacturer="HP" model="2500" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 2500CM" driver="hp-2500cm" manufacturer="HP" model="2500" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 340C" driver="pcl-340" manufacturer="HP" model="340" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 3810" driver="hp-dj_3810" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 3816" driver="hp-dj_3816" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 3820" driver="hp-dj_3820" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 3822" driver="hp-dj_3822" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP LaserJet 2" driver="pcl-2" manufacturer="HP" model="2" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 2D" driver="hp-lj_2d" manufacturer="HP" model="2" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 2P Plus" driver="hp-lj_2p_plus" manufacturer="HP" model="21" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 2P" driver="pcl-2p" manufacturer="HP" model="21" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 3" driver="pcl-3" manufacturer="HP" model="3" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 3D" driver="hp-lj_3d" manufacturer="HP" model="3" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 3P w/ PCL5" driver="hp-lj_3p_w_pcl5" manufacturer="HP" model="4" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 3P w/PS" driver="hp-lj_3p_w_ps" manufacturer="HP" model="3" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 4 Plus" driver="hp-lj_4_plus" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 4" driver="pcl-4" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 4L" driver="pcl-4l" manufacturer="HP" model="4" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 4M" driver="hp-lj_4m" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 4ML" driver="hp-lj_4ml" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 4P" driver="hp-lj_4p" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 4Si" driver="pcl-4si" manufacturer="HP" model="51" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 4V" driver="pcl-4v" manufacturer="HP" model="5" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 5" driver="pcl-5" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 5L" driver="hp-lj_5l" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 5M" driver="hp-lj_5m" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 5MP" driver="hp-lj_5mp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 5P" driver="hp-lj_5p" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 5Si" driver="pcl-5si" manufacturer="HP" model="7" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 6" driver="pcl-6" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 6L" driver="hp-lj_6l" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 6MP" driver="hp-lj_6mp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 6P" driver="hp-lj_6p" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 1010" driver="hp-lj_1010" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 1012" driver="hp-lj_1012" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 1015" driver="hp-lj_1015" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 1022" driver="hp-lj_1022" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 1100" driver="hp-lj_1100" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 1100A" driver="hp-lj_1100a" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 1150" driver="hp-lj_1150" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 1200" driver="hp-lj_1200" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 1220" driver="hp-lj_1220" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 1300" driver="hp-lj_1300" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 2100" driver="hp-lj_2100" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 2100M" driver="hp-lj_2100m" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 2200" driver="hp-lj_2200" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 2300" driver="hp-lj_2300" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 3200" driver="hp-lj_3200" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 3200m" driver="hp-lj_3200m" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 3200se" driver="hp-lj_3200se" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 3300 MFP" driver="hp-lj_3300_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 3310 MFP" driver="hp-lj_3310_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 3320 MFP" driver="hp-lj_3320_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 3320N MFP" driver="hp-lj_3320n_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 3330 MFP" driver="hp-lj_3330_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 4000" driver="hp-lj_4000" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 4050" driver="hp-lj_4050" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 4100" driver="hp-lj_4100" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 4200" driver="hp-lj_4200" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 4300" driver="hp-lj_4300" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 5000" driver="hp-lj_5000" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 5100" driver="hp-lj_5100" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 8000" driver="hp-lj_8000" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 8100" driver="hp-lj_8100" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 8150" driver="hp-lj_8150" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 9000" driver="hp-lj_9000" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP Mopier 240" driver="hp-mopier_240" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP Mopier 320" driver="hp-mopier_320" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP OfficeJet 300" driver="hp-oj_300" manufacturer="HP" model="500" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet 330" driver="hp-oj_330" manufacturer="HP" model="500" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet 350" driver="hp-oj_350" manufacturer="HP" model="500" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet 500" driver="hp-oj_500" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet 520" driver="hp-oj_520" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet 570" driver="hp-oj_570" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet 580" driver="hp-oj_580" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet 590" driver="hp-oj_590" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet 600" driver="hp-oj_600" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet 610" driver="hp-oj_610" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet 625" driver="hp-oj_625" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet 630" driver="hp-oj_630" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet 635" driver="hp-oj_635" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet 700" driver="hp-oj_700" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet 710" driver="hp-oj_710" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet 720" driver="hp-oj_720" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet 725" driver="hp-oj_725" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet 5105" driver="hp-oj_5105" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet 5110" driver="hp-oj_5110" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet 5110xi" driver="hp-oj_5110xi" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet 6105" driver="hp-oj_6105" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet 6110" driver="hp-oj_6110" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet 7110" driver="hp-oj_7110" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet 7130" driver="hp-oj_7130" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet 7140" driver="hp-oj_7140" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet D125" driver="hp-oj_d125" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet D135" driver="hp-oj_d135" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet D145" driver="hp-oj_d145" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet D155" driver="hp-oj_d155" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet G55" driver="hp-oj_g55" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet G85" driver="hp-oj_g85" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet G95" driver="hp-oj_g95" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet K60" driver="hp-oj_k60" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet K60xi" driver="hp-oj_k60xi" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet K80" driver="hp-oj_k80" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet K80xi" driver="hp-oj_k80xi" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet LX" driver="hp-oj_lx" manufacturer="HP" model="500" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet Pro 1150C" driver="hp-oj_pro_1150c" manufacturer="HP" model="800" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet Pro 1170C" driver="hp-oj_pro_1170c" manufacturer="HP" model="800" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet Pro 1175C" driver="hp-oj_pro_1175c" manufacturer="HP" model="800" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet R40" driver="hp-oj_r40" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet R45" driver="hp-oj_r45" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet R60" driver="hp-oj_r60" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet R65" driver="hp-oj_r65" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet R80" driver="hp-oj_r80" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet T45" driver="hp-oj_t45" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet T65" driver="hp-oj_t65" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet V40" driver="hp-oj_v40" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet V40xi" driver="hp-oj_v40xi" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet" driver="hp-oj" manufacturer="HP" model="500" parameters="pcl_inkjet_params" />
-      <printer name="HP PSC 370" driver="hp-psc_370" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
-      <printer name="HP PSC 380" driver="hp-psc_380" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
-      <printer name="HP PSC 500" driver="hp-psc_500" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
-      <printer name="HP PSC 750" driver="hp-psc_750" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP PSC 950" driver="hp-psc_950" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP PSC 950xi" driver="hp-psc_950xi" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP PSC 2110" driver="hp-psc_2110" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP PSC 2150" driver="hp-psc_2150" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP PSC 2210" driver="hp-psc_2210" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP PhotoSmart 7150" driver="hp-psc_7150" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP PhotoSmart 7345" driver="hp-psc_7345" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP PhotoSmart 7350" driver="hp-psc_7350" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP PhotoSmart 7550" driver="hp-psc_7550" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP PhotoSmart P100" driver="hp-psc_p100" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP PhotoSmart P130" driver="hp-psc_p130" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP PhotoSmart P230" driver="hp-psc_p230" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP PhotoSmart P1000" driver="pcl-P1000" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />  <!-- Uses 900 series driver -->
-      <printer name="HP PhotoSmart P1100" driver="pcl-P1100" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />  <!-- Uses 900 series driver -->
-      <printer name="HP PhotoSmart P1115" driver="hp-psc_p1115" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP PhotoSmart P1215" driver="hp-psc_p1215" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP PhotoSmart P1218" driver="hp-psc_p1218" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP PhotoSmart P1315" driver="hp-psc_p1315" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP e-printer e20" driver="hp-e-printer_e20" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
-      <printer name="IBM 4019" driver="ibm-4019" manufacturer="IBM" model="2" parameters="pcl_laser_params" />
-      <printer name="IBM 4029 030 LaserPrinter 10" driver="ibm-4029_030_lp_10" manufacturer="IBM" model="3" parameters="pcl_laser_params" />
-      <printer name="IBM 4312" driver="ibm-4312" manufacturer="IBM" model="2" parameters="pcl_laser_params" />
-      <printer name="IBM Infoprint 12" driver="ibm-infoprint_12" manufacturer="IBM" model="6" parameters="pcl_laser_params" />
-      <printer name="IBM Page Printer 3112" driver="ibm-pp_3112" manufacturer="IBM" model="6" parameters="pcl_laser_params" />
-      <printer name="Infotec 4651 MF" driver="infotec-4651_mf" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
-      <printer name="Kyocera F-1010" driver="kyocera-f-1010" manufacturer="Kyocera" model="22" parameters="pcl_laser_params" />
-      <printer name="Kyocera FS-600 - KPDL-2" driver="kyocera-fs-600_kpdl-2" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer name="Kyocera FS-600" driver="kyocera-fs-600" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer name="Kyocera FS-680" driver="kyocera-fs-680" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer name="Kyocera FS-800" driver="kyocera-fs-800" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer name="Kyocera FS-1000" driver="kyocera-fs-1000" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer name="Kyocera FS-1000+" driver="kyocera-fs-1000plus" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer name="Kyocera FS-1010" driver="kyocera-fs-1010" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer name="Kyocera FS-1050" driver="kyocera-fs-1050" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer name="Kyocera FS-1200" driver="kyocera-fs-1200" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer name="Kyocera FS-1600" driver="kyocera-fs-1600" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer name="Kyocera FS-1600+" driver="kyocera-fs-1600plus" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer name="Kyocera FS-1700" driver="kyocera-fs-1700" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer name="Kyocera FS-1700+" driver="kyocera-fs-1700plus" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer name="Kyocera FS-1750" driver="kyocera-fs-1750" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer name="Kyocera FS-1800" driver="kyocera-fs-1800" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer name="Kyocera FS-1800+" driver="kyocera-fs-1800plus" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer name="Kyocera FS-1900" driver="kyocera-fs-1900" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer name="Kyocera FS-3500" driver="kyocera-fs-3500" manufacturer="Kyocera" model="32" parameters="pcl_laser_params" />
-      <printer name="Kyocera FS-3600" driver="kyocera-fs-3600" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer name="Kyocera FS-3600+" driver="kyocera-fs-3600plus" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer name="Kyocera FS-3700" driver="kyocera-fs-3700" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer name="Kyocera FS-3700+" driver="kyocera-fs-3700plus" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer name="Kyocera FS-3750" driver="kyocera-fs-3750" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer name="Kyocera FS-3800" driver="kyocera-fs-3800" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer name="Kyocera FS-5800C" driver="kyocera-fs-5800c" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer name="Kyocera FS-5900C" driver="kyocera-fs-5900c" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer name="Kyocera FS-6500" driver="kyocera-fs-6500" manufacturer="Kyocera" model="32" parameters="pcl_laser_params" />
-      <printer name="Kyocera FS-6500+" driver="kyocera-fs-6500plus" manufacturer="Kyocera" model="32" parameters="pcl_laser_params" />
-      <printer name="Kyocera FS-6700" driver="kyocera-fs-6700" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer name="Kyocera FS-7000" driver="kyocera-fs-7000" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer name="Kyocera FS-7000+" driver="kyocera-fs-7000plus" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer name="Kyocera FS-8000C" driver="kyocera-fs-8000c" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer name="Kyocera FS-9000" driver="kyocera-fs-9000" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer name="Kyocera FS-9100DN" driver="kyocera-fs-9100dn" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer name="Kyocera FS-9500DN" driver="kyocera-fs-9500dn" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer name="Kyocera KM-1530" driver="kyocera-km-1530" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer name="Kyocera KM-1810" driver="kyocera-km-1810" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer name="Kyocera KM-2030" driver="kyocera-km-2030" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer name="Kyocera KM-2530" driver="kyocera-km-2530" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer name="Kyocera KM-3530" driver="kyocera-km-3530" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer name="Kyocera KM-4230" driver="kyocera-km-4230" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer name="Kyocera KM-4530" driver="kyocera-km-4530" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer name="Kyocera KM-5230" driver="kyocera-km-5230" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer name="Kyocera KM-5530" driver="kyocera-km-5530" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer name="Kyocera KM-6230" driver="kyocera-km-6230" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer name="Lexmark 4076" driver="lexmark-4076" manufacturer="Lexmark" model="500" parameters="pcl_inkjet_params" />
-      <printer name="Lexmark Optra E" driver="lexmark-optra_e" manufacturer="Lexmark" model="6" parameters="pcl_laser_params" />
-      <printer name="Lexmark Optra E+" driver="lexmark-optra_eplus" manufacturer="Lexmark" model="6" parameters="pcl_laser_params" />
-      <printer name="Lexmark Optra E220" driver="lexmark-optra_e220" manufacturer="Lexmark" model="6" parameters="pcl_laser_params" />
-      <printer name="Lexmark Valuewriter 300" driver="lexmark-vw_300" manufacturer="Lexmark" model="2" parameters="pcl_laser_params" />
-      <printer name="Minolta PagePro 6" driver="minolta-pp_6" manufacturer="Minolta" model="6" parameters="pcl_laser_params" />
-      <printer name="Minolta PagePro 6e" driver="minolta-pp_6e" manufacturer="Minolta" model="6" parameters="pcl_laser_params" />
-      <printer name="Minolta PagePro 6ex" driver="minolta-pp_6ex" manufacturer="Minolta" model="6" parameters="pcl_laser_params" />
-      <printer name="Minolta PagePro 8" driver="minolta-pp_8" manufacturer="Minolta" model="6" parameters="pcl_laser_params" />
-      <printer name="Minolta PagePro 8L" driver="minolta-pp_8l" manufacturer="Minolta" model="2" parameters="pcl_laser_params" />
-      <printer name="Minolta PagePro 1100" driver="minolta-pp_1100" manufacturer="Minolta" model="6" parameters="pcl_laser_params" />
-      <printer name="NEC SuperScript 660i" driver="nec-ssc_660i" manufacturer="NEC" model="6" parameters="pcl_laser_params" />
-      <printer name="NEC SuperScript 860" driver="nec-ssc_860" manufacturer="NEC" model="2" parameters="pcl_laser_params" />
-      <printer name="NEC SuperScript 870" driver="nec-ssc_870" manufacturer="NEC" model="2" parameters="pcl_laser_params" />
-      <printer name="NEC SuperScript 1260" driver="nec-ssc_1260" manufacturer="NEC" model="2" parameters="pcl_laser_params" />
-      <printer name="NEC SuperScript 1400" driver="nec-ssc_1400" manufacturer="NEC" model="6" parameters="pcl_laser_params" />
-      <printer name="NEC SuperScript 1800" driver="nec-ssc_1800" manufacturer="NEC" model="6" parameters="pcl_laser_params" />
-      <printer name="Okidata OL400" driver="okidata-ol400" manufacturer="Oki" model="2" parameters="pcl_laser_params" />
-      <printer name="Okidata OL400e" driver="okidata-ol400e" manufacturer="Oki" model="2" parameters="pcl_laser_params" />
-      <printer name="Okidata OL400ex" driver="okidata-ol400ex" manufacturer="Oki" model="2" parameters="pcl_laser_params" />
-      <printer name="Okidata OL410e" driver="okidata-ol410e" manufacturer="Oki" model="6" parameters="pcl_laser_params" />
-      <printer name="Okidata OL600e" driver="okidata-ol600e" manufacturer="Oki" model="2" parameters="pcl_laser_params" />
-      <printer name="Okidata OL610e/S" driver="okidata-ol610e_s" manufacturer="Oki" model="2" parameters="pcl_laser_params" />
-      <printer name="Okidata OL800" driver="okidata-ol800" manufacturer="Oki" model="2" parameters="pcl_laser_params" />
-      <printer name="Okidata OL810ex" driver="okidata-ol810ex" manufacturer="Oki" model="6" parameters="pcl_laser_params" />
-      <printer name="Okidata Okipage 6e" driver="okidata-okp_6e" manufacturer="Oki" model="6" parameters="pcl_laser_params" />
-      <printer name="Okidata Okipage 6ex" driver="okidata-okp_6ex" manufacturer="Oki" model="6" parameters="pcl_laser_params" />
-      <printer name="Okidata Okipage 8p" driver="okidata-okp_8p" manufacturer="Oki" model="6" parameters="pcl_laser_params" />
-      <printer name="Okidata Okipage 10e" driver="okidata-okp_10e" manufacturer="Oki" model="6" parameters="pcl_laser_params" />
-      <printer name="Okidata Okipage 10ex" driver="okidata-okp_10ex" manufacturer="Oki" model="6" parameters="pcl_laser_params" />
-      <printer name="Okidata Okipage 14ex" driver="okidata-okp_14ex" manufacturer="Oki" model="6" parameters="pcl_laser_params" />
-      <printer name="Okidata Super 6e" driver="okidata-super_6e" manufacturer="Oki" model="4" parameters="pcl_laser_params" />
-      <printer name="Olivetti JP350S" driver="olivetti-jp350s" manufacturer="Olivetti" model="2" parameters="pcl_laser_params" />
-      <printer name="Olivetti PG 306" driver="olivetti-pg_306" manufacturer="Olivetti" model="2" parameters="pcl_laser_params" />
-      <printer name="PCPI 1030" driver="pcpi-1030" manufacturer="PCPI" model="2" parameters="pcl_laser_params" />
-      <printer name="Panasonic KX-P4410" driver="panasonic-kx-p4410" manufacturer="Panasonic" model="2" parameters="pcl_laser_params" />
-      <printer name="Panasonic KX-P4450" driver="panasonic-kx-p4450" manufacturer="Panasonic" model="3" parameters="pcl_laser_params" />
-      <printer name="Panasonic KX-P6150" driver="panasonic-kx-p6150" manufacturer="Panasonic" model="2" parameters="pcl_laser_params" />
-      <printer name="Panasonic KX-P6500" driver="panasonic-kx-p6500" manufacturer="Panasonic" model="2" parameters="pcl_laser_params" />
-      <printer name="Raven LP-410" driver="raven-lp-410" manufacturer="Raven" model="2" parameters="pcl_laser_params" />
-      <printer name="Ricoh Aficio 220" driver="ricoh-afc_220" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
-      <printer name="Ricoh Aficio 401" driver="ricoh-afc_401" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
-      <printer name="Ricoh Aficio 700" driver="ricoh-afc_700" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
-      <printer name="Samsung ML-85" driver="samsung-ml-85" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
-      <printer name="Samsung ML-4600" driver="samsung-ml-4600" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
-      <printer name="Samsung ML-5000a" driver="samsung-ml-5000a" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
-      <printer name="Samsung ML-6000" driver="samsung-ml-6000" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
-      <printer name="Samsung ML-6100" driver="samsung-ml-6100" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
-      <printer name="Samsung ML-7000" driver="samsung-ml-7000" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
-      <printer name="Samsung ML-7000N" driver="samsung-ml-7000n" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
-      <printer name="Samsung ML-7000P" driver="samsung-ml-7000p" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
-      <printer name="Samsung ML-7050" driver="samsung-ml-7050" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
-      <printer name="Samsung QL-5100A" driver="samsung-ql-5100a" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
-      <printer name="Samsung QL-6050" driver="samsung-ql-6050" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
-      <printer name="Seiko SpeedJET 200" driver="seiko-sj_200" manufacturer="Seiko" model="2" parameters="pcl_laser_params" />
-      <printer name="Sharp AR-161" driver="sharp-ar-161" manufacturer="Sharp" model="6" parameters="pcl_laser_params" />
-      <printer name="Sharp AR-M257" driver="sharp-ar-m257" manufacturer="Sharp" model="6" parameters="pcl_laser_params" />
-      <printer name="Sony IJP-V100" driver="sony-ijp-v100" manufacturer="Sony" model="601" parameters="pcl_inkjet_params" />
-      <printer name="Star LS-04" driver="star-ls-04" manufacturer="Star" model="2" parameters="pcl_laser_params" />
-      <printer name="Star LaserPrinter 8" driver="star-lp_8" manufacturer="Star" model="2" parameters="pcl_laser_params" />
-      <printer name="Tally MT908" driver="tally-mt908" manufacturer="Tally" model="3" parameters="pcl_laser_params" />
-      <printer name="Xerox Able 1406" driver="xerox-able_1406" manufacturer="Xerox" model="6" parameters="pcl_laser_params" />
-      <printer name="Xerox DocuPrint 4508" driver="xerox-dp_4508" manufacturer="Xerox" model="6" parameters="pcl_laser_params" />
-      <printer name="Xerox DocuPrint C20" driver="xerox-dp_c20" manufacturer="Xerox" model="6" parameters="pcl_laser_params" />
-      <printer name="Xerox DocuPrint N4512" driver="xerox-dp_n4512" manufacturer="Xerox" model="6" parameters="pcl_laser_params" />
-      <printer name="Xerox DocuPrint N4512PS" driver="xerox-dp_n4512ps" manufacturer="Xerox" model="6" parameters="pcl_laser_params" />
-      <printer name="Xerox DocuPrint P12" driver="xerox-dp_p12" manufacturer="Xerox" model="2" parameters="pcl_laser_params" />
-      <printer name="Xerox DocuPrint P1202" driver="xerox-dp_p1202" manufacturer="Xerox" model="6" parameters="pcl_laser_params" />
-      <printer name="Xerox DocuPrint P8e" driver="xerox-dp_p8e" manufacturer="Xerox" model="6" parameters="pcl_laser_params" />
-      <printer name="Xerox Document Centre 400" driver="xerox-dc_400" manufacturer="Xerox" model="6" parameters="pcl_laser_params" />
-      <printer name="Xerox WorkCentre M118" driver="xerox-wc_m118" manufacturer="Xerox" model="6" parameters="pcl_laser_params" />
-    </family>
-    <family name="lexmark">
-      <parameters name="standard_params">
-        <parameter type="float" name="MagentaGamma">0.95</parameter>
-        <parameter type="float" name="Gamma">0.5</parameter>
-        <parameter type="float" name="Density">2.0</parameter>
-      </parameters>
-      <printer name="Compaq IJ1200" driver="compaq-ij1200" manufacturer="Compaq" model="10042" parameters="standard_params" />
-      <printer name="Lexmark X73" driver="lexmark-x73" manufacturer="Lexmark" model="10042" parameters="standard_params" />
-      <printer name="Lexmark Z42" driver="lexmark-z42" manufacturer="Lexmark" model="10042" parameters="standard_params" />
-      <printer name="Lexmark Z43" driver="lexmark-z43" manufacturer="Lexmark" model="10042" parameters="standard_params" />
-      <printer name="Lexmark Z52" driver="lexmark-z52" manufacturer="Lexmark" model="10052" parameters="standard_params" />
-      <printer name="Lexmark Z53" driver="lexmark-z53" manufacturer="Lexmark" model="10052" parameters="standard_params" />
-    </family>
-    <family name="dyesub">
-      <printer name="Olympus P-10" driver="olympus-p10" manufacturer="Olympus" model="2" />
-      <printer name="Olympus P-11" driver="olympus-p11" manufacturer="Olympus" model="2" />
-      <printer name="Olympus P-200" driver="olympus-p200" manufacturer="Olympus" model="4" />
-      <printer name="Olympus P-300" driver="olympus-p300" manufacturer="Olympus" model="0" />
-      <printer name="Olympus P-300E" driver="olympus-p300e" manufacturer="Olympus" model="0" />
-      <printer name="Olympus P-300U" driver="olympus-p300u" manufacturer="Olympus" model="0" />
-      <printer name="Olympus P-330E" driver="olympus-p330e" manufacturer="Olympus" model="0" />
-      <printer name="Olympus P-330NE" driver="olympus-p330ne" manufacturer="Olympus" model="0" />
-      <printer name="Olympus P-400" driver="olympus-p400" manufacturer="Olympus" model="1" />
-      <printer name="Olympus P-440" driver="olympus-p440" manufacturer="Olympus" model="3" />
-      <printer name="Olympus P-S100" driver="olympus-ps100" manufacturer="Olympus" model="20" />
-      <printer name="Canon CP-10" driver="canon-cp10" manufacturer="Canon" model="1002" />
-      <printer name="Canon CP-100" driver="canon-cp100" manufacturer="Canon" model="1000" />
-      <printer name="Canon CP-200" driver="canon-cp200" manufacturer="Canon" model="1000" />
-      <printer name="Canon CP-220" driver="canon-cp220" manufacturer="Canon" model="1001" />
-      <printer name="Canon CP-300" driver="canon-cp300" manufacturer="Canon" model="1000" />
-      <printer name="Canon CP-330" driver="canon-cp330" manufacturer="Canon" model="1001" />
-      <printer name="Canon SELPHY-CP-400" driver="canon-cp400" manufacturer="Canon" model="1001" />
-      <printer name="Canon SELPHY-CP-500" driver="canon-cp500" manufacturer="Canon" model="1001" />
-      <printer name="Canon SELPHY-CP-510" driver="canon-cp510" manufacturer="Canon" model="1001" />
-      <printer name="Canon SELPHY-CP-600" driver="canon-cp600" manufacturer="Canon" model="1001" />
-      <printer name="Canon SELPHY-CP-710" driver="canon-cp710" manufacturer="Canon" model="1001" />
-      <printer name="Canon SELPHY-CP-720" driver="canon-cp720" manufacturer="Canon" model="1001" />
-      <printer name="Canon SELPHY-CP-730" driver="canon-cp730" manufacturer="Canon" model="1001" />
-      <printer name="Canon SELPHY-CP-740" driver="canon-cp740" manufacturer="Canon" model="1001" />
-      <printer name="Canon SELPHY-CP-750" driver="canon-cp750" manufacturer="Canon" model="1001" />
-      <printer name="Canon SELPHY ES1" driver="canon-es1" manufacturer="Canon" model="1003" />
-      <printer name="Canon SELPHY ES2" driver="canon-es2" manufacturer="Canon" model="1003" />
-      <printer name="Canon SELPHY ES20" driver="canon-es20" manufacturer="Canon" model="1003" />
-      <printer name="Sony DPP-EX5" driver="sony-dppex5" manufacturer="Sony" model="2002" />
-      <printer name="Sony DPP-EX7" driver="sony-dppex5" manufacturer="Sony" model="2002" />
-      <printer name="Sony UP-DP10" driver="sony-updp10" manufacturer="Sony" model="2000" />
-      <printer name="Sony UP-DR100" driver="sony-updr100" manufacturer="Sony" model="2003" />
-      <printer name="Sony UP-DR150" driver="sony-updr150" manufacturer="Sony" model="2001" />
-      <printer name="Fujifilm Printpix-CX-400" driver="fujifilm-cx400" manufacturer="Fujifilm" model="3000" />
-      <printer name="Fujifilm Printpix-CX-550" driver="fujifilm-cx550" manufacturer="Fujifilm" model="3001" />
-      <printer name="Fujifilm FinePix-NX-500" driver="fujifilm-nx500" manufacturer="Fujifilm" model="3002" />
-      <printer name="Kodak Easyshare-Printer-Dock" driver="kodak-dock" manufacturer="Kodak" model="4000"/>
-      <printer name="Shinko CHC-S9045" driver="shinko-chcs9045" manufacturer="Shinko" model="5000"/>
-    </family>
-    <family name="raw">
-      <printer name="RAW DATA 16 bit" driver="raw-data-16" manufacturer="" model="0" />
-      <printer name="RAW DATA 8 bit" driver="raw-data-8" manufacturer="" model="1" />
-    </family>
-  </printdef>
-</gutenprint>
diff --git a/src/main/sequence.c b/src/main/sequence.c
index 9cf5885..3f7091c 100644
--- a/src/main/sequence.c
+++ b/src/main/sequence.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: sequence.c,v 1.25 2008/01/21 23:19:41 rlk Exp $"
+ * "$Id: sequence.c,v 1.26 2008/06/15 16:23:39 rlk Exp $"
  *
  *   Sequence data type.  This type is designed to be derived from by
  *   the curve and dither matrix types.
@@ -420,8 +420,8 @@ stp_sequence_create_from_xmltree(stp_mxml_node_t *da)
 	      /* Datum was valid, so now add to the sequence */
 	      stp_sequence_set_point(ret, i, tmpval);
 	      i++;
-	      child = child->next;
 	    }
+	  child = child->next;
 	}
       if (i < point_count)
 	{
diff --git a/src/main/xml.c b/src/main/xml.c
index 5c38736..30d2f2a 100644
--- a/src/main/xml.c
+++ b/src/main/xml.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: xml.c,v 1.38 2007/05/26 15:53:06 rlk Exp $"
+ * "$Id: xml.c,v 1.42 2008/06/08 15:10:36 rlk Exp $"
  *
  *   XML parser - process Gutenprint XML data with mxml.
  *
@@ -200,18 +200,8 @@ stp_xml_exit(void)
 void
 stp_xml_parse_file_named(const char *name)
 {
-  stp_list_t *dir_list;                  /* List of directories to scan */
-  stp_list_t *file_list;                 /* List of XML files */
+  stp_list_t *file_list = stpi_list_files_on_data_path(name); /* List of XML files */
   stp_list_item_t *item;                 /* Pointer to current list item */
-  if (!(dir_list = stp_list_create()))
-    return;
-  stp_list_set_freefunc(dir_list, stp_list_node_free_data);
-  if (getenv("STP_DATA_PATH"))
-    stp_path_split(dir_list, getenv("STP_DATA_PATH"));
-  else
-    stp_path_split(dir_list, PKGXMLDATADIR);
-  file_list = stp_path_search(dir_list, name);
-  stp_list_destroy(dir_list);
   item = stp_list_get_start(file_list);
   while (item)
     {
@@ -318,7 +308,7 @@ long
 stp_xmlstrtol(const char *textval)
 {
   long val; /* The value to return */
-  val = strtol(textval, (char **)NULL, 10);
+  val = strtol(textval, (char **)NULL, 0);
 
   return val;
 }
@@ -330,7 +320,7 @@ unsigned long
 stp_xmlstrtoul(const char *textval)
 {
   unsigned long val; /* The value to return */
-  val = strtoul(textval, (char **)NULL, 10);
+  val = strtoul(textval, (char **)NULL, 0);
 
   return val;
 }
@@ -347,6 +337,133 @@ stp_xmlstrtod(const char *textval)
   return val;
 }
 
+/*
+ * Convert an encoded text string into a raw.
+ */
+stp_raw_t *
+stp_xmlstrtoraw(const char *textval)
+{
+  size_t tcount;
+  stp_raw_t *raw;
+  unsigned char *answer;
+  unsigned char *aptr;
+  if (! textval || *textval == 0)
+    return NULL;
+  tcount = strlen(textval);
+  raw = stp_zalloc(sizeof(stp_raw_t));
+  answer = stp_malloc(tcount + 1); /* Worst case -- we may not need it all */
+  aptr = answer;
+  raw->data = answer;
+  while (*textval)
+    {
+      if (*textval != '\\')
+	{
+	  *aptr++ = *textval++;
+	  raw->bytes++;
+	}
+      else
+	{
+	  textval++;
+	  if (textval[0] >= '0' && textval[0] <= '3' &&
+	      textval[1] >= '0' && textval[1] <= '7' &&
+	      textval[2] >= '0' && textval[2] <= '7')
+	    {
+	      *aptr++ = (((textval[0] - '0') << 6) +
+			 ((textval[1] - '0') << 3) +
+			 ((textval[2] - '0') << 0));
+	      raw->bytes++;
+	      textval += 3;
+	    }
+	  else if (textval[0] == '\0' || textval[1] == '\0' || textval[2] == '\0')
+	    break;
+	  else
+	    textval += 3;
+	}
+    }
+  *aptr = '\0';
+  return raw;
+}
+
+char *
+stp_rawtoxmlstr(const stp_raw_t *raw)
+{
+  if (raw && raw->bytes > 0)
+    {
+      int i;
+      const unsigned char *data = (const unsigned char *) (raw->data);
+      char *answer = stp_malloc((raw->bytes * 4) + 1); /* \012 */
+      unsigned char *aptr = (unsigned char *) answer;
+      for (i = 0; i < raw->bytes; i++)
+	{
+	  if (data[i] > ' ' && data[i] < '\177' && data[i] != '\\' &&
+	      data[i] != '<' && data[i] != '>' && data[i] != '&')
+	    *aptr++ = data[i];
+	  else
+	    {
+	      *aptr++ = '\\';
+	      *aptr++ = '0' + ((data[i] & '\300') >> 6);
+	      *aptr++ = '0' + ((data[i] & '\070') >> 3);
+	      *aptr++ = '0' + ((data[i] & '\007') >> 0);
+	    }
+	}
+      *aptr = '\0';
+      return answer;
+    }
+  return NULL;
+}
+
+char *
+stp_strtoxmlstr(const char *str)
+{
+  if (str && strlen(str) > 0)
+    {
+      int i;
+      int bytes = strlen(str);
+      const unsigned char *data = (const unsigned char *) (str);
+      char *answer = stp_malloc((bytes * 4) + 1); /* "\012" is worst case */
+      unsigned char *aptr = (unsigned char *) answer;
+      for (i = 0; i < bytes; i++)
+	{
+	  if (data[i] > ' ' && data[i] < '\177' && data[i] != '\\' &&
+	      data[i] != '<' && data[i] != '>' && data[i] != '&')
+	    *aptr++ = data[i];
+	  else
+	    {
+	      *aptr++ = '\\';
+	      *aptr++ = '0' + ((data[i] & '\300') >> 6);
+	      *aptr++ = '0' + ((data[i] & '\070') >> 3);
+	      *aptr++ = '0' + ((data[i] & '\007') >> 0);
+	    }
+	}
+      *aptr = '\0';
+      return answer;
+    }
+  return NULL;
+}
+
+void
+stp_prtraw(const stp_raw_t *raw, FILE *fp)
+{
+  if (raw && raw->bytes > 0)
+    {
+      int i;
+      const unsigned char *data = (const unsigned char *) (raw->data);
+      for (i = 0; i < raw->bytes; i++)
+	{
+	  if (data[i] > ' ' && data[i] < '\177' && data[i] != '\\' &&
+	      data[i] != '<' && data[i] != '>' && data[i] != '&')
+	    fputc(data[i], fp);
+	  else
+	    {
+	      fputc('\\', fp);
+	      fputc('0' + ((data[i] & '\300') >> 6), fp);
+	      fputc('0' + ((data[i] & '\070') >> 3), fp);
+	      fputc('0' + ((data[i] & '\007') >> 0), fp);
+	    }
+	}
+    }
+}
+
 
 /*
  * Find a node in an XML tree.  This function takes an xmlNodePtr,
diff --git a/src/main/xmlppd.c b/src/main/xmlppd.c
index 6bd2611..10c2bb9 100644
--- a/src/main/xmlppd.c
+++ b/src/main/xmlppd.c
@@ -212,6 +212,7 @@ stpi_xmlppd_read_ppd_file(const char *filename)	/* I - PPD file */
   int		option_count;
   int		order_length;
   char		*order_list;
+  int		in_comment;
 
 
  /*
@@ -276,6 +277,22 @@ stpi_xmlppd_read_ppd_file(const char *filename)	/* I - PPD file */
       bufptr    = buffer + 1;
       inquote   = 0;
       sawcolon  = 0;
+      in_comment = 0;
+      if (ch == '*')
+	{
+	  if ((ch = getc(fp)) == '%')
+	    {
+	      while (1)
+		{
+		  ch = getc(fp);
+		  if (ch == '\n' || ch == EOF)
+		    break;
+		}
+	      continue;
+	    }
+	  else
+	    ungetc(ch, fp);
+	}
 
       while ((ch != '\n' || inquote) && bufptr < (buffer + sizeof(buffer) - 1))
 	{
diff --git a/src/testpattern/Makefile.in b/src/testpattern/Makefile.in
index f6c13bc..d463d43 100644
--- a/src/testpattern/Makefile.in
+++ b/src/testpattern/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,7 +17,7 @@
 # Variables
 
 #export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
-#export STP_DATA_PATH = $(top_srcdir)/src/main
+#export STP_DATA_PATH = $(top_srcdir)/src/xml
 
 
 
@@ -49,7 +49,8 @@ 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/progtest.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
@@ -72,7 +73,7 @@ am_testpattern_OBJECTS = testpattern.$(OBJEXT) testpatterny.$(OBJEXT) \
 testpattern_OBJECTS = $(am_testpattern_OBJECTS)
 testpattern_DEPENDENCIES = $(GUTENPRINT_LIBS)
 SCRIPTS = $(noinst_SCRIPTS)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -138,6 +139,7 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
+DSYMUTIL = @DSYMUTIL@
 DVIPDF = @DVIPDF@
 DVIPS = @DVIPS@
 ECHO = @ECHO@
@@ -158,6 +160,7 @@ GIMP2_LIBS = @GIMP2_LIBS@
 GIMPTOOL2_CHECK = @GIMPTOOL2_CHECK@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
 GNUCFLAGS = @GNUCFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
@@ -190,6 +193,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
@@ -210,9 +214,10 @@ MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -239,6 +244,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WHICH_PPDS = @WHICH_PPDS@
 XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
 abs_builddir = @abs_builddir@
@@ -363,8 +369,8 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	     || test -f $$p1 \
 	  ; then \
 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -471,8 +477,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -484,8 +490,8 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -495,13 +501,12 @@ ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff --git a/src/testpattern/printer_options.c b/src/testpattern/printer_options.c
index b44da2d..ec03a1e 100644
--- a/src/testpattern/printer_options.c
+++ b/src/testpattern/printer_options.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: printer_options.c,v 1.4 2007/03/05 00:04:00 tillkamppeter Exp $"
+ * "$Id: printer_options.c,v 1.5 2008/06/07 22:47:35 rlk Exp $"
  *
  *   Dump the per-printer options for the OpenPrinting database
  *
@@ -101,12 +101,14 @@ main(int argc, char **argv)
 	  stp_describe_parameter(pv, p->name, &desc);
 	  if (desc.is_active)
 	    {
-	      printf("$longnames{'%s'} = '%s';\n",
-		     desc.name, desc.text);
-	      printf("$param_classes{'%s'} = %d;\n",
-		     desc.name, desc.p_class);
-	      printf("$param_levels{'%s'} = %d;\n",
-		     desc.name, desc.p_level);
+	      printf("$longnames{'%s'}{'%s'} = '%s';\n",
+		     driver, desc.name, desc.text);
+	      printf("$param_classes{'%s'}{'%s'} = %d;\n",
+		     driver, desc.name, desc.p_class);
+	      printf("$param_types{'%s'}{'%s'} = %d;\n",
+		     driver, desc.name, desc.p_type);
+	      printf("$param_levels{'%s'}{'%s'} = %d;\n",
+		     driver, desc.name, desc.p_level);
 	      if (desc.p_type == STP_PARAMETER_TYPE_STRING_LIST)
 		{
 		  count = stp_string_list_count(desc.bounds.str);
diff --git a/src/testpattern/run-testpattern b/src/testpattern/run-testpattern
index 3fa058e..0462c0b 100755
--- a/src/testpattern/run-testpattern
+++ b/src/testpattern/run-testpattern
@@ -3,7 +3,7 @@
 retval=0;
 
 if [ -z "$STP_DATA_PATH" ] ; then
-    STP_DATA_PATH=`pwd`/../main
+    STP_DATA_PATH=`pwd`/../xml
     export STP_DATA_PATH
 fi
 
diff --git a/src/testpattern/run-testpattern-1 b/src/testpattern/run-testpattern-1
index f606235..aceff8d 100755
--- a/src/testpattern/run-testpattern-1
+++ b/src/testpattern/run-testpattern-1
@@ -3,7 +3,7 @@
 retval=0
 
 if [ -z "$STP_DATA_PATH" ] ; then
-    STP_DATA_PATH=`pwd`/../main
+    STP_DATA_PATH=`pwd`/../xml
     export STP_DATA_PATH
 fi
 
diff --git a/src/testpattern/run-testpattern-2.in b/src/testpattern/run-testpattern-2.in
index 065d8f4..b35bf90 100644
--- a/src/testpattern/run-testpattern-2.in
+++ b/src/testpattern/run-testpattern-2.in
@@ -6,49 +6,64 @@ Getopt::Long::Configure("bundling", "no_ignore_case", "pass_through");
 use strict;
 
 my $valgrind = 0;
-my $cachegrind = 0;
+my $callgrind = 0;
 my $gdb_attach = 0;
-my $calc_md5 = 0;
+my $calc_md5_file = undef;
+my $calc_md5_dir = undef;
 my $dontrun = 0;
 my $retval = 0;
 my $testpattern_command;
 my @printer_list = ();
 my @special_options = ();
-my @standard_options = qw(InkType DitherAlgorithm Duplex);
+my @standard_options = qw(InkType InkSet DitherAlgorithm Duplex MediaType InputSlot ColorCorrection ImageType FullBleed Quality UseGloss Weave RawChannels PrintingDirection Density CyanDensity);
 my $global_status = 1;
+my $run_installed = 0;
+my $use_min_res = 0;
 my $output = undef;
 
 my @extras = ();
+my @job_extras = ();
 my @messages = ();
 my @global_messages = ();
+my @families = ();
 my %stpdata = ();
 my %models_found = ();
 my %models;
 my %families;
 my $skip_duplicate_printers = 0;
 my $std_pages = 1;
+my $skip_resolutions = 0;
+my $quiet = 0;
+my $single = 0;
 
 my @default_options = ();
-my %base_settings = ("DitherAlgorithm" => "Fast",
-		     "ColorCorrection" => "Raw");
+my %base_settings = ("DitherAlgorithm" => "Fast");
+
+my %param_types;
+my %param_classes;
+my %param_levels;
+my %stp_float_values;
 
 GetOptions("v+"  => \$valgrind,
-	   "c"   => \$cachegrind,
+	   "c"   => \$callgrind,
 	   "g"   => \$gdb_attach,
 	   "n"   => \$dontrun,
 	   "p:i" => \$std_pages,
 	   "s!"  => \$skip_duplicate_printers,
+	   "S!"  => \$single,
+	   "i!"  => \$run_installed,
+	   "r!"  => \$skip_resolutions,
+	   "R+"  => \$use_min_res,
+	   "q!"  => \$quiet,
 	   "o=s" => \@special_options,
+	   "f=s" => \@families,
 	   "O=s" => \$output,
 	   "d=s" => \@default_options,
-	   "m:s" => \$calc_md5);
+	   "m:s" => \$calc_md5_dir,
+	   "M:s" => \$calc_md5_file);
 
 my $pages = $std_pages;
 
-if (defined $calc_md5 && $calc_md5 eq "0") {
-    $calc_md5 = undef;
-}
-
 if (! @special_options) {
     @special_options = @standard_options;
 }
@@ -65,39 +80,64 @@ foreach my $opt (@default_options) {
 my $pwd = `pwd`;
 chomp $pwd;
 
-if (! defined $ENV{"STP_DATA_PATH"}) {
-    $ENV{"STP_DATA_PATH"} = "${pwd}/../main";
+if (! $run_installed && ! defined $ENV{"STP_DATA_PATH"}) {
+    $ENV{"STP_DATA_PATH"} = "${pwd}/../xml";
 }
 
 if (! defined $ENV{"STP_MODULE_PATH"}) {
     $ENV{"STP_MODULE_PATH"} = "${pwd}/../main:${pwd}/../main/.libs";
 }
 
-sub set_opt($$) {
-    my ($opt, $val) = @_;
-    push @extras, "parameter \"$opt\" \"$val\";\n";
+sub set_opt($$$) {
+    my ($opt, $val, $printer) = @_;
+    my ($type) = $param_types{$printer}{$opt};
+    if ($type == 1) {
+	push @extras, "parameter_int \"$opt\" $val;\n";
+    } elsif ($type == 2) {
+	my ($xval) = $val;
+	if ($val =~ /true/i) {
+	    $xval = 1;
+	} elsif ($val =~ /false/i) {
+	    $xval = 0;
+	}
+	push @extras, "parameter_bool \"$opt\" $xval;\n";
+    } elsif ($type == 3) {
+	push @extras, "parameter_float \"$opt\" $val;\n";
+    } elsif ($type == 4) {
+	push @extras, "parameter_curve \"$opt\" \"$val\";\n";
+    } else {
+	push @extras, "parameter \"$opt\" \"$val\";\n";
+    } 
 }
 
 sub set_message($) {
     my ($message) = @_;
-    push @messages, "message \"$message\";\n";
+    push @messages, "message \"$message\";\n" if (! $quiet);
 }
 
 sub set_global_message($) {
     my ($message) = @_;
-    push @global_messages, "message \"$message\";\n";
+    push @global_messages, "message \"$message\";\n" if (! $quiet);
 }
 
-sub print_one_testpattern($) {
-    my ($printer) = @_;
+sub print_one_testpattern($;$) {
+    my ($printer, $raw) = @_;
     my $stuff = join "", @global_messages;
+    $stuff .= join "", @job_extras;
     foreach my $page (0..$pages - 1) {
     	$stuff .= "printer \"$printer\";\n";
+	$stuff .= "parameter \"PageSize\" \"Auto\";\n";
 	$stuff .= join "", @extras, @messages;
-	if ($pages > 1) {
+	if (! $quiet && $pages > 1) {
 	    $stuff .= "message \"(page $page)\";\n";
 	}
 	$stuff .= "parameter_int \"PageNumber\" $page;\n";
+	if ($page == 0) {
+	    $stuff .= "start_job;\n";
+	}
+	if ($page == $pages - 1) {
+	    $stuff .= "end_job;\n";
+	}
 	$stuff .= << 'EOF';
 hsize 0.1;
 vsize 0.1;
@@ -105,6 +145,33 @@ left 0.15;
 top 0.15;
 blackline 0;
 steps 16;
+EOF
+	if ($raw > 0) {
+	    $stuff .= "mode extended $raw 16;\n";
+	    $stuff .= "xpattern ";
+	    for (my $i = 0; $i < $raw; $i++) {
+		$stuff .= "0.0 0.0 1.0  ";
+	    }
+	    $stuff .= ";\n";
+	    for (my $i = 0; $i < $raw; $i++) {
+		$stuff .= "xpattern ";
+		for (my $j = 0; $j < $raw; $j++) {
+		    if ($i == $j) {
+			$stuff .= "0.0 1.0 1.0  ";
+		    } else {
+			$stuff .= "0.0 0.0 1.0  ";
+		    }
+		}
+		$stuff .= ";\n";
+	    }
+	    $stuff .= "xpattern ";
+	    for (my $i = 0; $i < $raw; $i++) {
+		$stuff .= "0.0 0.0 1.0  ";
+	    }
+	    $stuff .= ";\n";
+	    $stuff .= "end;\n";
+	} else {
+	    $stuff .= << 'EOF';
 mode rgb 8;
 pattern 0.0 0.0 0.0 0.0 0.0 0.0 0.0 1.0  0.0 0.0 1.0  0.0 0.0 1.0  0.0 0.0 1.0 ;
 pattern 1.0 1.0 1.0 1.0 1.0 0.0 0.0 1.0  0.0 1.0 1.0 0.0 0.0 1.0 0.0 0.0 1.0;
@@ -154,6 +221,7 @@ pattern 1.0 1.0 1.0 1.0 1.0 0.0 0.9 1.0  0.0 0.1 1.0 0.0 0.1 1.0 0.0 0.0 1.0;
 pattern 0.0 0.0 1.0 1.0 1.0 0.0 0.9 1.0  0.0 0.1 1.0 0.0 0.1 1.0 0.0 0.0 1.0;
 end;
 EOF
+	}
     }
     return $stuff;
 }
@@ -188,30 +256,100 @@ sub do_print {
     }
 }
 
+sub do_output($) {
+    my ($outkey) = @_;
+    if (defined $output || defined $calc_md5_dir ||
+	defined $calc_md5_file) {
+	my $md5_cmd;
+	my $outbase = "${outkey}.prn";
+	my $outfile = "$output/$outbase";
+	if (defined $calc_md5_file) {
+	    $md5_cmd = "md5sum -b | sed 's/-/$outbase/' >> '$calc_md5_file'";
+	} elsif (defined $calc_md5_dir) {
+	    my $md5_dir = $calc_md5_dir;
+	    if (defined $calc_md5_dir && $calc_md5_dir eq "") {
+		$md5_dir = $output;
+	    }
+	    my $md5file = "$md5_dir/${outkey}.md5";
+	    if (! $md5_dir) {
+		$md5file = "${outkey}.md5";
+	    }
+	    $md5_cmd = "md5sum -b | sed 's/-/$outbase/' > '$md5file'";
+	}
+	if ($output && $md5_cmd ne "") {
+	    push @job_extras, "output \"|tee '$outfile' | $md5_cmd\";\n";
+	} elsif ($output) {
+	    push @job_extras, "output \"$outfile\";\n";
+	} else {
+	    push @job_extras, "output \"|$md5_cmd\";\n";
+	}
+    }
+}
 
-sub do_printer {
+sub build_list($$) {
+    my ($keys, $printer) = @_;
+    my (@keys) = split (/,/, $keys);
+    my ($key) = $keys[0];
+    my ($rest);
+    my (@stuff);
+    if ($#keys > 0) {
+	$rest = join ",", @keys[1..$#keys];
+	@stuff = build_list($rest, $printer);
+    }
+    my (@tmp);
+    if ($param_types{$printer}{$key} == 3) {
+	my ($minv) = $stp_float_values{$printer}{'MINVAL'}{$key};
+	my ($defv) = $stp_float_values{$printer}{'DEFVAL'}{$key};
+	my ($maxv) = $stp_float_values{$printer}{'MAXVAL'}{$key};
+	push @tmp, $minv;
+	push @tmp, ($minv + $defv) / 2.0;
+	push @tmp, $defv;
+	push @tmp, ($defv + $maxv) / 2.0;
+	push @tmp, $maxv;
+    } elsif (defined($param_types{$printer}{$key})) {
+	@tmp = keys %{$stpdata{$printer}{$key}};
+    }
+    if (! @tmp) {
+	return @stuff;
+    } elsif (! @stuff) {
+	return @tmp;
+    } else {
+	my (@answer);
+	foreach my $i (@tmp) {
+	    foreach my $j (@stuff) {
+		push @answer, "$i,$j";
+	    }
+	}
+	return @answer;
+    }
+    return @tmp;
+}
+
+sub build_key($$) {
+    my ($keys, $printer) = @_;
+    my (@keys) = split (/,/, $keys);
+    my (@answer) = grep { defined $param_types{$printer}{$_} } @keys;
+    return join ",", @answer;
+}
+
+sub do_printer($$) {
     my ($printer, $fh) = @_;
     my $tmp;
     my $min_res_name;
     my $min_res_value = 0;
     my $first_time = 1;
-    my $model_id = $models{$printer};
-    my $family_id = $families{$printer};
     my $key;
     my %opt_vals = {};
-    if ($skip_duplicate_printers && $models_found{$family_id}{$model_id}) {
-	return;
-    } else {
-	$models_found{$family_id}{$model_id} = 1;
-    }
     $tmp = $stpdata{$printer}{'Resolution'};
     my (@resolutions) = grep {$_ ne 'None' } keys %$tmp;
     $tmp = $stpdata{$printer}{'PrintingMode'};
     my (@printing_modes) = grep {$_ ne 'None' } keys %$tmp;
     foreach $key (@special_options) {
-	$tmp = $stpdata{$printer}{$key};
-	my (@tmp) = grep {$_ ne 'None' } keys %$tmp;
-	$opt_vals{$key} = \@tmp;
+	my $nkey = build_key($key, $printer);
+	if ($nkey ne "") {
+	    my (@vals) = build_list($nkey, $printer);
+	    $opt_vals{$nkey} = \@vals;
+	}
     }
     foreach $tmp (sort @resolutions) {
 	my $res_value = ($stpdata{$printer}{'x_resolution'}{$tmp} *
@@ -221,97 +359,91 @@ sub do_printer {
 	    $min_res_name = $tmp;
 	}
     }
+    if ($use_min_res > 1) {
+	@resolutions = ($min_res_name);
+    }
     # We want to do all resolutions and all ink types in both color modes.
     # We don't need to do both resolutions and ink types.
     my $pmode;
     foreach $pmode (@printing_modes) {
 	my ($resolution);
 	$pages = $std_pages;
-	foreach $resolution (@resolutions) {
-	    @extras = ();
-	    @messages = ();
-	    @global_messages = ();
-	    if ($first_time) {
-		set_global_message("$printer\n");
-		$first_time = 0;
-	    }
-	    set_opt("PrintingMode", $pmode);
-	    set_opt("Resolution", $resolution);
-	    map { set_opt($_, $base_settings{$_})} keys %base_settings;
-	    if (defined $output || defined $calc_md5) {
-		my $outkey = "${printer}_PrintingMode_${pmode}_Resolution_${resolution}";
-		my $md5_dir = $calc_md5;
-		if (defined $calc_md5 && $calc_md5 eq "") {
-		    $md5_dir = $output;
-		}
-		my $outbase = "${outkey}.prn";
-		my $outfile = "$output/$outbase";
-		my $md5file = "$md5_dir/${outkey}.md5";
-		if (! $md5_dir) {
-		    $md5file = "${outkey}.md5";
-		}
-		if ($output && $calc_md5) {
-		    push @extras, "output \"|tee '$outfile' | md5sum -b | sed 's/-/$outbase/' > '$md5file'\";\n";
-		} elsif ($output) {
-		    push @extras, "output \"$outfile\";\n";
-		} else {
-		    push @extras, "output \"|md5sum -b | sed 's/-/$outbase/' > '$md5file'\";\n";
+	if (! $skip_resolutions) {
+	    foreach $resolution (@resolutions) {
+		@extras = ();
+		@job_extras = ();
+		@messages = ();
+		@global_messages = ();
+		if ($first_time) {
+		    set_global_message("$printer\n");
+		    $first_time = 0;
 		}
+		set_opt("PrintingMode", $pmode, $printer);
+		set_opt("Resolution", $resolution, $printer);
+		map { set_opt($_, $base_settings{$_}, $printer)} keys %base_settings;
+		do_output("${printer}_PrintingMode_${pmode}_Resolution_${resolution}");
+		set_message("    ${pmode}+${resolution}");
+		my $output = print_one_testpattern($printer);
+		do_print( $output, $fh );
 	    }
-	    set_message("    ${pmode}+${resolution}");
-	    my $output = print_one_testpattern($printer);
-	    do_print( $output, $fh );
 	}
-	foreach $key (@special_options) {
+	foreach $key (keys %opt_vals) {
+	    next if ($key eq "RawChannels" && $pmode ne "Color");
+	    my (@subkeys) = split (/,/, $key);
 	    $tmp = $opt_vals{$key};
-	    my (@opts) = @$tmp;
-	    if ($#opts >= 1) {
+	    if (defined $tmp && $tmp >= 1) {
+		my (@opts) = @$tmp;
 		my $opt;
+		my $rawval;
 		foreach $opt (@opts) {
-		    my ($out_file);
+		    my (@subopts) = split (/,/, $opt);
 		    @extras = ();
+		    @job_extras = ();
 		    @messages = ();
 		    @global_messages = ();
 		    if ($first_time) {
 			set_global_message("$printer\n");
 			$first_time = 0;
 		    }
-		    set_opt("PrintingMode", $pmode);
-		    set_opt("Resolution", $min_res_name);
-		    set_opt($key, $opt);
+		    set_opt("PrintingMode", $pmode, $printer);
+		    if ($use_min_res) {
+			set_opt("Resolution", $min_res_name, $printer);
+		    }
+		    my (@mvals);
+		    my (@ovals);
+		    map {
+			my $k = $subkeys[$_];
+			my $v = $subopts[$_];
+			if ($k eq "RawChannels") {
+			    $rawval = $v;
+			} else {
+			    set_opt($k, $v, $printer);
+			}
+			push @mvals, "${k}_${v}";
+			push @ovals, "${k}=${v}";
+		    } (0..$#subkeys);
+		    # FIXME! need to handle Duplex as a subkey
 		    map {
 			if ($key ne $_) {
-			    set_opt($_, $base_settings{$_});
+			    set_opt($_, $base_settings{$_}, $printer);
 			    if ($key eq "Duplex") {
-				set_opt("JobMode", "Job");
+				set_opt("JobMode", "Job", $printer);
 				$pages = 4;
 			    } else {
 				$pages = $std_pages;
 			    }
 			}
 		    } keys %base_settings;
-		    if (defined $output || defined $calc_md5) {
-			my $outkey = "${printer}_PrintingMode_${pmode}_Resolution_${min_res_name}_${key}_${opt}";
-			my $md5_dir = $calc_md5;
-			if (defined $calc_md5 && $calc_md5 eq "") {
-			    $md5_dir = $output;
-			}
-			my $outbase = "${outkey}.prn";
-			my $outfile = "$output/$outbase";
-			my $md5file = "$md5_dir/${outkey}.md5";
-			if (! $md5_dir) {
-			    $md5file = "${outkey}.md5";
-			}
-			if (defined $output && defined $calc_md5) {
-			    push @extras, "output \"|tee '$outfile' | md5sum -b | sed 's/-/$outbase/' > '$md5file'\";\n";
-			} elsif ($output) {
-			    push @extras, "output \"$outfile\";\n";
-			} else {
-			    push @extras, "output \"|md5sum -b | sed 's/-/$outbase/' > '$md5file'\";\n";
-			}
+		    my ($mstring) = join "_", @mvals;
+		    my ($ostring) = join "+", @ovals;
+		    if ($use_min_res) {
+			do_output("${printer}_PrintingMode_${pmode}_Resolution_${min_res_name}_${mstring}");
+			set_message("    ${ostring}+${pmode}+${min_res_name}");
+		    } else {
+			do_output("${printer}_PrintingMode_${pmode}_${mstring}");
+			set_message("    ${ostring}+${pmode}");
 		    }
-		    set_message("    ${key}=${opt}+${pmode}+${min_res_name}");
-		    my $output = print_one_testpattern($printer);
+		    my $output = print_one_testpattern($printer, $rawval);
 		    do_print( $output, $fh );
 		}
 	    }
@@ -319,14 +451,27 @@ sub do_printer {
     }
 }
 
+my (@nprinter_list);
+foreach my $printer (@printer_list) {
+    my $model_id = $models{$printer};
+    my $family_id = $families{$printer};
+    if (($skip_duplicate_printers && $models_found{$family_id}{$model_id}) ||
+	(@families && ! grep { $family_id eq $_ } @families)) {
+    } else {
+	$models_found{$family_id}{$model_id} = 1;
+	push @nprinter_list, $printer;
+    }
+}
+@printer_list = @nprinter_list;
+
 if ($dontrun) {
     map { do_printer($_, \*STDOUT) } @printer_list;
     exit 0;
 } else {
     my $valgrind_command;
     my $valopts;
-    if ($cachegrind) {
-	$valopts = '--tool=cachegrind';
+    if ($callgrind) {
+	$valopts = '--tool=callgrind --dump-instr=yes --trace-jump=yes';
 	$valgrind = 4;
     } elsif ($valgrind) {
 	$valopts = '--tool=memcheck';
@@ -348,18 +493,38 @@ if ($dontrun) {
 	mkdir $output || die "Can't create directory $output: $!\n";
     }
 
-    if (defined $calc_md5 && $calc_md5 ne "" && ! -d $calc_md5) {
-	mkdir $calc_md5 || die "Can't create directory $calc_md5: $!\n";
+    if (defined $calc_md5_dir && $calc_md5_dir ne "" && ! -d $calc_md5_dir) {
+	mkdir $calc_md5_dir || die "Can't create directory $calc_md5_dir: $!\n";
+    }
+
+    if (defined $calc_md5_file) {
+	unlink $calc_md5_file;
+	system "touch $calc_md5_file";
     }
 
     my $status = 1;
     my ($suppress);
-    if (! defined $output && ! defined $calc_md5) { $suppress = '-n'; }
-    $testpattern_command = "$valgrind_command ./testpattern $suppress";
-    open TESTPATTERN, "|$testpattern_command" or
-	die "Can't run $testpattern_command: $!\n";
-    map { do_printer($_, \*TESTPATTERN) } @printer_list;
-    $status = close TESTPATTERN;
+    if (! defined $output && ! defined $calc_md5_dir &&
+	! defined $calc_md5_file) {
+	$suppress = '-n';
+    }
+    my ($qopt) = $quiet ? "-q" : "";
+    $testpattern_command = "$valgrind_command ./testpattern $suppress $qopt";
+    if ($single) {
+	foreach my $printer (@printer_list) {
+	    open TESTPATTERN, "|$testpattern_command" or
+		die "Can't run $testpattern_command: $!\n";
+	    do_printer($printer, \*TESTPATTERN);
+	    $status |= close TESTPATTERN;
+	    $status |= ($? & 255);
+	    last if ($? & 255);
+	}
+    } else {
+	open TESTPATTERN, "|$testpattern_command" or
+	    die "Can't run $testpattern_command: $!\n";
+	map { do_printer($_, \*TESTPATTERN) } @printer_list;
+	$status = close TESTPATTERN;
+    }
     if ($status) {
 	exit 0;
     } else {
diff --git a/src/testpattern/testpattern.c b/src/testpattern/testpattern.c
index a0ef100..512739d 100644
--- a/src/testpattern/testpattern.c
+++ b/src/testpattern/testpattern.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: testpattern.c,v 1.48 2008/01/27 21:44:21 rlk Exp $"
+ * "$Id: testpattern.c,v 1.54 2008/07/16 23:59:23 rlk Exp $"
  *
  *   Test pattern generator for Gimp-Print
  *
@@ -51,11 +51,13 @@ static stp_image_status_t Image_get_row(stp_image_t *image,
 					unsigned char *data,
 					size_t byte_limit, int row);
 static int Image_height(stp_image_t *image);
+static void Image_reset(stp_image_t *image);
 static int Image_width(stp_image_t *image);
+static int Image_is_valid = 0;
 static stp_image_t theImage =
 {
   Image_init,
-  NULL,				/* reset */
+  Image_reset,
   Image_width,
   Image_height,
   Image_get_row,
@@ -63,7 +65,7 @@ static stp_image_t theImage =
   Image_conclude,
   NULL
 };
-stp_vars_t *global_vars;
+stp_vars_t *global_vars = NULL;
 
 double global_levels[STP_CHANNEL_LIMIT];
 double global_gammas[STP_CHANNEL_LIMIT];
@@ -89,7 +91,12 @@ int global_use_raw_cmyk;
 int global_did_something;
 int global_noscale = 0;
 int global_suppress_output = 0;
+int global_quiet = 0;
 char *global_output = NULL;
+FILE *output = NULL;
+int write_to_process = 0;
+int start_job = 0;
+int end_job = 0;
 
 static testpattern_t *static_testpatterns;
 
@@ -182,6 +189,19 @@ writefunc(void *file, const char *buf, size_t bytes)
     }
 }
 
+void
+close_output(void)
+{
+  if (output && output != stdout)
+    {
+      if (write_to_process)
+	(void) pclose(output);
+      else
+	(void) fclose(output);
+      output = NULL;
+    }
+}
+
 static void
 initialize_global_parameters(void)
 {
@@ -222,6 +242,8 @@ initialize_global_parameters(void)
   if (global_printer)
     free(global_printer); /* Allocated with strdup() */
   global_printer = NULL;
+  start_job = 0;
+  end_job = 0;
 }
 
 static int
@@ -237,8 +259,6 @@ do_print(void)
   int count;
   int i;
   char tmp[32];
-  FILE *output = stdout;
-  int write_to_process = 0;
 
   initialize_global_parameters();
   global_vars = stp_vars_create();
@@ -279,6 +299,7 @@ do_print(void)
 	output = NULL;
       else if (global_output[0] == '|')
 	{
+	  close_output();
 	  write_to_process = 1;
 	  output = popen(global_output+1, "w");
 	  if (! output)
@@ -291,6 +312,7 @@ do_print(void)
 	}
       else
 	{
+	  close_output();
 	  output = fopen(global_output, "wb");
 	  if (! output)
 	    {
@@ -301,8 +323,6 @@ do_print(void)
 	  global_output = NULL;
 	}
     }
-  else
-    output = stdout;
   stp_set_printer_defaults(v, the_printer);
   stp_set_outfunc(v, writefunc);
   stp_set_errfunc(v, writefunc);
@@ -339,6 +359,18 @@ do_print(void)
 	  int val = stp_get_int_parameter(global_vars, p->name);
 	  stp_set_int_parameter(v, p->name, val);
 	}
+      else if (p->p_type == STP_PARAMETER_TYPE_BOOLEAN &&
+	       stp_check_boolean_parameter(global_vars, p->name, STP_PARAMETER_ACTIVE))
+	{
+	  int val = stp_get_boolean_parameter(global_vars, p->name);
+	  stp_set_boolean_parameter(v, p->name, val);
+	}
+      else if (p->p_type == STP_PARAMETER_TYPE_CURVE &&
+	       stp_check_curve_parameter(global_vars, p->name, STP_PARAMETER_ACTIVE))
+	{
+	  const stp_curve_t *val = stp_get_curve_parameter(global_vars, p->name);
+	  stp_set_curve_parameter(v, p->name, val);
+	}
       else if (p->p_type == STP_PARAMETER_TYPE_DOUBLE &&
 	       stp_check_float_parameter(global_vars, p->name, STP_PARAMETER_ACTIVE))
 	{
@@ -349,6 +381,16 @@ do_print(void)
   stp_set_page_width(v, stp_get_page_width(global_vars));
   stp_set_page_height(v, stp_get_page_height(global_vars));
   stp_parameter_list_destroy(params);
+  if (stp_check_string_parameter(v, "PageSize", STP_PARAMETER_ACTIVE) &&
+      !strcmp(stp_get_string_parameter(v, "PageSize"), "Auto"))
+    {
+      stp_parameter_t desc;
+      stp_describe_parameter(v, "PageSize", &desc);
+      if (desc.p_type == STP_PARAMETER_TYPE_STRING_LIST)
+	stp_set_string_parameter(v, "PageSize", desc.deflt.str);
+      stp_parameter_description_destroy(&desc);
+    }
+  stp_set_printer_defaults_soft(v, the_printer);
 
   stp_get_imageable_area(v, &left, &right, &bottom, &top);
   stp_describe_resolution(v, &x, &y);
@@ -379,18 +421,21 @@ do_print(void)
   stp_set_top(v, top);
 
   stp_merge_printvars(v, stp_printer_get_defaults(the_printer));
+  if (start_job)
+    {
+      stp_start_job(v, &theImage);
+      start_job = 0;
+    }
   if (stp_print(v, &theImage) != 1)
     return 2;
+  if (end_job)
+    {
+      stp_end_job(v, &theImage);
+      end_job = 0;
+    }
   stp_vars_destroy(v);
   stp_free(static_testpatterns);
   static_testpatterns = NULL;
-  if (output && output != stdout)
-    {
-      if (write_to_process)
-	(void) pclose(output);
-      else
-	(void) fclose(output);
-    }
   return 0;
 }
 
@@ -402,19 +447,24 @@ main(int argc, char **argv)
   int global_status = 0;
   while (1)
     {
-      c = getopt(argc, argv, "n");
+      c = getopt(argc, argv, "nq");
       if (c == -1)
 	break;
       switch (c)
 	{
 	case 'n':
 	  global_suppress_output = 1;
+	  break;
+	case 'q':
+	  global_quiet = 1;
+	  break;
 	default:
 	  break;
 	}
     }
 
   stp_init();
+  output = stdout;
   while (1)
     {
       status = do_print();
@@ -423,6 +473,7 @@ main(int argc, char **argv)
       else if (status != 0)
 	global_status = 1;
     }
+  close_output();
   return global_status;
 }
 
@@ -969,6 +1020,11 @@ Image_get_row(stp_image_t *image, unsigned char *data,
 	      size_t byte_limit, int row)
 {
   int depth = global_channel_depth;
+  if (! Image_is_valid)
+    {
+      fprintf(stderr, "Calling Image_get_row with invalid image!\n");
+      abort();
+    }
   if (static_testpatterns[0].type == E_IMAGE)
     {
       testpattern_t *t = &(static_testpatterns[0]);
@@ -979,7 +1035,8 @@ Image_get_row(stp_image_t *image, unsigned char *data,
 	  fprintf(stderr, "Read failed!\n");
 	  return STP_IMAGE_STATUS_ABORT;
 	}
-      fprintf(stderr, ".");
+      if (!global_quiet)
+	fprintf(stderr, ".");
     }
   else
     {
@@ -991,7 +1048,8 @@ Image_get_row(stp_image_t *image, unsigned char *data,
 		       global_printer_width, global_steps, depth,
 		       global_bit_depth / 8);
 	  previous_band = band;
-	  fprintf(stderr, ".");
+	  if (!global_quiet)
+	    fprintf(stderr, ".");
 	}
       else if (row == global_printer_height - 1)
 	fill_black(data, global_printer_width, global_steps,
@@ -1005,7 +1063,8 @@ Image_get_row(stp_image_t *image, unsigned char *data,
 		       global_printer_width, global_steps, depth,
 		       global_bit_depth / 8);
 	  previous_band = band;
-	  fprintf(stderr, ".");
+	  if (!global_quiet)
+	    fprintf(stderr, ".");
 	}
       else
 	fill_pattern(&(static_testpatterns[band]), data,
@@ -1018,6 +1077,11 @@ Image_get_row(stp_image_t *image, unsigned char *data,
 static int
 Image_width(stp_image_t *image)
 {
+  if (! Image_is_valid)
+    {
+      fprintf(stderr, "Calling Image_width with invalid image!\n");
+      abort();
+    }
   if (static_testpatterns[0].type == E_IMAGE)
     return static_testpatterns[0].d.image.x;
   else
@@ -1027,6 +1091,11 @@ Image_width(stp_image_t *image)
 static int
 Image_height(stp_image_t *image)
 {
+  if (! Image_is_valid)
+    {
+      fprintf(stderr, "Calling Image_height with invalid image!\n");
+      abort();
+    }
   if (static_testpatterns[0].type == E_IMAGE)
     return static_testpatterns[0].d.image.y;
   else
@@ -1036,17 +1105,46 @@ Image_height(stp_image_t *image)
 static void
 Image_init(stp_image_t *image)
 {
+  if (Image_is_valid)
+    {
+      fprintf(stderr, "Calling Image_init with already valid image!\n");
+      abort();
+    }
+  Image_is_valid = 1;
+ /* dummy function */
+}
+
+static void
+Image_reset(stp_image_t *image)
+{
+  if (!Image_is_valid)
+    {
+      fprintf(stderr, "Calling Image_reset with invalid image!\n");
+      abort();
+    }
  /* dummy function */
 }
 
 static void
 Image_conclude(stp_image_t *image)
 {
-  fprintf(stderr, "\n");
+  if (! Image_is_valid)
+    {
+      fprintf(stderr, "Calling Image_conclude with invalid image!\n");
+      abort();
+    }
+  Image_is_valid = 0;
+  if (!global_quiet)
+    fprintf(stderr, "\n");
 }
 
 static const char *
 Image_get_appname(stp_image_t *image)
 {
+  if (! Image_is_valid)
+    {
+      fprintf(stderr, "Calling Image_get_appname with invalid image!\n");
+      abort();
+    }
   return "Test Pattern";
 }
diff --git a/src/testpattern/testpattern.h b/src/testpattern/testpattern.h
index 3d3bbdc..b8c2b86 100644
--- a/src/testpattern/testpattern.h
+++ b/src/testpattern/testpattern.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: testpattern.h,v 1.17 2008/01/27 21:44:21 rlk Exp $"
+ * "$Id: testpattern.h,v 1.19 2008/06/28 15:05:28 rlk Exp $"
  *
  *   Test pattern generator for Gimp-Print
  *
@@ -83,10 +83,14 @@ extern int global_did_something;
 extern int global_invert_data;
 extern int global_noscale;
 extern char *global_output;
-
+extern int global_quiet;
+extern FILE *output;
+extern int start_job;
+extern int end_job;
 
 extern char *c_strdup(const char *s);
 extern testpattern_t *get_next_testpattern(void);
+extern void close_output(void);
 
 typedef struct yylv {
   int ival;
diff --git a/src/testpattern/testpatternl.c b/src/testpattern/testpatternl.c
index be9bd04..167b521 100644
--- a/src/testpattern/testpatternl.c
+++ b/src/testpattern/testpatternl.c
@@ -361,8 +361,8 @@ static void yy_fatal_error (yyconst char msg[]  );
 	*yy_cp = '\0'; \
 	(yy_c_buf_p) = yy_cp;
 
-#define YY_NUM_RULES 51
-#define YY_END_OF_BUFFER 52
+#define YY_NUM_RULES 54
+#define YY_END_OF_BUFFER 55
 /* This struct is not used in this scanner,
    but its presence is necessary. */
 struct yy_trans_info
@@ -370,35 +370,37 @@ struct yy_trans_info
 	flex_int32_t yy_verify;
 	flex_int32_t yy_nxt;
 	};
-static yyconst flex_int16_t yy_accept[249] =
+static yyconst flex_int16_t yy_accept[264] =
     {   0,
-        0,    0,   52,   51,   48,   50,   51,   49,   51,   51,
-       45,   45,   32,   47,   47,   47,   47,   47,   47,   47,
-       47,   47,   47,   47,   47,   47,   47,   47,   47,   47,
-       47,   47,   47,   47,   48,    0,   49,    0,   47,   45,
-       47,    0,   45,   47,   47,   47,   47,   47,   47,   47,
-       47,   47,   47,   47,   47,   47,   47,   47,   47,   47,
-       47,   47,   47,   47,   47,   47,   47,   47,   47,   47,
-       47,   47,   47,   47,   47,    0,   46,    0,   47,   46,
-       45,   47,   47,   37,   47,   47,   47,   44,   47,   47,
-       47,   47,   47,   47,   47,   47,   47,   47,   47,   47,
-
-       47,   47,   47,   47,   47,   47,   47,   47,   47,   47,
-       47,   36,   47,   20,   47,   47,   47,   47,   46,   47,
-       47,   34,    1,   47,   47,   47,   47,   39,   38,   29,
-       47,   47,   47,   35,   47,   47,   47,   21,   47,   47,
-       47,   33,   47,   47,   47,   47,   47,   47,   47,   47,
-       47,   47,   47,    7,   47,   47,   47,   47,    9,   22,
-       27,   47,   47,   47,   47,   10,   47,   47,   47,   47,
-       47,   47,   47,   47,   11,   23,   40,   47,   47,   47,
-       47,   47,   47,   47,   47,   47,    2,   47,   47,   47,
-       47,   41,   47,   47,   47,   47,   47,    5,   47,   30,
-
-       47,   19,   47,   47,    8,   47,    3,   42,   43,   47,
-       47,   25,   13,   47,   47,    6,   28,   47,   47,   47,
-       47,   26,   24,   12,    4,   31,   14,   47,   47,   47,
-       47,   47,   47,   47,   47,   47,   47,   47,   15,   47,
-       47,   47,   47,   18,   17,   47,   16,    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
     } ;
 
 static yyconst flex_int32_t yy_ec[256] =
@@ -411,12 +413,12 @@ static yyconst flex_int32_t yy_ec[256] =
        11,   11,   11,   11,   11,   11,   11,    1,   12,    1,
         1,    1,    1,    1,   14,   15,   16,   17,   18,   19,
        20,   21,   22,   23,   24,   25,   26,   27,   28,   29,
-       23,   30,   31,   32,   33,   34,   35,   36,   37,   38,
+       30,   31,   32,   33,   34,   35,   36,   37,   38,   39,
         1,    1,    1,    1,   13,    1,   14,   15,   16,   17,
 
        18,   19,   20,   21,   22,   23,   24,   25,   26,   27,
-       28,   29,   23,   30,   31,   32,   33,   34,   35,   36,
-       37,   38,    1,    1,    1,    1,    1,    1,    1,    1,
+       28,   29,   30,   31,   32,   33,   34,   35,   36,   37,
+       38,   39,    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,
@@ -433,206 +435,214 @@ static yyconst flex_int32_t yy_ec[256] =
         1,    1,    1,    1,    1
     } ;
 
-static yyconst flex_int32_t yy_meta[39] =
+static yyconst flex_int32_t yy_meta[40] =
     {   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,    4,    4,    4,    4,    4,    4,    4,    4
     } ;
 
-static yyconst flex_int16_t yy_base[253] =
+static yyconst flex_int16_t yy_base[268] =
     {   0,
-        0,    0,  516,  517,  513,  517,    0,    0,  508,   29,
-       32,   35,  517,  504,   38,   39,   43,   42,   40,   46,
-       48,   50,   49,   70,   55,   62,   71,   72,   64,   63,
-       73,   78,   77,   84,  510,  507,    0,  504,  517,   98,
-      500,   79,  101,  113,  104,   91,  116,   94,  118,  108,
-      109,  117,  119,  120,  126,  128,  124,  130,  132,  140,
-      133,  144,  134,  151,  138,  148,  152,  153,  161,  165,
-      150,  164,  168,  178,  169,  188,  190,  178,  193,  196,
-      200,  203,  154,  204,  188,  205,  162,  499,  207,  208,
-      209,  211,  212,  213,  215,  217,  218,  222,  223,  224,
-
-      227,  231,  232,  230,  234,  228,  233,  236,  244,  247,
-      248,  498,  254,  497,  255,  256,  257,  259,  259,  258,
-      263,  496,  495,  262,  264,  265,  267,  494,  493,  492,
-      276,  282,  271,  491,  288,  289,  286,  490,  290,  292,
-      295,  489,  296,  298,  299,  302,  304,  305,  307,  308,
-      309,  311,  312,  314,  315,  316,  320,  325,  488,  487,
-      486,  323,  335,  321,  337,  485,  326,  327,  340,  341,
-      344,  345,  347,  348,  484,  483,  482,  350,  351,  352,
-      353,  355,  358,  361,  362,  360,  481,  363,  367,  371,
-      373,  480,  376,  378,  384,  383,  385,  479,  387,  478,
-
-      388,  477,  390,  394,  476,  392,  475,  468,  465,  391,
-      399,  461,  458,  393,  400,  457,  450,  395,  412,  410,
-      403,  447,  446,  397,  396,  269,  421,  416,  413,  427,
-      422,  428,  431,  430,  432,  433,  434,  436,  268,  435,
-      444,  439,  442,  182,  176,  445,   88,  517,  471,  475,
-      479,   90
+        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
     } ;
 
-static yyconst flex_int16_t yy_def[253] =
+static yyconst flex_int16_t yy_def[268] =
     {   0,
-      248,    1,  248,  248,  248,  248,  249,  250,  251,  248,
-      252,  252,  248,  252,  252,  252,  252,  252,  252,  252,
-      252,  252,  252,  252,  252,  252,  252,  252,  252,  252,
-      252,  252,  252,  252,  248,  249,  250,  251,  248,  248,
-      252,  248,  252,  252,  252,  252,  252,  252,  252,  252,
-      252,  252,  252,  252,  252,  252,  252,  252,  252,  252,
-      252,  252,  252,  252,  252,  252,  252,  252,  252,  252,
-      252,  252,  252,  252,  252,  248,  248,  248,  252,  252,
-      252,  252,  252,  252,  252,  252,  252,  252,  252,  252,
-      252,  252,  252,  252,  252,  252,  252,  252,  252,  252,
-
-      252,  252,  252,  252,  252,  252,  252,  252,  252,  252,
-      252,  252,  252,  252,  252,  252,  252,  252,  248,  252,
-      252,  252,  252,  252,  252,  252,  252,  252,  252,  252,
-      252,  252,  252,  252,  252,  252,  252,  252,  252,  252,
-      252,  252,  252,  252,  252,  252,  252,  252,  252,  252,
-      252,  252,  252,  252,  252,  252,  252,  252,  252,  252,
-      252,  252,  252,  252,  252,  252,  252,  252,  252,  252,
-      252,  252,  252,  252,  252,  252,  252,  252,  252,  252,
-      252,  252,  252,  252,  252,  252,  252,  252,  252,  252,
-      252,  252,  252,  252,  252,  252,  252,  252,  252,  252,
-
-      252,  252,  252,  252,  252,  252,  252,  252,  252,  252,
-      252,  252,  252,  252,  252,  252,  252,  252,  252,  252,
-      252,  252,  252,  252,  252,  252,  252,  252,  252,  252,
-      252,  252,  252,  252,  252,  252,  252,  252,  252,  252,
-      252,  252,  252,  252,  252,  252,  252,    0,  248,  248,
-      248,  248
+      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,  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[556] =
+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,   28,
-       29,   30,   14,   31,   32,   33,   34,   14,   40,   40,
-       42,   43,   43,   42,   43,   43,  248,  248,  248,   44,
-      248,  248,   44,   54,  248,   50,  248,  248,  248,   47,
-       51,   60,   46,  248,   48,   59,   61,   45,   52,   55,
-      248,  248,  248,   57,   58,   49,   56,   53,  248,  248,
-      248,  248,   65,   62,   67,  248,  248,   63,   77,   77,
-       71,   69,  248,   41,   66,   70,  248,   64,   73,  248,
-
-       68,   75,  248,   72,   82,   74,   42,   40,   40,   42,
-       43,   43,  248,   81,   81,   76,  248,  248,   44,   78,
-       79,  248,   80,   80,  248,  248,  248,  248,  248,   83,
-       84,   85,  248,   88,  248,   87,  248,   95,  248,   91,
-      248,  248,  248,   92,   86,   90,  248,   93,  248,   94,
-       89,  101,  248,   96,   98,   99,  248,   97,  248,  248,
-      248,  248,  248,  103,  104,  100,  102,  105,  106,  248,
-      248,  108,  248,  248,  111,  112,  248,  248,  114,  107,
-      121,  109,  113,  110,  248,  115,  248,  119,  119,  116,
-      248,  117,  125,  118,   78,   78,  248,  119,  119,   77,
-
-       77,  248,   80,   80,  248,   80,   80,   76,  248,   81,
-       81,  248,  248,  248,  123,  248,  248,  248,  120,  248,
-      248,  248,  124,  248,  126,  248,  248,  122,  130,  133,
-      248,  248,  248,  127,  132,  248,  248,  137,  248,  248,
-      248,  248,  248,  143,  248,  128,  135,  129,  139,  140,
-      131,  142,  248,  145,  134,  248,  248,  146,  138,  136,
-      141,  144,  248,  248,  248,  248,  248,  248,  119,  119,
-      248,  248,  248,  248,  148,  248,  248,  248,  147,  248,
-      159,  154,  149,  153,  248,  157,  156,  151,  152,  155,
-      248,  158,  150,  160,  248,  162,  248,  248,  248,  161,
-
-      248,  163,  164,  248,  248,  165,  248,  248,  168,  169,
-      248,  171,  248,  248,  166,  248,  248,  248,  167,  248,
-      248,  173,  248,  248,  248,  176,  177,  172,  248,  248,
-      170,  248,  181,  248,  248,  248,  174,  175,  180,  179,
-      182,  184,  178,  248,  185,  248,  190,  187,  248,  248,
-      186,  183,  248,  248,  188,  248,  248,  189,  248,  248,
-      248,  248,  194,  248,  191,  196,  248,  197,  248,  248,
-      248,  248,  192,  199,  193,  248,  195,  200,  203,  248,
-      207,  248,  201,  205,  248,  198,  248,  204,  208,  206,
-      209,  248,  248,  248,  202,  248,  248,  210,  248,  248,
-
-      248,  248,  248,  248,  248,  248,  217,  248,  248,  211,
-      212,  248,  213,  215,  214,  218,  221,  223,  248,  222,
-      248,  248,  216,  219,  248,  225,  224,  226,  220,  248,
-      248,  229,  227,  228,  230,  248,  248,  231,  248,  248,
-      248,  248,  248,  248,  248,  233,  232,  248,  235,  242,
-      248,  234,  248,  248,  248,  248,  243,  238,  248,  236,
-      237,  244,  240,  239,  247,  248,  248,  241,  246,  248,
-      245,   36,   36,  248,   36,   37,  248,   37,   37,   38,
-       38,   38,   38,  248,  248,  248,  248,  248,  248,  248,
-      248,  248,  248,  248,  248,  248,  248,  248,  248,  248,
-
-      248,  248,  248,  248,  248,  248,  248,  248,  248,   39,
-       39,   35,  248,   39,   35,  248,    3,  248,  248,  248,
-      248,  248,  248,  248,  248,  248,  248,  248,  248,  248,
-      248,  248,  248,  248,  248,  248,  248,  248,  248,  248,
-      248,  248,  248,  248,  248,  248,  248,  248,  248,  248,
-      248,  248,  248,  248,  248
+       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
     } ;
 
-static yyconst flex_int16_t yy_chk[556] =
+static yyconst flex_int16_t yy_chk[588] =
     {   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,   10,   10,
-       11,   11,   11,   12,   12,   12,   15,   16,   19,   11,
-       18,   17,   12,   19,   20,   17,   21,   23,   22,   16,
-       17,   23,   15,   25,   16,   22,   23,   11,   18,   19,
-       26,   30,   29,   21,   21,   16,   20,   18,   24,   27,
-       28,   31,   25,   24,   27,   33,   32,   24,   42,   42,
-       30,   28,   34,  252,   26,   29,  247,   24,   32,   46,
-
-       27,   34,   48,   31,   46,   33,   40,   40,   40,   43,
-       43,   43,   45,   45,   45,   40,   50,   51,   43,   44,
-       44,   44,   44,   44,   47,   52,   49,   53,   54,   47,
-       48,   49,   57,   52,   55,   51,   56,   57,   58,   55,
-       59,   61,   63,   55,   50,   54,   65,   55,   60,   56,
-       53,   61,   62,   58,   60,   60,   66,   59,   71,   64,
-       67,   68,   83,   62,   63,   60,   61,   64,   65,   69,
-       87,   67,   72,   70,   68,   69,   73,   75,   71,   66,
-       83,   67,   70,   67,  245,   72,   74,   78,   78,   73,
-      244,   74,   87,   75,   76,   76,   85,   76,   76,   77,
+        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,   84,   86,   85,   89,   90,   91,   82,   92,
-       93,   94,   86,   95,   89,   96,   97,   84,   93,   96,
-       98,   99,  100,   90,   95,  101,  106,  100,  104,  102,
-      103,  107,  105,  106,  108,   91,   98,   92,  102,  103,
-       94,  105,  109,  108,   97,  110,  111,  109,  101,   99,
-      104,  107,  113,  115,  116,  117,  120,  118,  119,  119,
-      124,  121,  125,  126,  111,  127,  239,  226,  110,  133,
-      127,  120,  113,  118,  131,  125,  124,  116,  117,  121,
-      132,  126,  115,  131,  137,  133,  135,  136,  139,  132,
-
-      140,  135,  136,  141,  143,  137,  144,  145,  141,  143,
-      146,  145,  147,  148,  139,  149,  150,  151,  140,  152,
-      153,  147,  154,  155,  156,  150,  151,  146,  157,  164,
-      144,  162,  155,  158,  167,  168,  148,  149,  154,  153,
-      156,  158,  152,  163,  162,  165,  168,  164,  169,  170,
-      163,  157,  171,  172,  165,  173,  174,  167,  178,  179,
-      180,  181,  172,  182,  169,  174,  183,  178,  186,  184,
-      185,  188,  170,  180,  171,  189,  173,  181,  184,  190,
-      189,  191,  182,  186,  193,  179,  194,  185,  190,  188,
-      191,  196,  195,  197,  183,  199,  201,  193,  203,  210,
-
-      206,  214,  204,  218,  225,  224,  203,  211,  215,  194,
-      195,  221,  196,  199,  197,  204,  211,  215,  220,  214,
-      219,  229,  201,  206,  228,  219,  218,  220,  210,  227,
-      231,  228,  221,  227,  228,  230,  232,  228,  234,  233,
-      235,  236,  237,  240,  238,  229,  228,  242,  231,  238,
-      243,  230,  241,  246,  223,  222,  240,  234,  217,  232,
-      233,  241,  236,  235,  246,  216,  213,  237,  243,  212,
-      242,  249,  249,  209,  249,  250,  208,  250,  250,  251,
-      251,  251,  251,  207,  205,  202,  200,  198,  192,  187,
-      177,  176,  175,  166,  161,  160,  159,  142,  138,  134,
-
-      130,  129,  128,  123,  122,  114,  112,   88,   41,   38,
-       36,   35,   14,    9,    5,    3,  248,  248,  248,  248,
-      248,  248,  248,  248,  248,  248,  248,  248,  248,  248,
-      248,  248,  248,  248,  248,  248,  248,  248,  248,  248,
-      248,  248,  248,  248,  248,  248,  248,  248,  248,  248,
-      248,  248,  248,  248,  248
+       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
     } ;
 
 static yy_state_type yy_last_accepting_state;
@@ -651,7 +661,7 @@ int yy_flex_debug = 0;
 char *yytext;
 #line 1 "testpatternl.l"
 /*
- * "$Id: testpatternl.l,v 1.20 2008/02/03 02:48:20 rlk Exp $"
+ * "$Id: testpatternl.l,v 1.22 2008/06/08 01:03:51 rlk Exp $"
  *
  *   Test pattern generator for Gimp-Print
  *
@@ -711,7 +721,7 @@ do							\
  while (0)
 
 
-#line 715 "testpatternl.c"
+#line 725 "testpatternl.c"
 
 #define INITIAL 0
 
@@ -867,7 +877,7 @@ YY_DECL
 #line 73 "testpatternl.l"
 
 
-#line 871 "testpatternl.c"
+#line 881 "testpatternl.c"
 
 	if ( !(yy_init) )
 		{
@@ -920,13 +930,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 >= 249 )
+				if ( yy_current_state >= 264 )
 					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] != 517 );
+		while ( yy_base[yy_current_state] != 548 );
 
 yy_find_action:
 		yy_act = yy_accept[yy_current_state];
@@ -1028,117 +1038,117 @@ DBG(PARAMETER_INT); return PARAMETER_INT;
 case 16:
 YY_RULE_SETUP
 #line 90 "testpatternl.l"
-DBG(PARAMETER); return PARAMETER;
+DBG(PARAMETER_BOOL); return PARAMETER_BOOL;
 	YY_BREAK
 case 17:
 YY_RULE_SETUP
 #line 91 "testpatternl.l"
-DBG(PARAMETER_FLOAT); return PARAMETER_FLOAT;
+DBG(PARAMETER); return PARAMETER;
 	YY_BREAK
 case 18:
 YY_RULE_SETUP
 #line 92 "testpatternl.l"
-DBG(PARAMETER_CURVE); return PARAMETER_CURVE;
+DBG(PARAMETER_FLOAT); return PARAMETER_FLOAT;
 	YY_BREAK
 case 19:
 YY_RULE_SETUP
 #line 93 "testpatternl.l"
-DBG(DENSITY); return DENSITY;
+DBG(PARAMETER_CURVE); return PARAMETER_CURVE;
 	YY_BREAK
 case 20:
 YY_RULE_SETUP
 #line 94 "testpatternl.l"
-DBG(TOP); return TOP;
+DBG(DENSITY); return DENSITY;
 	YY_BREAK
 case 21:
 YY_RULE_SETUP
 #line 95 "testpatternl.l"
-DBG(LEFT); return LEFT;
+DBG(TOP); return TOP;
 	YY_BREAK
 case 22:
 YY_RULE_SETUP
 #line 96 "testpatternl.l"
-DBG(HSIZE); return HSIZE;
+DBG(LEFT); return LEFT;
 	YY_BREAK
 case 23:
 YY_RULE_SETUP
 #line 97 "testpatternl.l"
-DBG(VSIZE); return VSIZE;
+DBG(HSIZE); return HSIZE;
 	YY_BREAK
 case 24:
 YY_RULE_SETUP
 #line 98 "testpatternl.l"
-DBG(BLACKLINE); return BLACKLINE;
+DBG(VSIZE); return VSIZE;
 	YY_BREAK
 case 25:
 YY_RULE_SETUP
 #line 99 "testpatternl.l"
-DBG(PATTERN); return PATTERN;
+DBG(BLACKLINE); return BLACKLINE;
 	YY_BREAK
 case 26:
 YY_RULE_SETUP
 #line 100 "testpatternl.l"
-DBG(XPATTERN); return XPATTERN;
+DBG(PATTERN); return PATTERN;
 	YY_BREAK
 case 27:
 YY_RULE_SETUP
 #line 101 "testpatternl.l"
-DBG(IMAGE); return IMAGE;
+DBG(XPATTERN); return XPATTERN;
 	YY_BREAK
 case 28:
 YY_RULE_SETUP
 #line 102 "testpatternl.l"
-DBG(EXTENDED); return EXTENDED;
+DBG(IMAGE); return IMAGE;
 	YY_BREAK
 case 29:
 YY_RULE_SETUP
 #line 103 "testpatternl.l"
-DBG(GRID); return GRID;
+DBG(EXTENDED); return EXTENDED;
 	YY_BREAK
 case 30:
 YY_RULE_SETUP
 #line 104 "testpatternl.l"
-DBG(CHANNEL); return CHANNEL;
+DBG(GRID); return GRID;
 	YY_BREAK
 case 31:
 YY_RULE_SETUP
 #line 105 "testpatternl.l"
-DBG(PAGESIZE); return PAGESIZE;
+DBG(CHANNEL); return CHANNEL;
 	YY_BREAK
 case 32:
 YY_RULE_SETUP
 #line 106 "testpatternl.l"
-DBG(SEMI); return SEMI;
+DBG(PAGESIZE); return PAGESIZE;
 	YY_BREAK
 case 33:
 YY_RULE_SETUP
 #line 107 "testpatternl.l"
-DBG(MODE); return MODE;
+DBG(SEMI); return SEMI;
 	YY_BREAK
 case 34:
 YY_RULE_SETUP
 #line 108 "testpatternl.l"
-yylval.ival = CMYK;DBG(CMYK); return CMYK;
+DBG(MODE); return MODE;
 	YY_BREAK
 case 35:
 YY_RULE_SETUP
 #line 109 "testpatternl.l"
-yylval.ival = CMYK;DBG(KCMY); return KCMY;
+yylval.ival = CMYK;DBG(CMYK); return CMYK;
 	YY_BREAK
 case 36:
 YY_RULE_SETUP
 #line 110 "testpatternl.l"
-yylval.ival = RGB;DBG(RGB); return RGB;
+yylval.ival = CMYK;DBG(KCMY); return KCMY;
 	YY_BREAK
 case 37:
 YY_RULE_SETUP
 #line 111 "testpatternl.l"
-yylval.ival = RGB;DBG(CMY); return CMY;
+yylval.ival = RGB;DBG(RGB); return RGB;
 	YY_BREAK
 case 38:
 YY_RULE_SETUP
 #line 112 "testpatternl.l"
-yylval.ival = GRAY;DBG(GRAY); return GRAY;
+yylval.ival = RGB;DBG(CMY); return CMY;
 	YY_BREAK
 case 39:
 YY_RULE_SETUP
@@ -1148,66 +1158,81 @@ yylval.ival = GRAY;DBG(GRAY); return GRAY;
 case 40:
 YY_RULE_SETUP
 #line 114 "testpatternl.l"
-yylval.ival = WHITE;DBG(WHITE); return WHITE;
+yylval.ival = GRAY;DBG(GRAY); return GRAY;
 	YY_BREAK
 case 41:
 YY_RULE_SETUP
 #line 115 "testpatternl.l"
-DBG(OUTPUT); return OUTPUT;
+yylval.ival = WHITE;DBG(WHITE); return WHITE;
 	YY_BREAK
 case 42:
 YY_RULE_SETUP
 #line 116 "testpatternl.l"
-DBG(MESSAGE); return MESSAGE;
+DBG(OUTPUT); return OUTPUT;
 	YY_BREAK
 case 43:
 YY_RULE_SETUP
 #line 117 "testpatternl.l"
-DBG(NOSCALE); return NOSCALE;
+DBG(MESSAGE); return MESSAGE;
 	YY_BREAK
 case 44:
 YY_RULE_SETUP
 #line 118 "testpatternl.l"
-DBG(END); return END;
+DBG(NOSCALE); return NOSCALE;
 	YY_BREAK
 case 45:
 YY_RULE_SETUP
-#line 121 "testpatternl.l"
-yylval.ival = strtol(yytext, NULL, 0); yylval.dval = (double) yylval.ival; DBG(tINT); return tINT;
+#line 119 "testpatternl.l"
+DBG(START_JOB); return START_JOB;
 	YY_BREAK
 case 46:
 YY_RULE_SETUP
-#line 122 "testpatternl.l"
-yylval.dval = strtod(yytext, NULL); DBG(tDOUBLE); return tDOUBLE;
+#line 120 "testpatternl.l"
+DBG(END_JOB); return END_JOB;
 	YY_BREAK
 case 47:
-/* rule 47 can match eol */
 YY_RULE_SETUP
-#line 123 "testpatternl.l"
-yylval.sval = c_strstrip(yytext); DBG(tSTRING); return tSTRING;
+#line 121 "testpatternl.l"
+DBG(END); return END;
 	YY_BREAK
 case 48:
 YY_RULE_SETUP
 #line 124 "testpatternl.l"
-DBG(whitespace); 	/* Skip blanks/tabs */
+yylval.ival = strtol(yytext, NULL, 0); yylval.dval = (double) yylval.ival; DBG(tINT); return tINT;
 	YY_BREAK
 case 49:
 YY_RULE_SETUP
 #line 125 "testpatternl.l"
-DBG(comment); 	/* Skip comments */
+yylval.dval = strtod(yytext, NULL); DBG(tDOUBLE); return tDOUBLE;
 	YY_BREAK
 case 50:
 /* rule 50 can match eol */
 YY_RULE_SETUP
 #line 126 "testpatternl.l"
-DBG(newline); mylineno++;
+yylval.sval = c_strstrip(yytext); DBG(tSTRING); return tSTRING;
 	YY_BREAK
 case 51:
 YY_RULE_SETUP
 #line 127 "testpatternl.l"
+DBG(whitespace); 	/* Skip blanks/tabs */
+	YY_BREAK
+case 52:
+YY_RULE_SETUP
+#line 128 "testpatternl.l"
+DBG(comment); 	/* Skip comments */
+	YY_BREAK
+case 53:
+/* rule 53 can match eol */
+YY_RULE_SETUP
+#line 129 "testpatternl.l"
+DBG(newline); mylineno++;
+	YY_BREAK
+case 54:
+YY_RULE_SETUP
+#line 130 "testpatternl.l"
 ECHO;
 	YY_BREAK
-#line 1211 "testpatternl.c"
+#line 1236 "testpatternl.c"
 case YY_STATE_EOF(INITIAL):
 	yyterminate();
 
@@ -1491,7 +1516,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 >= 249 )
+			if ( yy_current_state >= 264 )
 				yy_c = yy_meta[(unsigned int) yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -1519,11 +1544,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 >= 249 )
+		if ( yy_current_state >= 264 )
 			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 == 248);
+	yy_is_jam = (yy_current_state == 263);
 
 	return yy_is_jam ? 0 : yy_current_state;
 }
@@ -2174,4 +2199,4 @@ void yyfree (void * ptr )
 
 #define YYTABLES_NAME "yytables"
 
-#line 127 "testpatternl.l"
+#line 130 "testpatternl.l"
diff --git a/src/testpattern/testpatternl.l b/src/testpattern/testpatternl.l
index 58dcfe2..a6894c9 100644
--- a/src/testpattern/testpatternl.l
+++ b/src/testpattern/testpatternl.l
@@ -1,5 +1,5 @@
 /*
- * "$Id: testpatternl.l,v 1.20 2008/02/03 02:48:20 rlk Exp $"
+ * "$Id: testpatternl.l,v 1.22 2008/06/08 01:03:51 rlk Exp $"
  *
  *   Test pattern generator for Gimp-Print
  *
@@ -87,6 +87,7 @@ ink_limit		DBG(INK_LIMIT); return INK_LIMIT;
 printer			DBG(PRINTER); return PRINTER;
 parameter		DBG(PARAMETER); return PARAMETER;
 parameter_int		DBG(PARAMETER_INT); return PARAMETER_INT;
+parameter_bool		DBG(PARAMETER_BOOL); return PARAMETER_BOOL;
 parameter_string	DBG(PARAMETER); return PARAMETER;
 parameter_float		DBG(PARAMETER_FLOAT); return PARAMETER_FLOAT;
 parameter_curve		DBG(PARAMETER_CURVE); return PARAMETER_CURVE;
@@ -115,6 +116,8 @@ white			yylval.ival = WHITE;DBG(WHITE); return WHITE;
 output			DBG(OUTPUT); return OUTPUT;
 message			DBG(MESSAGE); return MESSAGE;
 noscale			DBG(NOSCALE); return NOSCALE;
+start_job		DBG(START_JOB); return START_JOB;
+end_job			DBG(END_JOB); return END_JOB;
 end			DBG(END); return END;
 
 
diff --git a/src/testpattern/testpatterny.c b/src/testpattern/testpatterny.c
index a7ea3dc..10fac48 100644
--- a/src/testpattern/testpatterny.c
+++ b/src/testpattern/testpatterny.c
@@ -84,34 +84,37 @@
      PRINTER = 273,
      PARAMETER = 274,
      PARAMETER_INT = 275,
-     PARAMETER_FLOAT = 276,
-     PARAMETER_CURVE = 277,
-     DENSITY = 278,
-     TOP = 279,
-     LEFT = 280,
-     HSIZE = 281,
-     VSIZE = 282,
-     BLACKLINE = 283,
-     NOSCALE = 284,
-     PATTERN = 285,
-     XPATTERN = 286,
-     EXTENDED = 287,
-     IMAGE = 288,
-     GRID = 289,
-     SEMI = 290,
-     CHANNEL = 291,
-     CMYK = 292,
-     KCMY = 293,
-     RGB = 294,
-     CMY = 295,
-     GRAY = 296,
-     WHITE = 297,
-     RAW = 298,
-     MODE = 299,
-     PAGESIZE = 300,
-     MESSAGE = 301,
-     OUTPUT = 302,
-     END = 303
+     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
    };
 #endif
 /* Tokens.  */
@@ -133,34 +136,37 @@
 #define PRINTER 273
 #define PARAMETER 274
 #define PARAMETER_INT 275
-#define PARAMETER_FLOAT 276
-#define PARAMETER_CURVE 277
-#define DENSITY 278
-#define TOP 279
-#define LEFT 280
-#define HSIZE 281
-#define VSIZE 282
-#define BLACKLINE 283
-#define NOSCALE 284
-#define PATTERN 285
-#define XPATTERN 286
-#define EXTENDED 287
-#define IMAGE 288
-#define GRID 289
-#define SEMI 290
-#define CHANNEL 291
-#define CMYK 292
-#define KCMY 293
-#define RGB 294
-#define CMY 295
-#define GRAY 296
-#define WHITE 297
-#define RAW 298
-#define MODE 299
-#define PAGESIZE 300
-#define MESSAGE 301
-#define OUTPUT 302
-#define END 303
+#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
 
 
 
@@ -264,7 +270,7 @@ typedef int YYSTYPE;
 
 
 /* Line 216 of yacc.c.  */
-#line 268 "testpatterny.c"
+#line 274 "testpatterny.c"
 
 #ifdef short
 # undef short
@@ -477,22 +483,22 @@ union yyalloc
 #endif
 
 /* YYFINAL -- State number of the termination state.  */
-#define YYFINAL  61
+#define YYFINAL  67
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   178
+#define YYLAST   186
 
 /* YYNTOKENS -- Number of terminals.  */
-#define YYNTOKENS  49
+#define YYNTOKENS  52
 /* YYNNTS -- Number of nonterminals.  */
-#define YYNNTS  72
+#define YYNNTS  75
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  127
+#define YYNRULES  133
 /* YYNRULES -- Number of states.  */
-#define YYNSTATES  185
+#define YYNSTATES  193
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
-#define YYMAXUTOK   303
+#define YYMAXUTOK   306
 
 #define YYTRANSLATE(YYX)						\
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
@@ -530,7 +536,7 @@ static const yytype_uint8 yytranslate[] =
       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
+      45,    46,    47,    48,    49,    50,    51
 };
 
 #if YYDEBUG
@@ -542,72 +548,75 @@ static const yytype_uint16 yyprhs[] =
       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,   119,   121,   123,   125,   128,   131,
-     134,   137,   140,   143,   146,   150,   152,   155,   156,   158,
-     161,   166,   172,   174,   176,   178,   181,   182,   184,   186,
-     188,   194,   198,   201,   204,   208,   211,   215,   220,   226,
-     233,   235,   237,   239,   241,   243,   245,   247,   250,   252,
-     254,   256,   258,   260,   262,   264,   266,   268,   270,   272,
-     274,   276,   278,   280,   282,   284,   286,   288,   290,   292,
-     294,   296,   299,   301,   303,   305,   307,   310,   311,   314,
-     316,   317,   320,   322,   324,   325,   328,   329
+     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
 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS.  */
 static const yytype_int8 yyrhs[] =
 {
-     119,     0,    -1,     6,    -1,     7,    -1,     8,    -1,     9,
+     125,     0,    -1,     6,    -1,     7,    -1,     8,    -1,     9,
       -1,    10,    -1,    11,    -1,    12,    -1,    13,    -1,     4,
-      -1,     3,    -1,    37,     3,    -1,    38,     3,    -1,    39,
-       3,    -1,    40,     3,    -1,    41,     3,    -1,    42,     3,
-      -1,    32,     3,     3,    -1,    52,    -1,    53,    -1,    54,
-      -1,    55,    -1,    56,    -1,    57,    -1,    58,    -1,    44,
-      59,    -1,    15,    50,    51,    -1,    15,     3,    51,    -1,
-      14,    50,    51,    -1,    14,     3,    51,    -1,    14,    51,
-      -1,    16,     3,    -1,    17,    51,    -1,    18,     5,    -1,
-      45,     5,    -1,    45,     3,     3,    -1,    69,    -1,    70,
+      -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,    51,    -1,    22,     5,     5,    -1,    72,    -1,    73,
-      -1,    74,    -1,    75,    -1,    23,    51,    -1,    24,    51,
-      -1,    25,    51,    -1,    26,    51,    -1,    27,    51,    -1,
-      28,     3,    -1,    29,     3,    -1,    51,    51,    51,    -1,
-      84,    -1,    85,    84,    -1,    -1,    85,    -1,    84,    86,
-      -1,    50,    51,    51,    51,    -1,    36,     3,    51,    51,
-      51,    -1,    88,    -1,    89,    -1,    90,    -1,    91,    90,
-      -1,    -1,    91,    -1,    87,    -1,    92,    -1,    51,    51,
-      51,    51,    51,    -1,    30,    94,    93,    -1,    31,    93,
-      -1,    34,     3,    -1,    33,     3,     3,    -1,    46,     5,
-      -1,    46,     5,     5,    -1,    46,     5,     5,     5,    -1,
-      46,     5,     5,     5,     5,    -1,    46,     5,     5,     5,
-       5,     5,    -1,    99,    -1,   100,    -1,   101,    -1,   102,
-      -1,   103,    -1,   104,    -1,    47,    -1,    47,     5,    -1,
-     106,    -1,   107,    -1,   108,    -1,    63,    -1,    64,    -1,
-      61,    -1,    62,    -1,    65,    -1,    66,    -1,    67,    -1,
-      68,    -1,    76,    -1,    77,    -1,    78,    -1,    79,    -1,
-      80,    -1,    81,    -1,    82,    -1,    83,    -1,    60,    -1,
-      71,    -1,   105,    -1,   109,    -1,   110,    35,    -1,    95,
-      -1,    96,    -1,    97,    -1,   105,    -1,   112,    35,    -1,
-      -1,   114,   113,    -1,    98,    -1,    -1,   116,   111,    -1,
-     114,    -1,   115,    -1,    -1,    48,    35,    -1,    -1,   116,
-     120,   117,   118,    -1
+       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
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
-       0,   141,   141,   141,   141,   141,   142,   142,   142,   142,
-     144,   144,   147,   159,   171,   183,   195,   207,   219,   231,
-     231,   231,   231,   231,   231,   231,   234,   237,   247,   256,
-     266,   275,   282,   289,   296,   305,   314,   323,   323,   326,
-     336,   345,   354,   368,   368,   368,   368,   370,   377,   384,
-     391,   398,   405,   413,   421,   436,   436,   439,   439,   442,
-     445,   459,   472,   472,   475,   475,   478,   478,   481,   481,
-     484,   499,   502,   517,   528,   545,   551,   558,   566,   575,
-     586,   586,   586,   586,   586,   589,   592,   599,   604,   604,
-     607,   610,   610,   610,   610,   610,   610,   611,   611,   611,
-     611,   611,   611,   611,   612,   612,   612,   612,   612,   612,
-     612,   615,   619,   619,   619,   619,   622,   626,   626,   629,
-     633,   633,   636,   636,   639,   639,   644,   643
+       0,   144,   144,   144,   144,   144,   145,   145,   145,   145,
+     147,   147,   150,   162,   174,   186,   198,   210,   222,   234,
+     234,   234,   234,   234,   234,   234,   237,   240,   250,   259,
+     269,   278,   285,   292,   299,   308,   317,   326,   326,   329,
+     339,   348,   357,   366,   380,   380,   380,   380,   380,   382,
+     389,   396,   403,   410,   417,   425,   433,   448,   448,   451,
+     451,   454,   457,   471,   484,   484,   487,   487,   490,   490,
+     493,   493,   496,   511,   514,   529,   540,   557,   563,   570,
+     578,   587,   598,   598,   598,   598,   598,   601,   604,   613,
+     618,   618,   621,   624,   628,   632,   632,   632,   632,   632,
+     632,   633,   633,   633,   633,   633,   633,   633,   634,   634,
+     634,   634,   634,   634,   635,   635,   635,   638,   642,   642,
+     642,   642,   645,   649,   649,   652,   656,   656,   659,   659,
+     662,   662,   667,   666
 };
 #endif
 
@@ -619,25 +628,25 @@ 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_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", "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_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", "A_Rule", "Rule",
-  "A_Pattern", "Pattern", "Patterns", "Image", "Rules", "Output", "EOF",
-  "Thing", "@1", 0
+  "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
 };
 #endif
 
@@ -650,26 +659,28 @@ 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
+     295,   296,   297,   298,   299,   300,   301,   302,   303,   304,
+     305,   306
 };
 # endif
 
 /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
 static const yytype_uint8 yyr1[] =
 {
-       0,    49,    50,    50,    50,    50,    50,    50,    50,    50,
-      51,    51,    52,    53,    54,    55,    56,    57,    58,    59,
-      59,    59,    59,    59,    59,    59,    60,    61,    62,    63,
-      64,    65,    66,    67,    68,    69,    70,    71,    71,    72,
-      73,    74,    75,    76,    76,    76,    76,    77,    78,    79,
-      80,    81,    82,    83,    84,    85,    85,    86,    86,    87,
-      88,    89,    90,    90,    91,    91,    92,    92,    93,    93,
-      94,    95,    96,    97,    98,    99,   100,   101,   102,   103,
-     104,   104,   104,   104,   104,   105,   106,   107,   108,   108,
-     109,   110,   110,   110,   110,   110,   110,   110,   110,   110,
-     110,   110,   110,   110,   110,   110,   110,   110,   110,   110,
-     110,   111,   112,   112,   112,   112,   113,   114,   114,   115,
-     116,   116,   117,   117,   118,   118,   120,   119
+       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
 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
@@ -679,15 +690,16 @@ static const yytype_uint8 yyr2[] =
        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,     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,     1,     1,
+       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,
        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,     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
@@ -695,77 +707,79 @@ static const yytype_uint8 yyr2[] =
    means the default is an error.  */
 static const yytype_uint8 yydefact[] =
 {
-     120,   126,     0,     0,     0,     0,     0,     0,     0,     0,
+     126,   132,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,    86,   107,    93,    94,    91,    92,    95,    96,
-      97,    98,    37,    38,   108,    43,    44,    45,    46,    99,
-     100,   101,   102,   103,   104,   105,   106,    80,    81,    82,
-      83,    84,    85,   109,    88,    89,    90,   110,     0,   121,
-     117,     1,    11,    10,     2,     3,     4,     5,     6,     7,
-       8,     9,     0,    31,     0,     0,    32,    11,    33,    34,
-       0,     0,     0,     0,    47,    48,    49,    50,    51,    52,
-      53,     0,     0,     0,     0,     0,     0,     0,    19,    20,
-      21,    22,    23,    24,    25,    26,     0,    35,    75,    87,
-     111,     0,   119,   122,   123,   124,    30,    29,    28,    27,
-      39,    40,    41,    42,     0,    12,    13,    14,    15,    16,
-      17,    36,    76,     0,     0,    66,     0,   112,   113,   114,
-     115,     0,   118,     0,   127,    18,    77,    74,     0,    66,
-       0,     0,     0,    57,    68,    62,    63,    64,    67,    69,
-      72,    73,   116,   125,    78,     0,    71,     0,     0,     0,
-      55,    58,    59,    65,    79,     0,     0,     0,    54,    56,
-       0,     0,    60,    70,    61
+       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
 };
 
 /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int16 yydefgoto[] =
 {
-      -1,   151,   152,    98,    99,   100,   101,   102,   103,   104,
-     105,    23,    24,    25,    26,    27,    28,    29,    30,    31,
-      32,    33,    34,    35,    36,    37,    38,    39,    40,    41,
-      42,    43,    44,    45,    46,   153,   171,   172,   154,   155,
-     156,   157,   158,   159,   160,   149,   137,   138,   139,   112,
-      47,    48,    49,    50,    51,    52,    53,    54,    55,    56,
-      57,    58,    59,   141,   142,   113,   114,     1,   115,   144,
-       2,    60
+      -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
 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
-#define YYPACT_NINF -112
+#define YYPACT_NINF -119
 static const yytype_int8 yypact[] =
 {
-    -112,     0,     1,    77,    88,    29,     2,    36,    38,    51,
-      52,    53,     2,     2,     2,     2,     2,    61,    63,    70,
-      -1,    62,    65,  -112,  -112,  -112,  -112,  -112,  -112,  -112,
-    -112,  -112,  -112,  -112,  -112,  -112,  -112,  -112,  -112,  -112,
-    -112,  -112,  -112,  -112,  -112,  -112,  -112,  -112,  -112,  -112,
-    -112,  -112,  -112,  -112,  -112,  -112,  -112,  -112,    33,  -112,
-      40,  -112,     2,  -112,  -112,  -112,  -112,  -112,  -112,  -112,
-    -112,  -112,     2,  -112,     2,     2,  -112,  -112,  -112,  -112,
-      69,    72,     2,    71,  -112,  -112,  -112,  -112,  -112,  -112,
-    -112,    79,    89,    90,   100,   101,   102,   103,  -112,  -112,
-    -112,  -112,  -112,  -112,  -112,  -112,   110,  -112,   109,  -112,
-    -112,   112,  -112,    31,  -112,    68,  -112,  -112,  -112,  -112,
-    -112,  -112,  -112,  -112,   114,  -112,  -112,  -112,  -112,  -112,
-    -112,  -112,   113,   116,     2,    27,   117,  -112,  -112,  -112,
-    -112,    86,  -112,    87,  -112,  -112,   118,  -112,     2,    27,
-     121,     2,     2,     2,  -112,  -112,  -112,  -112,    42,  -112,
-    -112,  -112,  -112,  -112,   120,     2,  -112,     2,     2,     2,
-    -112,     2,  -112,  -112,  -112,     2,     2,     2,  -112,  -112,
-       2,     2,  -112,  -112,  -112
+    -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
 };
 
 /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int8 yypgoto[] =
 {
-    -112,     4,    -3,  -112,  -112,  -112,  -112,  -112,  -112,  -112,
-    -112,  -112,  -112,  -112,  -112,  -112,  -112,  -112,  -112,  -112,
-    -112,  -112,  -112,  -112,  -112,  -112,  -112,  -112,  -112,  -112,
-    -112,  -112,  -112,  -112,  -112,  -111,  -112,  -112,  -112,  -112,
-    -112,   -32,  -112,  -112,   -22,  -112,  -112,  -112,  -112,  -112,
-    -112,  -112,  -112,  -112,  -112,  -112,    15,  -112,  -112,  -112,
-    -112,  -112,  -112,  -112,  -112,  -112,  -112,  -112,  -112,  -112,
-    -112,  -112
+    -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
 };
 
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
@@ -775,71 +789,74 @@ static const yytype_int8 yypgoto[] =
 #define YYTABLE_NINF -1
 static const yytype_uint8 yytable[] =
 {
-      73,    61,   106,    78,   107,    77,    63,    72,    75,    84,
-      85,    86,    87,    88,     3,     4,     5,     6,     7,     8,
-       9,    10,    11,    12,    13,    14,    15,    16,    17,    18,
-      77,    63,    76,    64,    65,    66,    67,    68,    69,    70,
-      71,    79,   170,    80,    19,    20,    21,    22,    64,    65,
-      66,    67,    68,    69,    70,    71,    81,    82,    83,   116,
-     179,   134,   135,   150,    89,   136,    90,   108,   110,   117,
-     109,   118,   119,   111,   120,   121,   123,    21,   150,   122,
-      62,    63,   124,    64,    65,    66,    67,    68,    69,    70,
-      71,    74,   125,   126,    64,    65,    66,    67,    68,    69,
-      70,    71,    91,   127,   128,   129,   130,    92,    93,    94,
-      95,    96,    97,   131,   132,   133,   143,   145,   146,   147,
-     161,   162,   163,   164,   167,   174,   173,   166,   140,     0,
-       0,   148,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   165,     0,     0,   168,   169,
+      79,    82,   113,    84,   114,    83,    69,    78,    81,    67,
+      91,    92,    93,    94,    95,     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,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   175,     0,   176,   177,   178,     0,     0,     0,
-       0,     0,   180,   181,   182,     0,     0,   183,   184
+       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
 };
 
 static const yytype_int16 yycheck[] =
 {
-       3,     0,     3,     6,     5,     3,     4,     3,     4,    12,
-      13,    14,    15,    16,    14,    15,    16,    17,    18,    19,
-      20,    21,    22,    23,    24,    25,    26,    27,    28,    29,
-       3,     4,     3,     6,     7,     8,     9,    10,    11,    12,
-      13,     5,   153,     5,    44,    45,    46,    47,     6,     7,
-       8,     9,    10,    11,    12,    13,     5,     5,     5,    62,
-     171,    30,    31,    36,     3,    34,     3,     5,    35,    72,
-       5,    74,    75,    33,     5,     3,     5,    46,    36,    82,
-       3,     4,     3,     6,     7,     8,     9,    10,    11,    12,
-      13,     3,     3,     3,     6,     7,     8,     9,    10,    11,
-      12,    13,    32,     3,     3,     3,     3,    37,    38,    39,
-      40,    41,    42,     3,     5,     3,    48,     3,     5,     3,
-       3,    35,    35,     5,     3,     5,   158,   149,   113,    -1,
-      -1,   134,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   148,    -1,    -1,   151,   152,
+       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,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   156,    -1,    -1,   159,   160,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   165,    -1,   167,   168,   169,    -1,    -1,    -1,
-      -1,    -1,   175,   176,   177,    -1,    -1,   180,   181
+     173,    -1,   175,   176,   177,    -1,    -1,    -1,    -1,    -1,
+     183,   184,   185,    -1,    -1,   188,   189
 };
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
    symbol of state STATE-NUM.  */
 static const yytype_uint8 yystos[] =
 {
-       0,   116,   119,    14,    15,    16,    17,    18,    19,    20,
-      21,    22,    23,    24,    25,    26,    27,    28,    29,    44,
-      45,    46,    47,    60,    61,    62,    63,    64,    65,    66,
+       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,    99,   100,   101,
-     102,   103,   104,   105,   106,   107,   108,   109,   110,   111,
-     120,     0,     3,     4,     6,     7,     8,     9,    10,    11,
-      12,    13,    50,    51,     3,    50,     3,     3,    51,     5,
-       5,     5,     5,     5,    51,    51,    51,    51,    51,     3,
-       3,    32,    37,    38,    39,    40,    41,    42,    52,    53,
-      54,    55,    56,    57,    58,    59,     3,     5,     5,     5,
-      35,    33,    98,   114,   115,   117,    51,    51,    51,    51,
-       5,     3,    51,     5,     3,     3,     3,     3,     3,     3,
-       3,     3,     5,     3,    30,    31,    34,    95,    96,    97,
-     105,   112,   113,    48,   118,     3,     5,     3,    51,    94,
-      36,    50,    51,    84,    87,    88,    89,    90,    91,    92,
-      93,     3,    35,    35,     5,    51,    93,     3,    51,    51,
-      84,    85,    86,    90,     5,    51,    51,    51,    51,    84,
-      51,    51,    51,    51,    51
+      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
 };
 
 #define yyerrok		(yyerrstatus = 0)
@@ -1654,7 +1671,7 @@ yyreduce:
   switch (yyn)
     {
         case 12:
-#line 148 "testpatterny.y"
+#line 151 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>cmykspec %d\n", (yyvsp[(2) - (2)].ival));
@@ -1667,7 +1684,7 @@ yyreduce:
     break;
 
   case 13:
-#line 160 "testpatterny.y"
+#line 163 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>kcmyspec %d\n", (yyvsp[(2) - (2)].ival));
@@ -1680,7 +1697,7 @@ yyreduce:
     break;
 
   case 14:
-#line 172 "testpatterny.y"
+#line 175 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>rgbspec %d\n", (yyvsp[(2) - (2)].ival));
@@ -1693,7 +1710,7 @@ yyreduce:
     break;
 
   case 15:
-#line 184 "testpatterny.y"
+#line 187 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>cmyspec %d\n", (yyvsp[(2) - (2)].ival));
@@ -1706,7 +1723,7 @@ yyreduce:
     break;
 
   case 16:
-#line 196 "testpatterny.y"
+#line 199 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>grayspec %d\n", (yyvsp[(2) - (2)].ival));
@@ -1719,7 +1736,7 @@ yyreduce:
     break;
 
   case 17:
-#line 208 "testpatterny.y"
+#line 211 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>whitespec %d\n", (yyvsp[(2) - (2)].ival));
@@ -1732,7 +1749,7 @@ yyreduce:
     break;
 
   case 18:
-#line 220 "testpatterny.y"
+#line 223 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>extendedspec %d\n", (yyvsp[(2) - (3)].ival));
@@ -1745,7 +1762,7 @@ yyreduce:
     break;
 
   case 27:
-#line 238 "testpatterny.y"
+#line 241 "testpatterny.y"
     {
 	  int channel = find_color((yyvsp[(2) - (3)]).sval);
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
@@ -1756,7 +1773,7 @@ yyreduce:
     break;
 
   case 28:
-#line 248 "testpatterny.y"
+#line 251 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>channel_level %d %f\n", (yyvsp[(2) - (3)].ival), (yyvsp[(3) - (3)]).dval);
@@ -1766,7 +1783,7 @@ yyreduce:
     break;
 
   case 29:
-#line 257 "testpatterny.y"
+#line 260 "testpatterny.y"
     {
 	  int channel = find_color((yyvsp[(2) - (3)]).sval);
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
@@ -1777,7 +1794,7 @@ yyreduce:
     break;
 
   case 30:
-#line 267 "testpatterny.y"
+#line 270 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>channel_gamma %d %f\n", (yyvsp[(2) - (3)].ival), (yyvsp[(3) - (3)]).dval);
@@ -1787,7 +1804,7 @@ yyreduce:
     break;
 
   case 31:
-#line 276 "testpatterny.y"
+#line 279 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>global_gamma %f\n", (yyvsp[(2) - (2)]).dval);
@@ -1796,7 +1813,7 @@ yyreduce:
     break;
 
   case 32:
-#line 283 "testpatterny.y"
+#line 286 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>steps %d\n", (yyvsp[(2) - (2)].ival));
@@ -1805,7 +1822,7 @@ yyreduce:
     break;
 
   case 33:
-#line 290 "testpatterny.y"
+#line 293 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>ink_limit %f\n", (yyvsp[(2) - (2)]).dval);
@@ -1814,7 +1831,7 @@ yyreduce:
     break;
 
   case 34:
-#line 297 "testpatterny.y"
+#line 300 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>printer %s\n", (yyvsp[(2) - (2)].sval));
@@ -1824,7 +1841,7 @@ yyreduce:
     break;
 
   case 35:
-#line 306 "testpatterny.y"
+#line 309 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>page_size_name %s\n", (yyvsp[(2) - (2)].sval));
@@ -1834,7 +1851,7 @@ yyreduce:
     break;
 
   case 36:
-#line 315 "testpatterny.y"
+#line 318 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>page_size_custom %d %d\n", (yyvsp[(2) - (3)].ival), (yyvsp[(3) - (3)].ival));
@@ -1844,7 +1861,7 @@ yyreduce:
     break;
 
   case 39:
-#line 327 "testpatterny.y"
+#line 330 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>parameter_string %s %s\n", (yyvsp[(2) - (3)].sval), (yyvsp[(3) - (3)].sval));
@@ -1855,7 +1872,7 @@ yyreduce:
     break;
 
   case 40:
-#line 337 "testpatterny.y"
+#line 340 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>parameter_int %s %d\n", (yyvsp[(2) - (3)].sval), (yyvsp[(3) - (3)].ival));
@@ -1865,7 +1882,17 @@ yyreduce:
     break;
 
   case 41:
-#line 346 "testpatterny.y"
+#line 349 "testpatterny.y"
+    {
+	  if (getenv("STP_TESTPATTERN_DEBUG"))
+	    fprintf(stderr, ">>>parameter_bool %s %d\n", (yyvsp[(2) - (3)].sval), (yyvsp[(3) - (3)].ival));
+	  stp_set_boolean_parameter(global_vars, (yyvsp[(2) - (3)].sval), (yyvsp[(3) - (3)].ival));
+	  free((yyvsp[(2) - (3)].sval));
+	}
+    break;
+
+  case 42:
+#line 358 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>parameter_float %s %f\n", (yyvsp[(2) - (3)].sval), (yyvsp[(3) - (3)]).dval);
@@ -1874,8 +1901,8 @@ yyreduce:
 	}
     break;
 
-  case 42:
-#line 355 "testpatterny.y"
+  case 43:
+#line 367 "testpatterny.y"
     {
 	  stp_curve_t *curve = stp_curve_create_from_string((yyvsp[(3) - (3)].sval));
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
@@ -1889,8 +1916,8 @@ yyreduce:
 	}
     break;
 
-  case 47:
-#line 371 "testpatterny.y"
+  case 49:
+#line 383 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>density %f\n", (yyvsp[(2) - (2)]).dval);
@@ -1898,8 +1925,8 @@ yyreduce:
 	}
     break;
 
-  case 48:
-#line 378 "testpatterny.y"
+  case 50:
+#line 390 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>top %f\n", (yyvsp[(2) - (2)]).dval);
@@ -1907,8 +1934,8 @@ yyreduce:
 	}
     break;
 
-  case 49:
-#line 385 "testpatterny.y"
+  case 51:
+#line 397 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
  	    fprintf(stderr, ">>>left %f\n", (yyvsp[(2) - (2)]).dval);
@@ -1916,8 +1943,8 @@ yyreduce:
 	}
     break;
 
-  case 50:
-#line 392 "testpatterny.y"
+  case 52:
+#line 404 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>hsize %f\n", (yyvsp[(2) - (2)]).dval);
@@ -1925,8 +1952,8 @@ yyreduce:
 	}
     break;
 
-  case 51:
-#line 399 "testpatterny.y"
+  case 53:
+#line 411 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>vsize %f\n", (yyvsp[(2) - (2)]).dval);
@@ -1934,8 +1961,8 @@ yyreduce:
 	}
     break;
 
-  case 52:
-#line 406 "testpatterny.y"
+  case 54:
+#line 418 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>blackline %d\n", (yyvsp[(2) - (2)].ival));
@@ -1943,8 +1970,8 @@ yyreduce:
 	}
     break;
 
-  case 53:
-#line 414 "testpatterny.y"
+  case 55:
+#line 426 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>noscale %d\n", (yyvsp[(2) - (2)].ival));
@@ -1952,8 +1979,8 @@ yyreduce:
 	}
     break;
 
-  case 54:
-#line 422 "testpatterny.y"
+  case 56:
+#line 434 "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,
@@ -1968,8 +1995,8 @@ yyreduce:
 	}
     break;
 
-  case 60:
-#line 446 "testpatterny.y"
+  case 62:
+#line 458 "testpatterny.y"
     {
 	  int channel = find_color((yyvsp[(1) - (4)]).sval);
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
@@ -1983,8 +2010,8 @@ yyreduce:
 	}
     break;
 
-  case 61:
-#line 460 "testpatterny.y"
+  case 63:
+#line 472 "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);
@@ -1997,8 +2024,8 @@ yyreduce:
 	}
     break;
 
-  case 70:
-#line 485 "testpatterny.y"
+  case 72:
+#line 497 "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);
@@ -2013,8 +2040,8 @@ yyreduce:
 	}
     break;
 
-  case 72:
-#line 503 "testpatterny.y"
+  case 74:
+#line 515 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>xpattern\n");
@@ -2029,8 +2056,8 @@ yyreduce:
 	}
     break;
 
-  case 73:
-#line 518 "testpatterny.y"
+  case 75:
+#line 530 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>grid %d\n", (yyvsp[(2) - (2)].ival));
@@ -2041,8 +2068,8 @@ yyreduce:
 	}
     break;
 
-  case 74:
-#line 529 "testpatterny.y"
+  case 76:
+#line 541 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>image %d %d\n", (yyvsp[(2) - (3)].ival), (yyvsp[(3) - (3)].ival));
@@ -2059,16 +2086,16 @@ yyreduce:
 	}
     break;
 
-  case 75:
-#line 546 "testpatterny.y"
+  case 77:
+#line 558 "testpatterny.y"
     {
 	  fprintf(stderr,"%s",(yyvsp[(2) - (2)].sval));
 	  free((yyvsp[(2) - (2)].sval));
 	}
     break;
 
-  case 76:
-#line 552 "testpatterny.y"
+  case 78:
+#line 564 "testpatterny.y"
     {
 	  fprintf(stderr,"%s%s", (yyvsp[(2) - (3)].sval), (yyvsp[(3) - (3)].sval));
 	  free((yyvsp[(2) - (3)].sval));
@@ -2076,8 +2103,8 @@ yyreduce:
 	}
     break;
 
-  case 77:
-#line 559 "testpatterny.y"
+  case 79:
+#line 571 "testpatterny.y"
     {
 	  fprintf(stderr,"%s%s%s", (yyvsp[(2) - (4)].sval), (yyvsp[(3) - (4)].sval), (yyvsp[(4) - (4)].sval));
 	  free((yyvsp[(2) - (4)].sval));
@@ -2086,8 +2113,8 @@ yyreduce:
 	}
     break;
 
-  case 78:
-#line 567 "testpatterny.y"
+  case 80:
+#line 579 "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));
@@ -2097,8 +2124,8 @@ yyreduce:
 	}
     break;
 
-  case 79:
-#line 576 "testpatterny.y"
+  case 81:
+#line 588 "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));
@@ -2109,44 +2136,56 @@ yyreduce:
 	}
     break;
 
-  case 86:
-#line 593 "testpatterny.y"
+  case 88:
+#line 605 "testpatterny.y"
     {
+	  close_output();
 	  if (global_output)
 	    free(global_output);
 	  global_output = NULL;
+	  output = stdout;
 	}
     break;
 
-  case 87:
-#line 600 "testpatterny.y"
+  case 89:
+#line 614 "testpatterny.y"
     {
 	  global_output = (yyvsp[(2) - (2)].sval);
 	}
     break;
 
-  case 111:
-#line 616 "testpatterny.y"
-    { global_did_something = 1; }
+  case 93:
+#line 625 "testpatterny.y"
+    { start_job = 1; }
     break;
 
-  case 116:
-#line 623 "testpatterny.y"
+  case 94:
+#line 629 "testpatterny.y"
+    { end_job = 1; }
+    break;
+
+  case 117:
+#line 639 "testpatterny.y"
     { global_did_something = 1; }
     break;
 
-  case 119:
-#line 630 "testpatterny.y"
+  case 122:
+#line 646 "testpatterny.y"
     { global_did_something = 1; }
     break;
 
   case 125:
-#line 640 "testpatterny.y"
+#line 653 "testpatterny.y"
+    { global_did_something = 1; }
+    break;
+
+  case 131:
+#line 663 "testpatterny.y"
     { return 0; }
     break;
 
-  case 126:
-#line 644 "testpatterny.y"
+  case 132:
+#line 667 "testpatterny.y"
     {
 	  current_testpattern = get_next_testpattern();
 	}
@@ -2154,7 +2193,7 @@ yyreduce:
 
 
 /* Line 1267 of yacc.c.  */
-#line 2158 "testpatterny.c"
+#line 2197 "testpatterny.c"
       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -2368,6 +2407,6 @@ yyreturn:
 }
 
 
-#line 650 "testpatterny.y"
+#line 673 "testpatterny.y"
 
 
diff --git a/src/testpattern/testpatterny.h b/src/testpattern/testpatterny.h
index fdb65ae..c36836e 100644
--- a/src/testpattern/testpatterny.h
+++ b/src/testpattern/testpatterny.h
@@ -57,34 +57,37 @@
      PRINTER = 273,
      PARAMETER = 274,
      PARAMETER_INT = 275,
-     PARAMETER_FLOAT = 276,
-     PARAMETER_CURVE = 277,
-     DENSITY = 278,
-     TOP = 279,
-     LEFT = 280,
-     HSIZE = 281,
-     VSIZE = 282,
-     BLACKLINE = 283,
-     NOSCALE = 284,
-     PATTERN = 285,
-     XPATTERN = 286,
-     EXTENDED = 287,
-     IMAGE = 288,
-     GRID = 289,
-     SEMI = 290,
-     CHANNEL = 291,
-     CMYK = 292,
-     KCMY = 293,
-     RGB = 294,
-     CMY = 295,
-     GRAY = 296,
-     WHITE = 297,
-     RAW = 298,
-     MODE = 299,
-     PAGESIZE = 300,
-     MESSAGE = 301,
-     OUTPUT = 302,
-     END = 303
+     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
    };
 #endif
 /* Tokens.  */
@@ -106,34 +109,37 @@
 #define PRINTER 273
 #define PARAMETER 274
 #define PARAMETER_INT 275
-#define PARAMETER_FLOAT 276
-#define PARAMETER_CURVE 277
-#define DENSITY 278
-#define TOP 279
-#define LEFT 280
-#define HSIZE 281
-#define VSIZE 282
-#define BLACKLINE 283
-#define NOSCALE 284
-#define PATTERN 285
-#define XPATTERN 286
-#define EXTENDED 287
-#define IMAGE 288
-#define GRID 289
-#define SEMI 290
-#define CHANNEL 291
-#define CMYK 292
-#define KCMY 293
-#define RGB 294
-#define CMY 295
-#define GRAY 296
-#define WHITE 297
-#define RAW 298
-#define MODE 299
-#define PAGESIZE 300
-#define MESSAGE 301
-#define OUTPUT 302
-#define END 303
+#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
 
 
 
diff --git a/src/testpattern/testpatterny.y b/src/testpattern/testpatterny.y
index f3527d1..fcd7401 100644
--- a/src/testpattern/testpatterny.y
+++ b/src/testpattern/testpatterny.y
@@ -1,5 +1,5 @@
 /*
- * "$Id: testpatterny.y,v 1.30 2008/01/27 21:44:21 rlk Exp $"
+ * "$Id: testpatterny.y,v 1.32 2008/06/08 01:03:51 rlk Exp $"
  *
  *   Test pattern generator for Gimp-Print
  *
@@ -105,6 +105,7 @@ find_color(const char *name)
 %token PRINTER
 %token PARAMETER
 %token PARAMETER_INT
+%token PARAMETER_BOOL
 %token PARAMETER_FLOAT
 %token PARAMETER_CURVE
 %token DENSITY
@@ -132,6 +133,8 @@ find_color(const char *name)
 %token PAGESIZE
 %token MESSAGE
 %token OUTPUT
+%token START_JOB
+%token END_JOB
 %token END
 
 %start Thing
@@ -342,6 +345,15 @@ parameter_int: PARAMETER_INT tSTRING tINT
 	}
 ;
 
+parameter_bool: PARAMETER_BOOL tSTRING tINT
+	{
+	  if (getenv("STP_TESTPATTERN_DEBUG"))
+	    fprintf(stderr, ">>>parameter_bool %s %d\n", $2, $3);
+	  stp_set_boolean_parameter(global_vars, $2, $3);
+	  free($2);
+	}
+;
+
 parameter_float: PARAMETER_FLOAT tSTRING NUMBER
 	{
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
@@ -365,7 +377,7 @@ parameter_curve: PARAMETER_CURVE tSTRING tSTRING
 	}
 ;
 
-parameter: parameter_string | parameter_int | parameter_float | parameter_curve
+parameter: parameter_string | parameter_int | parameter_float | parameter_curve | parameter_bool
 ;
 density: DENSITY NUMBER
 	{
@@ -591,9 +603,11 @@ message: A_Message
 
 Output0: OUTPUT
 	{
+	  close_output();
 	  if (global_output)
 	    free(global_output);
 	  global_output = NULL;
+	  output = stdout;
 	}
 
 Output1: OUTPUT tSTRING
@@ -607,9 +621,18 @@ A_Output: Output0 | Output1
 output: A_Output
 ;
 
+start_job: START_JOB
+	{ start_job = 1; }
+;
+
+end_job: END_JOB
+	{ end_job = 1; }
+;
+
 A_Rule: gamma | channel_gamma | level | channel_level | global_gamma | steps
 	| ink_limit | printer | parameter | density | top | left | hsize
-	| vsize | blackline | noscale | inputspec | page_size | message | output
+	| vsize | blackline | noscale | inputspec | page_size | message
+	| output | start_job | end_job
 ;
 
 Rule: A_Rule SEMI
diff --git a/src/xml/Makefile.am b/src/xml/Makefile.am
new file mode 100644
index 0000000..65d76f5
--- /dev/null
+++ b/src/xml/Makefile.am
@@ -0,0 +1,66 @@
+## $Id: Makefile.am,v 1.2 2008/06/10 13:10:22 rlk Exp $
+## Copyright (C) 2008 Robert Krawitz
+##
+## 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, 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.
+
+## Process this file with automake to produce Makefile.in.
+
+@SET_MAKE@
+
+include $(top_srcdir)/scripts/global.mk
+
+SUBDIRS = escp2
+
+## Variables
+
+pkgxmldatadir = $(pkgdatadir)/@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@/xml
+
+pkgxmldata_DATA =				\
+	dither-matrix-1x1.xml			\
+	dither-matrix-2x1.xml			\
+	dither-matrix-4x1.xml			\
+	papers.xml				\
+	printers.xml
+
+## Rules
+
+noinst_PROGRAMS = extract-strings
+
+extract_strings_SOURCES = extract-strings.c
+extract_strings_LDADD = $(GUTENPRINT_LIBS)
+
+xml-stamp: $(pkgxmldata_DATA) escp2/xml-stamp Makefile.am
+	-rm -f xml-stamp
+	touch xml-stamp
+	sed 's;^;escp2/;' escp2/xml-stamp >> xml-stamp
+	for f in $(pkgxmldata_DATA) ; do echo $$f >> xml-stamp; done
+
+all-local: xmli18n-tmp.h xml-stamp
+
+
+xmli18n-tmp.h:  xml-stamp extract-strings
+	./extract-strings `cat xml-stamp` > xmli18n-tmp.h
+
+
+dist-hook: xmli18n-tmp.h
+# xmli18n-tmp.h is needed by po/POTFILES.in at dist time
+
+## Clean
+
+CLEANFILES = xmli18n-tmp.h xml-stamp
+
+EXTRA_DIST = $(pkgxmldata_DATA)
+
+MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/xml/Makefile.in b/src/xml/Makefile.in
new file mode 100644
index 0000000..5f49e85
--- /dev/null
+++ b/src/xml/Makefile.in
@@ -0,0 +1,735 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# Variables
+
+#export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
+#export STP_DATA_PATH = $(top_srcdir)/src/xml
+
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(top_srcdir)/scripts/global.mk
+noinst_PROGRAMS = extract-strings$(EXEEXT)
+subdir = src/xml
+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
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+PROGRAMS = $(noinst_PROGRAMS)
+am_extract_strings_OBJECTS = extract-strings.$(OBJEXT)
+extract_strings_OBJECTS = $(am_extract_strings_OBJECTS)
+extract_strings_DEPENDENCIES = $(GUTENPRINT_LIBS)
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(extract_strings_SOURCES)
+DIST_SOURCES = $(extract_strings_SOURCES)
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(pkgxmldatadir)"
+pkgxmldataDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(pkgxmldata_DATA)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_CUPS_PPDS = @BUILD_CUPS_PPDS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CONVERT = @CONVERT@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+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@
+DB2PS = @DB2PS@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DIALOG = @DIALOG@
+DOXYGEN = @DOXYGEN@
+DSYMUTIL = @DSYMUTIL@
+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@
+FIND = @FIND@
+FOOMATIC_CONFIGURE = @FOOMATIC_CONFIGURE@
+FOOMATIC_KITLOAD = @FOOMATIC_KITLOAD@
+FOOMATIC_PPDFILE = @FOOMATIC_PPDFILE@
+GENPPD_LIBS = @GENPPD_LIBS@
+GIMP2_CFLAGS = @GIMP2_CFLAGS@
+GIMP2_LIBS = @GIMP2_LIBS@
+GIMPTOOL2_CHECK = @GIMPTOOL2_CHECK@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GNUCFLAGS = @GNUCFLAGS@
+GREP = @GREP@
+GTK2_CFLAGS = @GTK2_CFLAGS@
+GTK2_LIBS = @GTK2_LIBS@
+GUTENPRINTUI2_BINARY_AGE = @GUTENPRINTUI2_BINARY_AGE@
+GUTENPRINTUI2_CFLAGS = @GUTENPRINTUI2_CFLAGS@
+GUTENPRINTUI2_CURRENT_INTERFACE = @GUTENPRINTUI2_CURRENT_INTERFACE@
+GUTENPRINTUI2_INTERFACE_AGE = @GUTENPRINTUI2_INTERFACE_AGE@
+GUTENPRINTUI2_LIBDEPS = @GUTENPRINTUI2_LIBDEPS@
+GUTENPRINTUI2_LIBS = $(top_builddir)/src/gutenprintui2/libgutenprintui2.la
+GUTENPRINTUI2_VERSION = @GUTENPRINTUI2_VERSION@
+GUTENPRINT_BINARY_AGE = @GUTENPRINT_BINARY_AGE@
+GUTENPRINT_CFLAGS = @GUTENPRINT_CFLAGS@
+GUTENPRINT_CURRENT_INTERFACE = @GUTENPRINT_CURRENT_INTERFACE@
+GUTENPRINT_INTERFACE_AGE = @GUTENPRINT_INTERFACE_AGE@
+GUTENPRINT_LIBDEPS = @GUTENPRINT_LIBDEPS@
+
+# Libraries
+GUTENPRINT_LIBS = $(top_builddir)/src/main/libgutenprint.la
+GUTENPRINT_MAJOR_VERSION = @GUTENPRINT_MAJOR_VERSION@
+GUTENPRINT_MICRO_VERSION = @GUTENPRINT_MICRO_VERSION@
+GUTENPRINT_MINOR_VERSION = @GUTENPRINT_MINOR_VERSION@
+GUTENPRINT_VERSION = @GUTENPRINT_VERSION@
+IJS_CFLAGS = @IJS_CFLAGS@
+IJS_CONFIG = @IJS_CONFIG@
+IJS_LIBS = @IJS_LIBS@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBREADLINE_DEPS = @LIBREADLINE_DEPS@
+LIBS = $(INTLLIBS) @LIBS@
+LIBTOOL = @LIBTOOL@
+LIBTOOL_DEPS = @LIBTOOL_DEPS@
+LN_S = @LN_S@
+LTALLOCA = @LTALLOCA@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PKG_CONFIG = @PKG_CONFIG@
+PLUG_IN_PATH = @PLUG_IN_PATH@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+RELEASE_DATE = @RELEASE_DATE@
+RM = @RM@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TEST = @TEST@
+TEXI2HTML = @TEXI2HTML@
+TRUE = @TRUE@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WHICH_PPDS = @WHICH_PPDS@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+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@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+cups_bindir = @cups_bindir@
+cups_conf_datadir = @cups_conf_datadir@
+cups_conf_serverbin = @cups_conf_serverbin@
+cups_conf_serverroot = @cups_conf_serverroot@
+cups_exec_prefix = @cups_exec_prefix@
+cups_prefix = @cups_prefix@
+cups_sbindir = @cups_sbindir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+gimp2_plug_indir = @gimp2_plug_indir@
+gutenprint_cflags = @gutenprint_cflags@
+gutenprint_libdeps = @gutenprint_libdeps@
+gutenprint_libs = @gutenprint_libs@
+gutenprintui2_cflags = @gutenprintui2_cflags@
+gutenprintui2_libdeps = @gutenprintui2_libdeps@
+gutenprintui2_libs = @gutenprintui2_libs@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+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
+SUBDIRS = escp2
+pkgxmldatadir = $(pkgdatadir)/@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@/xml
+pkgxmldata_DATA = \
+	dither-matrix-1x1.xml			\
+	dither-matrix-2x1.xml			\
+	dither-matrix-4x1.xml			\
+	papers.xml				\
+	printers.xml
+
+extract_strings_SOURCES = extract-strings.c
+extract_strings_LDADD = $(GUTENPRINT_LIBS)
+# xmli18n-tmp.h is needed by po/POTFILES.in at dist time
+CLEANFILES = xmli18n-tmp.h xml-stamp
+EXTRA_DIST = $(pkgxmldata_DATA)
+MAINTAINERCLEANFILES = Makefile.in
+all: all-recursive
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/scripts/global.mk $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/xml/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  src/xml/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+clean-noinstPROGRAMS:
+	@list='$(noinst_PROGRAMS)'; for p in $$list; do \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  echo " rm -f $$p $$f"; \
+	  rm -f $$p $$f ; \
+	done
+extract-strings$(EXEEXT): $(extract_strings_OBJECTS) $(extract_strings_DEPENDENCIES) 
+	@rm -f extract-strings$(EXEEXT)
+	$(LINK) $(extract_strings_OBJECTS) $(extract_strings_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/extract-strings.Po@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-pkgxmldataDATA: $(pkgxmldata_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(pkgxmldatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgxmldatadir)"
+	@list='$(pkgxmldata_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(pkgxmldataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgxmldatadir)/$$f'"; \
+	  $(pkgxmldataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgxmldatadir)/$$f"; \
+	done
+
+uninstall-pkgxmldataDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(pkgxmldata_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(pkgxmldatadir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(pkgxmldatadir)/$$f"; \
+	done
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+$(RECURSIVE_CLEAN_TARGETS):
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+	    || exit 1; \
+	    distdir=`$(am__cd) $(distdir) && pwd`; \
+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+	    (cd $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$top_distdir" \
+	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+	        distdir) \
+	      || 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 $(PROGRAMS) $(DATA) all-local
+installdirs: installdirs-recursive
+installdirs-am:
+	for dir in "$(DESTDIR)$(pkgxmldatadir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \
+	mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+info: info-recursive
+
+info-am:
+
+install-data-am: install-pkgxmldataDATA
+
+install-dvi: install-dvi-recursive
+
+install-exec-am:
+
+install-html: install-html-recursive
+
+install-info: install-info-recursive
+
+install-man:
+
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am: uninstall-pkgxmldataDATA
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
+
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am all-local check check-am clean clean-generic \
+	clean-libtool clean-noinstPROGRAMS ctags ctags-recursive \
+	dist-hook distclean distclean-compile 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 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 install-ps-am install-strip \
+	installcheck installcheck-am installdirs installdirs-am \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+	uninstall-pkgxmldataDATA
+
+
+@SET_MAKE@
+
+# Rules
+
+$(top_builddir)/src/main/libgutenprint.la:
+	cd $(top_builddir)/src/main; \
+	$(MAKE)
+
+$(top_builddir)/src/gutenprintui/libgutenprintui.la:
+	cd $(top_builddir)/src/gutenprintui; \
+	$(MAKE)
+
+$(top_builddir)/src/gutenprintui2/libgutenprintui2.la:
+	cd $(top_builddir)/src/gutenprintui2; \
+	$(MAKE)
+
+xml-stamp: $(pkgxmldata_DATA) escp2/xml-stamp Makefile.am
+	-rm -f xml-stamp
+	touch xml-stamp
+	sed 's;^;escp2/;' escp2/xml-stamp >> xml-stamp
+	for f in $(pkgxmldata_DATA) ; do echo $$f >> xml-stamp; done
+
+all-local: xmli18n-tmp.h xml-stamp
+
+xmli18n-tmp.h:  xml-stamp extract-strings
+	./extract-strings `cat xml-stamp` > xmli18n-tmp.h
+
+dist-hook: xmli18n-tmp.h
+# 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/main/dither-matrix-1x1.xml b/src/xml/dither-matrix-1x1.xml
index 87a2ccf..87a2ccf 100644
--- a/src/main/dither-matrix-1x1.xml
+++ b/src/xml/dither-matrix-1x1.xml
diff --git a/src/main/dither-matrix-2x1.xml b/src/xml/dither-matrix-2x1.xml
index 29aab5e..29aab5e 100644
--- a/src/main/dither-matrix-2x1.xml
+++ b/src/xml/dither-matrix-2x1.xml
diff --git a/src/main/dither-matrix-4x1.xml b/src/xml/dither-matrix-4x1.xml
index 46d6817..46d6817 100644
--- a/src/main/dither-matrix-4x1.xml
+++ b/src/xml/dither-matrix-4x1.xml
diff --git a/src/xml/escp2/Makefile.am b/src/xml/escp2/Makefile.am
new file mode 100644
index 0000000..987c5b7
--- /dev/null
+++ b/src/xml/escp2/Makefile.am
@@ -0,0 +1,56 @@
+## $Id: Makefile.am,v 1.7 2008/07/03 12:34:39 rlk Exp $
+## Copyright (C) 2008 Robert Krawitz
+##
+## 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, 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.
+
+## Process this file with automake to produce Makefile.in.
+
+@SET_MAKE@
+
+include $(top_srcdir)/scripts/global.mk
+
+SUBDIRS =					\
+	inks					\
+	inputslots				\
+	model					\
+	media					\
+	mediasizes				\
+	qualitypresets				\
+	weaves
+
+xml-stamp: media/xml-stamp			\
+	   model/xml-stamp			\
+	   inputslots/xml-stamp			\
+	   inks/xml-stamp			\
+	   mediasizes/xml-stamp			\
+	   qualitypresets/Makefile.am		\
+	   weaves/Makefile.am			\
+	   Makefile.am
+	-rm -f xml-stamp
+	touch xml-stamp
+	sed 's;^;media/;' media/xml-stamp >> xml-stamp
+	sed 's;^;model/;' model/xml-stamp >> xml-stamp
+	sed 's;^;inputslots/;' inputslots/xml-stamp >> xml-stamp
+	sed 's;^;inks/;' inks/xml-stamp >> xml-stamp
+	sed 's;^;mediasizes/;' mediasizes/xml-stamp >> xml-stamp
+	sed 's;^;weaves/;' weaves/xml-stamp >> xml-stamp
+	sed 's;^;qualitypresets/;' qualitypresets/xml-stamp >> xml-stamp
+
+all-local: xml-stamp
+## Clean
+
+CLEANFILES = xml-stamp
+
+MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/xml/escp2/Makefile.in b/src/xml/escp2/Makefile.in
new file mode 100644
index 0000000..e70c983
--- /dev/null
+++ b/src/xml/escp2/Makefile.in
@@ -0,0 +1,640 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# Variables
+
+#export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
+#export STP_DATA_PATH = $(top_srcdir)/src/xml
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(top_srcdir)/scripts/global.mk
+subdir = src/xml/escp2
+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
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_CUPS_PPDS = @BUILD_CUPS_PPDS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CONVERT = @CONVERT@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+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@
+DB2PS = @DB2PS@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DIALOG = @DIALOG@
+DOXYGEN = @DOXYGEN@
+DSYMUTIL = @DSYMUTIL@
+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@
+FIND = @FIND@
+FOOMATIC_CONFIGURE = @FOOMATIC_CONFIGURE@
+FOOMATIC_KITLOAD = @FOOMATIC_KITLOAD@
+FOOMATIC_PPDFILE = @FOOMATIC_PPDFILE@
+GENPPD_LIBS = @GENPPD_LIBS@
+GIMP2_CFLAGS = @GIMP2_CFLAGS@
+GIMP2_LIBS = @GIMP2_LIBS@
+GIMPTOOL2_CHECK = @GIMPTOOL2_CHECK@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GNUCFLAGS = @GNUCFLAGS@
+GREP = @GREP@
+GTK2_CFLAGS = @GTK2_CFLAGS@
+GTK2_LIBS = @GTK2_LIBS@
+GUTENPRINTUI2_BINARY_AGE = @GUTENPRINTUI2_BINARY_AGE@
+GUTENPRINTUI2_CFLAGS = @GUTENPRINTUI2_CFLAGS@
+GUTENPRINTUI2_CURRENT_INTERFACE = @GUTENPRINTUI2_CURRENT_INTERFACE@
+GUTENPRINTUI2_INTERFACE_AGE = @GUTENPRINTUI2_INTERFACE_AGE@
+GUTENPRINTUI2_LIBDEPS = @GUTENPRINTUI2_LIBDEPS@
+GUTENPRINTUI2_LIBS = $(top_builddir)/src/gutenprintui2/libgutenprintui2.la
+GUTENPRINTUI2_VERSION = @GUTENPRINTUI2_VERSION@
+GUTENPRINT_BINARY_AGE = @GUTENPRINT_BINARY_AGE@
+GUTENPRINT_CFLAGS = @GUTENPRINT_CFLAGS@
+GUTENPRINT_CURRENT_INTERFACE = @GUTENPRINT_CURRENT_INTERFACE@
+GUTENPRINT_INTERFACE_AGE = @GUTENPRINT_INTERFACE_AGE@
+GUTENPRINT_LIBDEPS = @GUTENPRINT_LIBDEPS@
+
+# Libraries
+GUTENPRINT_LIBS = $(top_builddir)/src/main/libgutenprint.la
+GUTENPRINT_MAJOR_VERSION = @GUTENPRINT_MAJOR_VERSION@
+GUTENPRINT_MICRO_VERSION = @GUTENPRINT_MICRO_VERSION@
+GUTENPRINT_MINOR_VERSION = @GUTENPRINT_MINOR_VERSION@
+GUTENPRINT_VERSION = @GUTENPRINT_VERSION@
+IJS_CFLAGS = @IJS_CFLAGS@
+IJS_CONFIG = @IJS_CONFIG@
+IJS_LIBS = @IJS_LIBS@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBREADLINE_DEPS = @LIBREADLINE_DEPS@
+LIBS = $(INTLLIBS) @LIBS@
+LIBTOOL = @LIBTOOL@
+LIBTOOL_DEPS = @LIBTOOL_DEPS@
+LN_S = @LN_S@
+LTALLOCA = @LTALLOCA@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PKG_CONFIG = @PKG_CONFIG@
+PLUG_IN_PATH = @PLUG_IN_PATH@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+RELEASE_DATE = @RELEASE_DATE@
+RM = @RM@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TEST = @TEST@
+TEXI2HTML = @TEXI2HTML@
+TRUE = @TRUE@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WHICH_PPDS = @WHICH_PPDS@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+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@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+cups_bindir = @cups_bindir@
+cups_conf_datadir = @cups_conf_datadir@
+cups_conf_serverbin = @cups_conf_serverbin@
+cups_conf_serverroot = @cups_conf_serverroot@
+cups_exec_prefix = @cups_exec_prefix@
+cups_prefix = @cups_prefix@
+cups_sbindir = @cups_sbindir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+gimp2_plug_indir = @gimp2_plug_indir@
+gutenprint_cflags = @gutenprint_cflags@
+gutenprint_libdeps = @gutenprint_libdeps@
+gutenprint_libs = @gutenprint_libs@
+gutenprintui2_cflags = @gutenprintui2_cflags@
+gutenprintui2_libdeps = @gutenprintui2_libdeps@
+gutenprintui2_libs = @gutenprintui2_libs@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+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
+SUBDIRS = \
+	inks					\
+	inputslots				\
+	model					\
+	media					\
+	mediasizes				\
+	qualitypresets				\
+	weaves
+
+CLEANFILES = xml-stamp
+MAINTAINERCLEANFILES = Makefile.in
+all: all-recursive
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/scripts/global.mk $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/xml/escp2/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  src/xml/escp2/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+$(RECURSIVE_CLEAN_TARGETS):
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+	    || exit 1; \
+	    distdir=`$(am__cd) $(distdir) && pwd`; \
+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+	    (cd $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$top_distdir" \
+	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile all-local
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+info: info-recursive
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-recursive
+
+install-exec-am:
+
+install-html: install-html-recursive
+
+install-info: install-info-recursive
+
+install-man:
+
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
+
+.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 \
+	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 \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs installdirs-am \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-recursive uninstall uninstall-am
+
+
+@SET_MAKE@
+
+# Rules
+
+$(top_builddir)/src/main/libgutenprint.la:
+	cd $(top_builddir)/src/main; \
+	$(MAKE)
+
+$(top_builddir)/src/gutenprintui/libgutenprintui.la:
+	cd $(top_builddir)/src/gutenprintui; \
+	$(MAKE)
+
+$(top_builddir)/src/gutenprintui2/libgutenprintui2.la:
+	cd $(top_builddir)/src/gutenprintui2; \
+	$(MAKE)
+
+xml-stamp: media/xml-stamp			\
+	   model/xml-stamp			\
+	   inputslots/xml-stamp			\
+	   inks/xml-stamp			\
+	   mediasizes/xml-stamp			\
+	   qualitypresets/Makefile.am		\
+	   weaves/Makefile.am			\
+	   Makefile.am
+	-rm -f xml-stamp
+	touch xml-stamp
+	sed 's;^;media/;' media/xml-stamp >> xml-stamp
+	sed 's;^;model/;' model/xml-stamp >> xml-stamp
+	sed 's;^;inputslots/;' inputslots/xml-stamp >> xml-stamp
+	sed 's;^;inks/;' inks/xml-stamp >> xml-stamp
+	sed 's;^;mediasizes/;' mediasizes/xml-stamp >> xml-stamp
+	sed 's;^;weaves/;' weaves/xml-stamp >> xml-stamp
+	sed 's;^;qualitypresets/;' qualitypresets/xml-stamp >> xml-stamp
+
+all-local: 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
new file mode 100644
index 0000000..73cdec5
--- /dev/null
+++ b/src/xml/escp2/inks/Makefile.am
@@ -0,0 +1,76 @@
+## $Id: Makefile.am,v 1.5 2008/10/19 13:57:27 rlk Exp $
+## Copyright (C) 2008 Robert Krawitz
+##
+## 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, 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.
+
+## Process this file with automake to produce Makefile.in.
+
+@SET_MAKE@
+
+include $(top_srcdir)/scripts/global.mk
+
+## Variables
+
+pkgxmldatadir = $(pkgdatadir)/@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@/xml/escp2/inks
+
+pkgxmldata_DATA =				\
+	b500.xml				\
+	c120.xml				\
+	c64.xml					\
+	c80.xml					\
+	c82.xml					\
+	claria.xml				\
+	cmy.xml					\
+	cmykrb.xml				\
+	cmykro.xml				\
+	cx3650.xml				\
+	defaultblack.xml			\
+	f360.xml				\
+	f360_photo.xml				\
+	f360_photo7_japan.xml			\
+	f360_ultrachrome.xml			\
+	f360_ultrachrome_k3.xml			\
+	nx100.xml				\
+	photo_gen0.xml				\
+	photo_gen1.xml				\
+	photo_gen2.xml				\
+	photo_gen3.xml				\
+	photo_gen3_4.xml			\
+	photo_gen4.xml				\
+	photo_pigment.xml			\
+	picturemate_4.xml			\
+	picturemate_6.xml			\
+	pro_gen1.xml				\
+	pro_gen2.xml				\
+	pro_pigment.xml				\
+	pro_ultrachrome.xml			\
+	pro_ultrachrome_k3.xml			\
+	standard.xml				\
+	standard_gen0.xml			\
+	ultrachrome.xml				\
+	wf40.xml				\
+	wf500.xml				\
+	x80.xml
+
+xml-stamp: $(pkgxmldata_DATA) Makefile.am
+	-rm -f xml-stamp
+	touch xml-stamp
+	for f in $(pkgxmldata_DATA) ; do echo $$f >> xml-stamp; done
+
+all-local: xml-stamp
+
+CLEANFILES = xmli18n-tmp.h xml-stamp
+
+EXTRA_DIST = $(pkgxmldata_DATA)
diff --git a/src/xml/escp2/inks/Makefile.in b/src/xml/escp2/inks/Makefile.in
new file mode 100644
index 0000000..768e57d
--- /dev/null
+++ b/src/xml/escp2/inks/Makefile.in
@@ -0,0 +1,530 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# Variables
+
+#export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
+#export STP_DATA_PATH = $(top_srcdir)/src/xml
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(top_srcdir)/scripts/global.mk
+subdir = src/xml/escp2/inks
+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
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(pkgxmldatadir)"
+pkgxmldataDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(pkgxmldata_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_CUPS_PPDS = @BUILD_CUPS_PPDS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CONVERT = @CONVERT@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+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@
+DB2PS = @DB2PS@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DIALOG = @DIALOG@
+DOXYGEN = @DOXYGEN@
+DSYMUTIL = @DSYMUTIL@
+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@
+FIND = @FIND@
+FOOMATIC_CONFIGURE = @FOOMATIC_CONFIGURE@
+FOOMATIC_KITLOAD = @FOOMATIC_KITLOAD@
+FOOMATIC_PPDFILE = @FOOMATIC_PPDFILE@
+GENPPD_LIBS = @GENPPD_LIBS@
+GIMP2_CFLAGS = @GIMP2_CFLAGS@
+GIMP2_LIBS = @GIMP2_LIBS@
+GIMPTOOL2_CHECK = @GIMPTOOL2_CHECK@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GNUCFLAGS = @GNUCFLAGS@
+GREP = @GREP@
+GTK2_CFLAGS = @GTK2_CFLAGS@
+GTK2_LIBS = @GTK2_LIBS@
+GUTENPRINTUI2_BINARY_AGE = @GUTENPRINTUI2_BINARY_AGE@
+GUTENPRINTUI2_CFLAGS = @GUTENPRINTUI2_CFLAGS@
+GUTENPRINTUI2_CURRENT_INTERFACE = @GUTENPRINTUI2_CURRENT_INTERFACE@
+GUTENPRINTUI2_INTERFACE_AGE = @GUTENPRINTUI2_INTERFACE_AGE@
+GUTENPRINTUI2_LIBDEPS = @GUTENPRINTUI2_LIBDEPS@
+GUTENPRINTUI2_LIBS = $(top_builddir)/src/gutenprintui2/libgutenprintui2.la
+GUTENPRINTUI2_VERSION = @GUTENPRINTUI2_VERSION@
+GUTENPRINT_BINARY_AGE = @GUTENPRINT_BINARY_AGE@
+GUTENPRINT_CFLAGS = @GUTENPRINT_CFLAGS@
+GUTENPRINT_CURRENT_INTERFACE = @GUTENPRINT_CURRENT_INTERFACE@
+GUTENPRINT_INTERFACE_AGE = @GUTENPRINT_INTERFACE_AGE@
+GUTENPRINT_LIBDEPS = @GUTENPRINT_LIBDEPS@
+
+# Libraries
+GUTENPRINT_LIBS = $(top_builddir)/src/main/libgutenprint.la
+GUTENPRINT_MAJOR_VERSION = @GUTENPRINT_MAJOR_VERSION@
+GUTENPRINT_MICRO_VERSION = @GUTENPRINT_MICRO_VERSION@
+GUTENPRINT_MINOR_VERSION = @GUTENPRINT_MINOR_VERSION@
+GUTENPRINT_VERSION = @GUTENPRINT_VERSION@
+IJS_CFLAGS = @IJS_CFLAGS@
+IJS_CONFIG = @IJS_CONFIG@
+IJS_LIBS = @IJS_LIBS@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBREADLINE_DEPS = @LIBREADLINE_DEPS@
+LIBS = $(INTLLIBS) @LIBS@
+LIBTOOL = @LIBTOOL@
+LIBTOOL_DEPS = @LIBTOOL_DEPS@
+LN_S = @LN_S@
+LTALLOCA = @LTALLOCA@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PKG_CONFIG = @PKG_CONFIG@
+PLUG_IN_PATH = @PLUG_IN_PATH@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+RELEASE_DATE = @RELEASE_DATE@
+RM = @RM@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TEST = @TEST@
+TEXI2HTML = @TEXI2HTML@
+TRUE = @TRUE@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WHICH_PPDS = @WHICH_PPDS@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+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@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+cups_bindir = @cups_bindir@
+cups_conf_datadir = @cups_conf_datadir@
+cups_conf_serverbin = @cups_conf_serverbin@
+cups_conf_serverroot = @cups_conf_serverroot@
+cups_exec_prefix = @cups_exec_prefix@
+cups_prefix = @cups_prefix@
+cups_sbindir = @cups_sbindir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+gimp2_plug_indir = @gimp2_plug_indir@
+gutenprint_cflags = @gutenprint_cflags@
+gutenprint_libdeps = @gutenprint_libdeps@
+gutenprint_libs = @gutenprint_libs@
+gutenprintui2_cflags = @gutenprintui2_cflags@
+gutenprintui2_libdeps = @gutenprintui2_libdeps@
+gutenprintui2_libs = @gutenprintui2_libs@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+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/inks
+pkgxmldata_DATA = \
+	b500.xml				\
+	c120.xml				\
+	c64.xml					\
+	c80.xml					\
+	c82.xml					\
+	claria.xml				\
+	cmy.xml					\
+	cmykrb.xml				\
+	cmykro.xml				\
+	cx3650.xml				\
+	defaultblack.xml			\
+	f360.xml				\
+	f360_photo.xml				\
+	f360_photo7_japan.xml			\
+	f360_ultrachrome.xml			\
+	f360_ultrachrome_k3.xml			\
+	nx100.xml				\
+	photo_gen0.xml				\
+	photo_gen1.xml				\
+	photo_gen2.xml				\
+	photo_gen3.xml				\
+	photo_gen3_4.xml			\
+	photo_gen4.xml				\
+	photo_pigment.xml			\
+	picturemate_4.xml			\
+	picturemate_6.xml			\
+	pro_gen1.xml				\
+	pro_gen2.xml				\
+	pro_pigment.xml				\
+	pro_ultrachrome.xml			\
+	pro_ultrachrome_k3.xml			\
+	standard.xml				\
+	standard_gen0.xml			\
+	ultrachrome.xml				\
+	wf40.xml				\
+	wf500.xml				\
+	x80.xml
+
+CLEANFILES = xmli18n-tmp.h xml-stamp
+EXTRA_DIST = $(pkgxmldata_DATA)
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/scripts/global.mk $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/xml/escp2/inks/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  src/xml/escp2/inks/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-pkgxmldataDATA: $(pkgxmldata_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(pkgxmldatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgxmldatadir)"
+	@list='$(pkgxmldata_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(pkgxmldataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgxmldatadir)/$$f'"; \
+	  $(pkgxmldataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgxmldatadir)/$$f"; \
+	done
+
+uninstall-pkgxmldataDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(pkgxmldata_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(pkgxmldatadir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(pkgxmldatadir)/$$f"; \
+	done
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA) all-local
+installdirs:
+	for dir in "$(DESTDIR)$(pkgxmldatadir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-pkgxmldataDATA
+
+install-dvi: install-dvi-am
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-info: install-info-am
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+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 \
+	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 \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am uninstall uninstall-am uninstall-pkgxmldataDATA
+
+
+@SET_MAKE@
+
+# Rules
+
+$(top_builddir)/src/main/libgutenprint.la:
+	cd $(top_builddir)/src/main; \
+	$(MAKE)
+
+$(top_builddir)/src/gutenprintui/libgutenprintui.la:
+	cd $(top_builddir)/src/gutenprintui; \
+	$(MAKE)
+
+$(top_builddir)/src/gutenprintui2/libgutenprintui2.la:
+	cd $(top_builddir)/src/gutenprintui2; \
+	$(MAKE)
+
+xml-stamp: $(pkgxmldata_DATA) Makefile.am
+	-rm -f xml-stamp
+	touch xml-stamp
+	for f in $(pkgxmldata_DATA) ; do echo $$f >> xml-stamp; done
+
+all-local: 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/b500.xml b/src/xml/escp2/inks/b500.xml
new file mode 100644
index 0000000..661b168
--- /dev/null
+++ b/src/xml/escp2/inks/b500.xml
@@ -0,0 +1,154 @@
+<?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="b500">
+<InkList translate="text" name="None" text="EPSON Standard Inks">
+ <Shades>
+  <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="CMYK" text="Four Color Standard" InkID="CMYK">
+  <Channels>
+   <channel name="b500_black" index="0">
+    <subchannel color="0" subchannel="4">
+     <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">
+     <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">
+     <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">
+     <ChannelDensityParam name="YellowDensity"/>
+     <SplitChannels count="2">4 68</SplitChannels>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="RGB" text="Three Color Composite" InkID="CMYK">
+  <Channels>
+   <channel name="b500_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="4">
+     <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">
+     <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">
+     <ChannelDensityParam name="YellowDensity"/>
+     <SplitChannels count="2">4 68</SplitChannels>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="b500_black" index="0">
+    <subchannel color="0" subchannel="4">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SplitChannels count="2">0 64</SplitChannels>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="b500_cyan" index="0">
+    <subchannel color="2" subchannel="4">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SplitChannels count="2">2 66</SplitChannels>
+    </subchannel>
+   </channel>
+   <channel name="b500_magenta" index="1">
+    <subchannel color="1" subchannel="4">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SplitChannels count="2">1 65</SplitChannels>
+    </subchannel>
+   </channel>
+   <channel name="b500_yellow" index="2">
+    <subchannel color="4" subchannel="4">
+     <ChannelDensityParam name="YellowDensity"/>
+     <SplitChannels count="2">4 68</SplitChannels>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="b500_black" index="0">
+    <subchannel color="0" subchannel="4">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SplitChannels count="2">0 64</SplitChannels>
+    </subchannel>
+   </channel>
+   <channel name="b500_cyan" index="1">
+    <subchannel color="2" subchannel="4">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SplitChannels count="2">2 66</SplitChannels>
+    </subchannel>
+   </channel>
+   <channel name="b500_magenta" index="2">
+    <subchannel color="1" subchannel="4">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SplitChannels count="2">1 65</SplitChannels>
+    </subchannel>
+   </channel>
+   <channel name="b500_yellow" index="3">
+    <subchannel color="4" subchannel="4">
+     <ChannelDensityParam name="YellowDensity"/>
+     <SplitChannels count="2">4 68</SplitChannels>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+</escp2:InkGroup>
+</gutenprint>
diff --git a/src/xml/escp2/inks/c120.xml b/src/xml/escp2/inks/c120.xml
new file mode 100644
index 0000000..ca26273
--- /dev/null
+++ b/src/xml/escp2/inks/c120.xml
@@ -0,0 +1,142 @@
+<?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="c120">
+<InkList translate="text" name="None" text="EPSON Standard Inks">
+ <Shades>
+  <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="CMYK" text="Four Color Standard" InkID="CMYK">
+  <Channels>
+   <channel name="c120_black" index="0">
+    <subchannel color="0" subchannel="4">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SplitChannels count="2">0 64</SplitChannels>
+    </subchannel>
+   </channel>
+   <channel name="c120_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c120_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" headOffset="120">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c120_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" headOffset="240">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="RGB" text="Three Color Composite" InkID="CMYK">
+  <Channels>
+   <channel name="c120_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c120_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" headOffset="120">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c120_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" headOffset="240">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="c120_black" index="0">
+    <subchannel color="0" subchannel="4">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SplitChannels count="2">0 64</SplitChannels>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="c120_cyan" index="0">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c120_magenta" index="1">
+    <subchannel color="1" headOffset="120">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c120_yellow" index="2">
+    <subchannel color="4" headOffset="240">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="c120_black" index="0">
+    <subchannel color="0" subchannel="4">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SplitChannels count="2">0 64</SplitChannels>
+    </subchannel>
+   </channel>
+   <channel name="c120_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c120_magenta" index="2">
+    <subchannel color="1" headOffset="120">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c120_yellow" index="3">
+    <subchannel color="4" headOffset="240">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+</escp2:InkGroup>
+</gutenprint>
diff --git a/src/xml/escp2/inks/c64.xml b/src/xml/escp2/inks/c64.xml
new file mode 100644
index 0000000..ee18fad
--- /dev/null
+++ b/src/xml/escp2/inks/c64.xml
@@ -0,0 +1,173 @@
+<?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="c64">
+<InkList translate="text" name="None" text="EPSON Standard Inks">
+ <Shades>
+  <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="CMYK" text="Four Color Standard" InkID="CMYK">
+  <Channels>
+   <channel name="c64_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c64_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c64_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" headOffset="90">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c64_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" headOffset="180">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="RGB" text="Three Color Composite" InkID="CMYK">
+  <Channels>
+   <channel name="c64_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c64_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" headOffset="90">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c64_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" headOffset="180">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="c64_cyan" index="0">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c64_magenta" index="1">
+    <subchannel color="1" headOffset="90">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c64_yellow" index="2">
+    <subchannel color="4" headOffset="180">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="c64_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c64_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c64_magenta" index="2">
+    <subchannel color="1" headOffset="90">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c64_yellow" index="3">
+    <subchannel color="4" headOffset="180">
+     <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>
+ </Shades>
+
+ <InkName translate="text" name="Quadtone" text="Quadtone" InkID="Quadtone">
+  <Channels>
+   <channel name="c64_quadtone" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+    </subchannel>
+    <subchannel color="2">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="Gray3Trans"/>
+     <SubchannelValueParam name="Gray3Value"/>
+     <SubchannelScaleParam name="Gray3Scale"/>
+    </subchannel>
+    <subchannel color="1" headOffset="90">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="Gray2Trans"/>
+     <SubchannelValueParam name="Gray2Value"/>
+     <SubchannelScaleParam name="Gray2Scale"/>
+    </subchannel>
+    <subchannel color="4" headOffset="180">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="Gray1Trans"/>
+     <SubchannelValueParam name="Gray1Value"/>
+     <SubchannelScaleParam name="Gray1Scale"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+</escp2:InkGroup>
+</gutenprint>
diff --git a/src/xml/escp2/inks/c80.xml b/src/xml/escp2/inks/c80.xml
new file mode 100644
index 0000000..1012631
--- /dev/null
+++ b/src/xml/escp2/inks/c80.xml
@@ -0,0 +1,174 @@
+<?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="c80">
+<InkList translate="text" name="None" text="EPSON Standard Inks">
+ <Shades>
+  <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="CMYK" text="Four Color Standard" InkID="CMYK">
+  <Channels>
+   <channel name="c80_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c80_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c80_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" headOffset="120">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c80_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" headOffset="240">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="RGB" text="Three Color Composite" InkID="CMYK">
+  <Channels>
+   <channel name="c80_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c80_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" headOffset="120">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c80_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" headOffset="240">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="c80_cyan" index="0">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c80_magenta" index="1">
+    <subchannel color="1" headOffset="120">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c80_yellow" index="2">
+    <subchannel color="4" headOffset="240">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="c80_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c80_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c80_magenta" index="2">
+    <subchannel color="1" headOffset="120">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c80_yellow" index="3">
+    <subchannel color="4" headOffset="240">
+     <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>
+ </Shades>
+
+ <InkName translate="text" name="Quadtone" text="Quadtone" InkID="Quadtone">
+  <Channels>
+   <channel name="c80_quadtone" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+    </subchannel>
+    <subchannel color="2">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="Gray3Value"/>
+     <SubchannelScaleParam name="Gray3Scale"/>
+    </subchannel>
+    <subchannel color="1" headOffset="120">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="Gray2Value"/>
+     <SubchannelScaleParam name="Gray2Scale"/>
+    </subchannel>
+    <subchannel color="4" headOffset="240">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="Gray1Value"/>
+     <SubchannelScaleParam name="Gray1Scale"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+</escp2:InkGroup>
+</gutenprint>
diff --git a/src/xml/escp2/inks/c82.xml b/src/xml/escp2/inks/c82.xml
new file mode 100644
index 0000000..732a6c3
--- /dev/null
+++ b/src/xml/escp2/inks/c82.xml
@@ -0,0 +1,174 @@
+<?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="c82">
+<InkList translate="text" name="None" text="EPSON Standard Inks">
+ <Shades>
+  <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="CMYK" text="Four Color Standard" InkID="CMYK">
+  <Channels>
+   <channel name="c80_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c80_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c80_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" headOffset="120">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c80_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" headOffset="240">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="RGB" text="Three Color Composite" InkID="CMYK">
+  <Channels>
+   <channel name="c80_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c80_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" headOffset="120">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c80_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" headOffset="240">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="c80_cyan" index="0">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c80_magenta" index="1">
+    <subchannel color="1" headOffset="120">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c80_yellow" index="2">
+    <subchannel color="4" headOffset="240">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="c80_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c80_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c80_magenta" index="2">
+    <subchannel color="1" headOffset="120">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c80_yellow" index="3">
+    <subchannel color="4" headOffset="240">
+     <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>
+ </Shades>
+
+ <InkName translate="text" name="Quadtone" text="Quadtone" InkID="Quadtone">
+  <Channels>
+   <channel name="c80_quadtone" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+    </subchannel>
+    <subchannel color="2">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="Gray3Value"/>
+     <SubchannelScaleParam name="Gray3Scale"/>
+    </subchannel>
+    <subchannel color="1" headOffset="120">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="Gray2Value"/>
+     <SubchannelScaleParam name="Gray2Scale"/>
+    </subchannel>
+    <subchannel color="4" headOffset="240">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="Gray1Value"/>
+     <SubchannelScaleParam name="Gray1Scale"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+</escp2:InkGroup>
+</gutenprint>
diff --git a/src/xml/escp2/inks/claria.xml b/src/xml/escp2/inks/claria.xml
new file mode 100644
index 0000000..30c0abb
--- /dev/null
+++ b/src/xml/escp2/inks/claria.xml
@@ -0,0 +1,285 @@
+<?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="claria">
+<InkList translate="text" name="None" text="EPSON Standard Inks">
+ <Shades>
+  <shade count="1">1.000000</shade>
+  <shade count="2">1.000000 0.350000</shade>
+  <shade count="2">1.000000 0.330000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+ </Shades>
+
+ <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK">
+  <Channels>
+   <channel name="claria_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="claria_photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1" headOffset="2">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="claria_photo_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0" headOffset="2">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="claria_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="0" headOffset="2">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhotoCMY" text="Five Color Photo Composite" InkID="CcMmYK">
+  <Channels>
+   <channel name="claria_photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1" headOffset="2">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="claria_photo_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0" headOffset="2">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="claria_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>e
+    <subchannel color="4" subchannel="0" headOffset="2">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
+  <Channels>
+   <channel name="claria_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="claria_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="claria_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0" headOffset="2">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="claria_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="0" headOffset="2">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="RGB" text="Three Color Composite" InkID="CMYK">
+  <Channels>
+   <channel name="claria_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="claria_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0" headOffset="2">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="claria_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="0" headOffset="2">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="claria_cyan" index="0">
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="claria_magenta" index="1">
+    <subchannel color="1" subchannel="0" headOffset="2">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="claria_yellow" index="2">
+    <subchannel color="4" subchannel="0" headOffset="2">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="claria_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="claria_cyan" index="1">
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="claria_magenta" index="2">
+    <subchannel color="1" subchannel="0" headOffset="2">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="claria_yellow" index="3">
+    <subchannel color="4" subchannel="0" headOffset="2">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmY" text="Five Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="claria_cyan" index="0">
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_claria_cyan" index="1">
+    <subchannel color="2" subchannel="1" headOffset="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="claria_magenta" index="2">
+    <subchannel color="1" subchannel="0" headOffset="2">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_claria_magenta" index="3">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="claria_yellow" index="4">
+    <subchannel color="4" subchannel="0" headOffset="2">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmYK" text="Six Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="claria_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="claria_cyan" index="1">
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_claria_cyan" index="2">
+    <subchannel color="2" subchannel="1" headOffset="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="claria_magenta" index="3">
+    <subchannel color="1" subchannel="0" headOffset="2">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_claria_magenta" index="4">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="claria_yellow" index="5">
+    <subchannel color="4" subchannel="0" headOffset="2">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+</escp2:InkGroup>
+</gutenprint>
diff --git a/src/xml/escp2/inks/cmy.xml b/src/xml/escp2/inks/cmy.xml
new file mode 100644
index 0000000..8637a69
--- /dev/null
+++ b/src/xml/escp2/inks/cmy.xml
@@ -0,0 +1,56 @@
+<?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="cmy">
+<InkList translate="text" name="None" text="EPSON Standard Inks">
+ <Shades>
+  <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="RGB" text="Three Color Composite" InkID="CMYK">
+  <Channels>
+   <channel name="standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+</escp2:InkGroup>
+</gutenprint>
diff --git a/src/xml/escp2/inks/cmykrb.xml b/src/xml/escp2/inks/cmykrb.xml
new file mode 100644
index 0000000..4355a52
--- /dev/null
+++ b/src/xml/escp2/inks/cmykrb.xml
@@ -0,0 +1,664 @@
+<?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="cmykrb">
+<Curves>
+ <curve name="cmykrbCyan" wrap="wrap" type="linear" gamma="0" piecewise="false">
+  <sequence count="48" lower-bound="0" upper-bound="4">
+	1	1	1	1	1	1	1	1
+	1	0.875	0.7	0.55	0.4	0.3	0.2	0.1
+	0	0	0	0	0	0	0	0
+	0	0	0	0	0	0	0	0
+	0	0.125	0.25	0.375	0.5	0.625	0.75	0.875
+	1	1	1	1	1	1	1	1
+  </sequence>
+ </curve>
+ <curve name="cmykrbMagenta" wrap="wrap" type="linear" gamma="0" piecewise="false">
+  <sequence count="48" lower-bound="0" upper-bound="4">
+	0	0	0	0	0	0	0	0
+	0	0	0	0.002	0.05	0.3	0.6	0.8
+	1	1	0.85	0.7	0.6	0.5	0.4	0.3
+	0.2	0.1	0.05	0	0	0	0	0
+	0	0	0	0	0	0	0	0
+	0	0	0	0	0	0	0	0
+  </sequence>
+ </curve>
+ <curve name="cmykrbYellow" wrap="wrap" type="linear" gamma="0" piecewise="false">
+  <sequence count="48" lower-bound="0" upper-bound="4">
+	0	0	0	0	0	0	0	0
+	0	0	0	0	0	0	0	0
+	0	0	0	0	0	0	0.05	0.15
+	0.25	0.35	0.45	0.55	0.65	0.75	0.85	0.95
+	1	1	1	1	1	1	1	1
+	1	0.875	0.75	0.625	0.5	0.375	0.25	0.125
+  </sequence>
+ </curve>
+ <curve name="cmykrbRed" wrap="wrap" type="linear" gamma="0" piecewise="false">
+  <sequence count="48" lower-bound="0" upper-bound="4">
+	0	0	0	0	0	0	0	0
+	0	0	0	0	0	0	0	0
+	0.025	0.4	0.6	0.75	0.89	1	1	1
+	1	0.875	0.75	0.625	0.5	0.375	0.25	0.125
+	0	0	0	0	0	0	0	0
+	0	0	0	0	0	0	0	0
+  </sequence>
+ </curve>
+ <curve name="cmykrbBlue" wrap="wrap" type="linear" gamma="0" piecewise="false">
+  <sequence count="48" lower-bound="0" upper-bound="4">
+	0	0.25	0.475	0.7	0.81	0.875	0.94	1
+	1	0.975	0.93	0.875	0.81	0.74	0.65	0.4
+	0.04	0.002	0	0	0	0	0	0
+	0	0	0	0	0	0	0	0
+	0	0	0	0	0	0	0	0
+	0	0	0	0	0	0	0	0
+  </sequence>
+ </curve>
+</Curves>
+
+<InkList translate="text" name="cmykrbphoto" text="Photo Black">
+ <Shades>
+  <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>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+ </Shades>
+
+ <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">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r800_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <HueCurve ref="cmykrbCyan"/>
+    <subchannel color="2" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r800_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <HueCurve ref="cmykrbMagenta"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r800_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <HueCurve ref="cmykrbYellow"/>
+    <subchannel color="4" headOffset="1">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r800_red" index="4">
+    <HueCurveParam name="RedHueCurve"/>
+    <HueCurve ref="cmykrbRed"/>
+    <subchannel color="7">
+     <ChannelDensityParam name="RedDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r800_blue" index="5">
+    <HueCurveParam name="BlueHueCurve"/>
+    <HueCurve ref="cmykrbBlue"/>
+    <subchannel color="8" headOffset="1">
+     <ChannelDensityParam name="BlueDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+  <AuxChannels>
+   <channel name="standard_gloss" index="0">
+    <subchannel color="9">
+     <ChannelDensityParam name="GlossDensity"/>
+    </subchannel>
+   </channel>
+  </AuxChannels>
+ </InkName>
+
+ <InkName translate="text" name="CMYRBG" text="Five Color Photo Composite" InkID="OTHER">
+  <Channels>
+   <channel name="r800_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <HueCurve ref="cmykrbCyan"/>
+    <subchannel color="2" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r800_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <HueCurve ref="cmykrbMagenta"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r800_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <HueCurve ref="cmykrbYellow"/>
+    <subchannel color="4" headOffset="1">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r800_red" index="4">
+    <HueCurveParam name="RedHueCurve"/>
+    <HueCurve ref="cmykrbRed"/>
+    <subchannel color="7">
+     <ChannelDensityParam name="RedDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r800_blue" index="5">
+    <HueCurveParam name="BlueHueCurve"/>
+    <HueCurve ref="cmykrbBlue"/>
+    <subchannel color="8" headOffset="1">
+     <ChannelDensityParam name="BlueDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+  <AuxChannels>
+   <channel name="standard_gloss" index="0">
+    <subchannel color="9">
+     <ChannelDensityParam name="GlossDensity"/>
+    </subchannel>
+   </channel>
+  </AuxChannels>
+ </InkName>
+
+ <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">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_cyan" index="1">
+    <subchannel color="2" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_yellow" index="3">
+    <subchannel color="4" headOffset="1">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+  <AuxChannels>
+   <channel name="standard_gloss" index="0">
+    <subchannel color="9">
+     <ChannelDensityParam name="GlossDensity"/>
+    </subchannel>
+   </channel>
+  </AuxChannels>
+ </InkName>
+
+ <InkName translate="text" name="RGBG" text="Three Color Composite" InkID="CMYK">
+  <Channels>
+   <channel name="f360_standard_cyan" index="1">
+    <subchannel color="2" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_yellow" index="3">
+    <subchannel color="4" headOffset="1">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+  <AuxChannels>
+   <channel name="standard_gloss" index="0">
+    <subchannel color="9">
+     <ChannelDensityParam name="GlossDensity"/>
+    </subchannel>
+   </channel>
+  </AuxChannels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <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">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_gloss" index="1">
+    <subchannel color="9">
+     <ChannelDensityParam name="GlossDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="f360_standard_cyan" index="0">
+    <subchannel color="2" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="1">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_yellow" index="2">
+    <subchannel color="4" headOffset="1">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <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">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="1">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_yellow" index="2">
+    <subchannel color="4" headOffset="1">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_gloss" index="3">
+    <subchannel color="9">
+     <ChannelDensityParam name="GlossDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <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">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_cyan" index="1">
+    <subchannel color="2" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_yellow" index="3">
+    <subchannel color="4" headOffset="1">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_gloss" index="4">
+    <subchannel color="9">
+     <ChannelDensityParam name="GlossDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <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">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_cyan" index="1">
+    <subchannel color="2" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r800_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r800_yellow" index="3">
+    <subchannel color="4" headOffset="1">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r800_red" index="4">
+    <subchannel color="7">
+     <ChannelDensityParam name="RedDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r800_blue" index="5">
+    <subchannel color="8" headOffset="1">
+     <ChannelDensityParam name="BlueDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_gloss" index="6">
+    <subchannel color="9">
+     <ChannelDensityParam name="GlossDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYKPRB" text="Seven Color Enhanced Gloss Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_black" index="1">
+    <subchannel color="0" subchannel="4" headOffset="1">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r800_cyan" index="2">
+    <subchannel color="2" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r800_magenta" index="3">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r800_yellow" index="4">
+    <subchannel color="4" headOffset="1">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r800_red" index="5">
+    <subchannel color="7">
+     <ChannelDensityParam name="RedDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r800_blue" index="6">
+    <subchannel color="8" headOffset="1">
+     <ChannelDensityParam name="BlueDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_gloss" index="7">
+    <subchannel color="9">
+     <ChannelDensityParam name="GlossDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+
+<InkList translate="text" name="cmykrbmatte" text="Matte Black">
+ <Shades>
+  <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>
+  <shade count="1">1.000000</shade>
+ </Shades>
+
+ <InkName translate="text" name="CMYKRB" text="Six Color Photo" InkID="OTHER">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r800_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <HueCurve ref="cmykrbCyan"/>
+    <subchannel color="2" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r800_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <HueCurve ref="cmykrbMagenta"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r800_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <HueCurve ref="cmykrbYellow"/>
+    <subchannel color="4" headOffset="1">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r800_red" index="4">
+    <HueCurveParam name="RedHueCurve"/>
+    <HueCurve ref="cmykrbRed"/>
+    <subchannel color="7">
+     <ChannelDensityParam name="RedDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r800_blue" index="5">
+    <HueCurveParam name="BlueHueCurve"/>
+    <HueCurve ref="cmykrbBlue"/>
+    <subchannel color="8" headOffset="1">
+     <ChannelDensityParam name="BlueDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="CMYRB" text="Five Color Photo Composite" InkID="OTHER">
+  <Channels>
+   <channel name="r800_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <HueCurve ref="cmykrbCyan"/>
+    <subchannel color="2" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r800_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <HueCurve ref="cmykrbMagenta"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r800_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <HueCurve ref="cmykrbYellow"/>
+    <subchannel color="4" headOffset="1">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r800_red" index="4">
+    <HueCurveParam name="RedHueCurve"/>
+    <HueCurve ref="cmykrbRed"/>
+    <subchannel color="7">
+     <ChannelDensityParam name="RedDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r800_blue" index="5">
+    <HueCurveParam name="BlueHueCurve"/>
+    <HueCurve ref="cmykrbBlue"/>
+    <subchannel color="8" headOffset="1">
+     <ChannelDensityParam name="BlueDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="CMYKG" text="Four Color Standard" InkID="CMYK">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_cyan" index="1">
+    <subchannel color="2" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_yellow" index="3">
+    <subchannel color="4" headOffset="1">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="RGBG" text="Three Color Composite" InkID="CMYK">
+  <Channels>
+   <channel name="f360_standard_cyan" index="1">
+    <subchannel color="2" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_yellow" index="3">
+    <subchannel color="4" headOffset="1">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="f360_standard_cyan" index="0">
+    <subchannel color="2" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="1">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_yellow" index="2">
+    <subchannel color="4" headOffset="1">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYKGloss" text="Four Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_cyan" index="1">
+    <subchannel color="2" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_yellow" index="3">
+    <subchannel color="4" headOffset="1">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYKRB" text="Six Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r800_cyan" index="1">
+    <subchannel color="2" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r800_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r800_yellow" index="3">
+    <subchannel color="4" headOffset="1">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r800_red" index="4">
+    <subchannel color="7">
+     <ChannelDensityParam name="RedDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r800_blue" index="5">
+    <subchannel color="8" headOffset="1">
+     <ChannelDensityParam name="BlueDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+</escp2:InkGroup>
+</gutenprint>
diff --git a/src/xml/escp2/inks/cmykro.xml b/src/xml/escp2/inks/cmykro.xml
new file mode 100644
index 0000000..3a68f1b
--- /dev/null
+++ b/src/xml/escp2/inks/cmykro.xml
@@ -0,0 +1,663 @@
+<?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="cmykro">
+<Curves>
+ <curve name="cmykroCyan" wrap="wrap" type="linear" gamma="0" piecewise="false">
+  <sequence count="48" lower-bound="0" upper-bound="4">
+	1	1	1	1	1	1	1	1
+	1	0.95	0.89	0.83	0.75	0.6	0.4	0.2
+	0	0	0	0	0	0	0	0
+	0	0	0	0	0	0	0	0
+	0	0.2	0.4	0.6	0.75	0.83	0.89	0.95
+	1	1	1	1	1	1	1	1
+  </sequence>
+ </curve>
+ <curve name="cmykroMagenta" wrap="wrap" type="linear" gamma="0" piecewise="false">
+  <sequence count="48" lower-bound="0" upper-bound="4">
+	0	0.2	0.4	0.6	0.75	0.83	0.89	0.95
+	1	1	1	1	1	1	1	1
+	1	1	0.85	0.7	0.6	0.5	0.4	0.3
+	0.2	0.1	0.05	0	0	0	0	0
+	0	0	0	0	0	0	0	0
+	0	0	0	0	0	0	0	0
+  </sequence>
+ </curve>
+ <curve name="cmykroYellow" wrap="wrap" type="linear" gamma="0" piecewise="false">
+  <sequence count="48" lower-bound="0" upper-bound="4">
+	0	0	0	0	0	0	0	0
+	0	0	0	0	0	0	0	0
+	0	0	0	0	0	0	0	0
+	0	0.05	0.1	0.15	0.3	0.45	0.6	0.8
+	1	1	1	1	1	1	1	1
+	1	0.95	0.89	0.83	0.75	0.6	0.4	0.2
+  </sequence>
+ </curve>
+ <curve name="cmykroRed" wrap="wrap" type="linear" gamma="0" piecewise="false">
+  <sequence count="48" lower-bound="0" upper-bound="4">
+	0	0	0	0	0	0	0	0
+	0	0	0	0	0	0	0	0
+	0	0.2	0.4	0.6	0.8	1	1	1
+	1	0.875	0.75	0.625	0.5	0.375	0.23	0.1
+	0	0	0	0	0	0	0	0
+	0	0	0	0	0	0	0	0
+  </sequence>
+ </curve>
+ <curve name="cmykroOrange" wrap="wrap" type="linear" gamma="0" piecewise="false">
+  <sequence count="48" lower-bound="0" upper-bound="4">
+	0	0	0	0	0	0	0	0
+	0	0	0	0	0	0	0	0
+	0	0	0	0	0	0	0	0
+	0	0.25	0.4	0.5	0.5	0.5	0.4	0.15
+	0	0	0	0	0	0	0	0
+	0	0	0	0	0	0	0	0
+  </sequence>
+ </curve>
+</Curves>
+<InkList translate="text" name="cmykrophoto" text="Photo Black">
+ <Shades>
+  <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>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+ </Shades>
+
+ <InkName translate="text" name="CMYKROG" text="Six Color Photo" InkID="OTHER">
+  <Channels>
+   <channel name="f360_photo_black" index="0">
+    <subchannel color="0" subchannel="4">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r1900_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <HueCurve ref="cmykroCyan"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r1900_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <HueCurve ref="cmykroMagenta"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r1900_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <HueCurve ref="cmykroYellow"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r1900_red" index="4">
+    <HueCurveParam name="RedHueCurve"/>
+    <HueCurve ref="cmykroRed"/>
+    <subchannel color="7">
+     <ChannelDensityParam name="RedDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r1900_orange" index="5">
+    <HueCurveParam name="OrangeHueCurve"/>
+    <HueCurve ref="cmykroOrange"/>
+    <subchannel color="10">
+     <ChannelDensityParam name="OrangeDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+  <AuxChannels>
+   <channel name="standard_gloss" index="0">
+    <subchannel color="9">
+     <ChannelDensityParam name="GlossDensity"/>
+    </subchannel>
+   </channel>
+  </AuxChannels>
+ </InkName>
+
+ <InkName translate="text" name="CMYROG" text="Five Color Photo Composite" InkID="OTHER">
+  <Channels>
+   <channel name="r1900_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <HueCurve ref="cmykroCyan"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r1900_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <HueCurve ref="cmykroMagenta"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r1900_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <HueCurve ref="cmykroYellow"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r1900_red" index="4">
+    <HueCurveParam name="RedHueCurve"/>
+    <HueCurve ref="cmykroRed"/>
+    <subchannel color="7">
+     <ChannelDensityParam name="RedDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r1900_orange" index="5">
+    <HueCurveParam name="OrangeHueCurve"/>
+    <HueCurve ref="cmykroOrange"/>
+    <subchannel color="10">
+     <ChannelDensityParam name="OrangeDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+  <AuxChannels>
+   <channel name="standard_gloss" index="0">
+    <subchannel color="9">
+     <ChannelDensityParam name="GlossDensity"/>
+    </subchannel>
+   </channel>
+  </AuxChannels>
+ </InkName>
+
+ <InkName translate="text" name="CMYKG" text="Four Color Standard" InkID="CMYK">
+  <Channels>
+   <channel name="f360_photo_black" index="0">
+    <subchannel color="0" subchannel="4">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+  <AuxChannels>
+   <channel name="standard_gloss" index="0">
+    <subchannel color="9">
+     <ChannelDensityParam name="GlossDensity"/>
+    </subchannel>
+   </channel>
+  </AuxChannels>
+ </InkName>
+
+ <InkName translate="text" name="RGBG" text="Three Color Composite" InkID="CMYK">
+  <Channels>
+   <channel name="f360_standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+  <AuxChannels>
+   <channel name="standard_gloss" index="0">
+    <subchannel color="9">
+     <ChannelDensityParam name="GlossDensity"/>
+    </subchannel>
+   </channel>
+  </AuxChannels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <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">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_gloss" index="1">
+    <subchannel color="9">
+     <ChannelDensityParam name="GlossDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="f360_standard_cyan" index="0">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="1">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_yellow" index="2">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYGloss" text="Three Color Raw Gloss" InkID="Extended">
+  <Channels>
+   <channel name="f360_standard_cyan" index="0">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="1">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_yellow" index="2">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_gloss" index="3">
+    <subchannel color="9">
+     <ChannelDensityParam name="GlossDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <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">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_gloss" index="4">
+    <subchannel color="9">
+     <ChannelDensityParam name="GlossDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <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">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r1900_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r1900_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r1900_red" index="4">
+    <subchannel color="7">
+     <ChannelDensityParam name="RedDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r1900_orange" index="5">
+    <subchannel color="10">
+     <ChannelDensityParam name="OrangeDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_gloss" index="6">
+    <subchannel color="9">
+     <ChannelDensityParam name="GlossDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYKPRO" text="Seven Color Enhanced Gloss Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_black" index="1">
+    <subchannel color="0" subchannel="4">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r1900_cyan" index="2">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r1900_magenta" index="3">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r1900_yellow" index="4">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r1900_red" index="5">
+    <subchannel color="7">
+     <ChannelDensityParam name="RedDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r1900_orange" index="6">
+    <subchannel color="10">
+     <ChannelDensityParam name="OrangeDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_gloss" index="7">
+    <subchannel color="9">
+     <ChannelDensityParam name="GlossDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+
+<InkList translate="text" name="cmykromatte" text="Matte Black">
+ <Shades>
+  <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>
+  <shade count="1">1.000000</shade>
+ </Shades>
+
+ <InkName translate="text" name="CMYKRO" text="Six Color Photo" InkID="OTHER">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0" headOffset="1">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r1900_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <HueCurve ref="cmykroCyan"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r1900_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <HueCurve ref="cmykroMagenta"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r1900_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <HueCurve ref="cmykroYellow"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r1900_red" index="4">
+    <HueCurveParam name="RedHueCurve"/>
+    <HueCurve ref="cmykroRed"/>
+    <subchannel color="7">
+     <ChannelDensityParam name="RedDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r1900_orange" index="5">
+    <HueCurveParam name="OrangeHueCurve"/>
+    <HueCurve ref="cmykroOrange"/>
+    <subchannel color="10">
+     <ChannelDensityParam name="OrangeDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="CMYRO" text="Five Color Photo Composite" InkID="OTHER">
+  <Channels>
+   <channel name="r1900_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <HueCurve ref="cmykroCyan"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r1900_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <HueCurve ref="cmykroMagenta"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r1900_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <HueCurve ref="cmykroYellow"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r1900_red" index="4">
+    <HueCurveParam name="RedHueCurve"/>
+    <HueCurve ref="cmykroRed"/>
+    <subchannel color="7">
+     <ChannelDensityParam name="RedDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r1900_orange" index="5">
+    <HueCurveParam name="OrangeHueCurve"/>
+    <HueCurve ref="cmykroOrange"/>
+    <subchannel color="10">
+     <ChannelDensityParam name="OrangeDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="CMYKG" text="Four Color Standard" InkID="CMYK">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0" headOffset="1">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="RGBG" text="Three Color Composite" InkID="CMYK">
+  <Channels>
+   <channel name="f360_standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0" headOffset="1">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="f360_standard_cyan" index="0">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="1">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_yellow" index="2">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYKGloss" text="Four Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0" headOffset="1">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYKRO" text="Six Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0" headOffset="1">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r1900_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r1900_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r1900_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r1900_red" index="4">
+    <subchannel color="7">
+     <ChannelDensityParam name="RedDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r1900_orange" index="5">
+    <subchannel color="10">
+     <ChannelDensityParam name="OrangeDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+</escp2:InkGroup>
+</gutenprint>
diff --git a/src/xml/escp2/inks/cx3650.xml b/src/xml/escp2/inks/cx3650.xml
new file mode 100644
index 0000000..c237561
--- /dev/null
+++ b/src/xml/escp2/inks/cx3650.xml
@@ -0,0 +1,173 @@
+<?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="cx3650">
+<InkList translate="text" name="None" text="EPSON Standard Inks">
+ <Shades>
+  <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="CMYK" text="Four Color Standard" InkID="CMYK">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="cx3650_standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" headOffset="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="RGB" text="Three Color Composite" InkID="CMYK">
+  <Channels>
+   <channel name="cx3650_standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" headOffset="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="cx3650_standard_cyan" index="0">
+    <subchannel color="2" headOffset="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_magenta" index="1">
+    <subchannel color="1" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="2">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="cx3650_standard_cyan" index="1">
+    <subchannel color="2" headOffset="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_magenta" index="2">
+    <subchannel color="1" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <subchannel color="4">
+     <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>
+ </Shades>
+
+ <InkName translate="text" name="Quadtone" text="Quadtone" InkID="Quadtone">
+  <Channels>
+   <channel name="cx3650_quadtone" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+    </subchannel>
+    <subchannel color="2" headOffset="2">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="Gray3Value"/>
+     <SubchannelScaleParam name="Gray3Scale"/>
+    </subchannel>
+    <subchannel color="1" headOffset="1">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="Gray2Value"/>
+     <SubchannelScaleParam name="Gray2Scale"/>
+    </subchannel>
+    <subchannel color="4">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="Gray1Value"/>
+     <SubchannelScaleParam name="Gray1Scale"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+</escp2:InkGroup>
+</gutenprint>
diff --git a/src/xml/escp2/inks/defaultblack.xml b/src/xml/escp2/inks/defaultblack.xml
new file mode 100644
index 0000000..3a12214
--- /dev/null
+++ b/src/xml/escp2/inks/defaultblack.xml
@@ -0,0 +1,40 @@
+<?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="defaultblack">
+<InkList translate="text" name="None" text="EPSON Standard Inks">
+ <Shades>
+  <shade count="1">1.000000</shade>
+ </Shades>
+
+ <InkName translate="text" name="CMYK" text="Default Black" InkID="CMYK">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0" shade="1.000000">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+</escp2:InkGroup>
+</gutenprint>
diff --git a/src/xml/escp2/inks/f360.xml b/src/xml/escp2/inks/f360.xml
new file mode 100644
index 0000000..0a10492
--- /dev/null
+++ b/src/xml/escp2/inks/f360.xml
@@ -0,0 +1,174 @@
+<?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">
+<InkList translate="text" name="None" text="EPSON Standard Inks">
+ <Shades>
+  <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="CMYK" text="Four Color Standard" InkID="CMYK">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="RGB" text="Three Color Composite" InkID="CMYK">
+  <Channels>
+   <channel name="f360_standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="f360_standard_cyan" index="0">
+    <subchannel color="2" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_magenta" index="1">
+    <subchannel color="1" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="2">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_cyan" index="1">
+    <subchannel color="2" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_magenta" index="2">
+    <subchannel color="1" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <subchannel color="4">
+     <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>
+ </Shades>
+
+ <InkName translate="text" name="Quadtone" text="Quadtone" InkID="Quadtone">
+  <Channels>
+   <channel name="f360_quadtone" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+    </subchannel>
+    <subchannel color="2" headOffset="1">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="Gray3Value"/>
+     <SubchannelScaleParam name="Gray3Scale"/>
+    </subchannel>
+    <subchannel color="1" headOffset="1">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="Gray2Value"/>
+     <SubchannelScaleParam name="Gray2Scale"/>
+    </subchannel>
+    <subchannel color="4">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="Gray1Value"/>
+     <SubchannelScaleParam name="Gray1Scale"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+</escp2:InkGroup>
+</gutenprint>
diff --git a/src/xml/escp2/inks/f360_photo.xml b/src/xml/escp2/inks/f360_photo.xml
new file mode 100644
index 0000000..e4e5295
--- /dev/null
+++ b/src/xml/escp2/inks/f360_photo.xml
@@ -0,0 +1,285 @@
+<?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_photo">
+<InkList translate="text" name="None" text="EPSON Standard Inks">
+ <Shades>
+  <shade count="1">1.000000</shade>
+  <shade count="2">1.000000 0.316000</shade>
+  <shade count="2">1.000000 0.340000</shade>
+  <shade count="2">1.000000 0.500000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+ </Shades>
+
+ <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <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">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhotoCMY" text="Five Color Photo Composite" InkID="CcMmYK">
+  <Channels>
+   <channel name="f360_photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <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">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="RGB" text="Three Color Composite" InkID="CMYK">
+  <Channels>
+   <channel name="standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_cyan" index="0">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="1">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="2">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_cyan" index="1">
+    <subchannel color="2" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_magenta" index="2">
+    <subchannel color="1" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmY" text="Five Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="f360_standard_cyan" index="0">
+    <subchannel color="2" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="1">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_magenta" index="2">
+    <subchannel color="1" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="3">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_yellow" index="4">
+    <subchannel color="4" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmYK" text="Six Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_cyan" index="1">
+    <subchannel color="2" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="2">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_magenta" index="3">
+    <subchannel color="1" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="4">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_yellow" index="5">
+    <subchannel color="4" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+</escp2:InkGroup>
+</gutenprint>
diff --git a/src/xml/escp2/inks/f360_photo7_japan.xml b/src/xml/escp2/inks/f360_photo7_japan.xml
new file mode 100644
index 0000000..9f821a7
--- /dev/null
+++ b/src/xml/escp2/inks/f360_photo7_japan.xml
@@ -0,0 +1,419 @@
+<?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_photo7_japan">
+<InkList translate="text" name="None" text="EPSON Standard Inks">
+ <Shades>
+  <shade count="1">1.000000</shade>
+  <shade count="2">1.000000 0.316000</shade>
+  <shade count="2">1.000000 0.340000</shade>
+  <shade count="2">1.000000 0.500000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+ </Shades>
+
+ <InkName translate="text" name="Photo7J" text="Seven Color Photo" InkID="CcMmYKk">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <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">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo2_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="2">
+     <ChannelDensityParam name="YellowDensity"/>
+     <SubchannelTransitionParam name="DarkYellowTrans"/>
+    </subchannel>
+    <subchannel color="4" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="YellowDensity"/>
+     <SubchannelTransitionParam name="DarkYellowTrans"/>
+     <SubchannelValueParam name="DarkYellowValue"/>
+     <SubchannelScaleParam name="DarkYellowScale"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhotoEnhanceJ" text="Six Color Enhanced Composite" InkID="CcMmYyK">
+  <Channels>
+   <channel name="f360_photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <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">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo2_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="2">
+     <ChannelDensityParam name="YellowDensity"/>
+     <SubchannelTransitionParam name="DarkYellowTrans"/>
+    </subchannel>
+    <subchannel color="4" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="YellowDensity"/>
+     <SubchannelTransitionParam name="DarkYellowTrans"/>
+     <SubchannelValueParam name="DarkYellowValue"/>
+     <SubchannelScaleParam name="DarkYellowScale"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <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">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhotoCMY" text="Five Color Photo Composite" InkID="CcMmYK">
+  <Channels>
+   <channel name="f360_photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <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">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="RGB" text="Three Color Composite" InkID="CMYK">
+  <Channels>
+   <channel name="standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_cyan" index="0">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="1">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="2">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmY" text="Five Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="f360_standard_cyan" index="0">
+    <subchannel color="2" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="1">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_magenta" index="2">
+    <subchannel color="1" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="3">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_yellow" index="4">
+    <subchannel color="4" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmYK" text="Six Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_cyan" index="1">
+    <subchannel color="2" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="2">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_magenta" index="3">
+    <subchannel color="1" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="4">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_yellow" index="5">
+    <subchannel color="4" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmYKk" text="Seven Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <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">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="3">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_magenta" index="4">
+    <subchannel color="1" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="5">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_yellow" index="6">
+    <subchannel color="4" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+</escp2:InkGroup>
+</gutenprint>
diff --git a/src/xml/escp2/inks/f360_ultrachrome.xml b/src/xml/escp2/inks/f360_ultrachrome.xml
new file mode 100644
index 0000000..f565001
--- /dev/null
+++ b/src/xml/escp2/inks/f360_ultrachrome.xml
@@ -0,0 +1,775 @@
+<?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">
+<InkList translate="text" name="ultraphoto" text="UltraChrome Photo Black">
+ <Shades>
+  <shade count="2">1.000000 0.480000</shade>
+  <shade count="2">1.000000 0.330000</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>
+ </Shades>
+
+ <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">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+    </subchannel>
+    <subchannel color="0" subchannel="1">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="GrayValue"/>
+     <SubchannelScaleParam name="GrayScale"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <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">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_yellow" index="3">
+     <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <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">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_yellow" index="3">
+     <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhotoCMY" text="Five Color Photo Composite" InkID="CcMmYK">
+  <Channels>
+   <channel name="f360_photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <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">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_yellow" index="3">
+     <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+     <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+     <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="RGB" text="Three Color Composite" InkID="CMYK">
+  <Channels>
+   <channel name="standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+     <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+     <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <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">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+    </subchannel>
+    <subchannel color="0" subchannel="1">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="GrayValue"/>
+     <SubchannelScaleParam name="GrayScale"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack2" text="Two Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_black" index="1">
+    <subchannel color="0" subchannel="1">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_cyan" index="0">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="1">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="2">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmY" text="Five Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="f360_standard_cyan" index="0">
+    <subchannel color="2" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="1">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_magenta" index="2">
+    <subchannel color="1" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="3">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_yellow" index="4">
+    <subchannel color="4" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmYK" text="Six Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_cyan" index="1">
+    <subchannel color="2" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="2">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_magenta" index="3">
+    <subchannel color="1" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="4">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_yellow" index="5">
+    <subchannel color="4" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmYKk" text="Seven Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <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">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="3">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_magenta" index="4">
+    <subchannel color="1" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="5">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_yellow" index="6">
+    <subchannel color="4" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+ </InkList>
+ <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>
+  <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>
+ </Shades>
+
+ <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">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+    </subchannel>
+    <subchannel color="0" subchannel="1">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="GrayValue"/>
+     <SubchannelScaleParam name="GrayScale"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_cyan" index="1">
+    <subchannel color="2" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_magenta" index="2">
+    <subchannel color="1" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_yellow" index="3">
+    <subchannel color="4" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_cyan" index="1">
+    <subchannel color="2" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_magenta" index="2">
+    <subchannel color="1" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_yellow" index="3">
+    <subchannel color="4" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <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">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_magenta" index="2">
+    <subchannel color="1" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_yellow" index="3">
+    <subchannel color="4" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="RGB" text="Three Color Composite" InkID="CMYK">
+  <Channels>
+   <channel name="standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <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">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+    </subchannel>
+    <subchannel color="0" subchannel="1">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="GrayValue"/>
+     <SubchannelScaleParam name="GrayScale"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack2" text="Two Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_black" index="1">
+    <subchannel color="0" subchannel="1">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_cyan" index="0">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="1">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="2">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmY" text="Five Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="f360_standard_cyan" index="0">
+    <subchannel color="2" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="1">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_magenta" index="2">
+    <subchannel color="1" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="3">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_yellow" index="4">
+    <subchannel color="4" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmYK" text="Six Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_cyan" index="1">
+    <subchannel color="2" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="2">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_magenta" index="3">
+    <subchannel color="1" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="4">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_yellow" index="5">
+    <subchannel color="4" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmYKk" text="Seven Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <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">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="3">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_magenta" index="4">
+    <subchannel color="1" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="5">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_yellow" index="6">
+    <subchannel color="4" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+</escp2:InkGroup>
+</gutenprint>
diff --git a/src/xml/escp2/inks/f360_ultrachrome_k3.xml b/src/xml/escp2/inks/f360_ultrachrome_k3.xml
new file mode 100644
index 0000000..d9a64f6
--- /dev/null
+++ b/src/xml/escp2/inks/f360_ultrachrome_k3.xml
@@ -0,0 +1,590 @@
+<?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_k3">
+<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.350000</shade>
+  <shade count="2">1.000000 0.200000</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">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="DarkGrayTrans"/>
+    </subchannel>
+    <subchannel color="0" subchannel="1">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="DarkGrayTrans"/>
+     <SubchannelValueParam name="DarkGrayValue"/>
+     <SubchannelScaleParam name="DarkGrayScale"/>
+    </subchannel>
+    <subchannel color="0" subchannel="3" headOffset="1">
+     <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">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1" headOffset="1">
+     <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">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <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">
+     <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">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+    </subchannel>
+    <subchannel color="0" subchannel="1">
+     <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">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1" headOffset="1">
+     <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">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <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">
+     <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">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360x_photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1" headOffset="1">
+     <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">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <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">
+     <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">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1" headOffset="1">
+     <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">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <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">
+     <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">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <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">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <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">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_black" index="1">
+    <subchannel color="0" subchannel="1">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_extended_photo3_black" index="2">
+    <subchannel color="0" subchannel="3" headOffset="1">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="3">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_extended_cyan" index="4">
+    <subchannel color="2" subchannel="1" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_magenta" index="5">
+    <subchannel color="1" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="6">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="7">
+    <subchannel color="4">
+     <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.350000</shade>
+  <shade count="2">1.000000 0.200000</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">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="DarkGrayTrans"/>
+    </subchannel>
+    <subchannel color="0" subchannel="1">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="DarkGrayTrans"/>
+     <SubchannelValueParam name="DarkGrayValue"/>
+     <SubchannelScaleParam name="DarkGrayScale"/>
+    </subchannel>
+    <subchannel color="0" subchannel="3" headOffset="1">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="LightGrayTrans"/>
+     <SubchannelValueParam name="LightGrayValue"/>
+     <SubchannelScaleParam name="LightGrayScale"/>
+    </subchannel>
+   </channel>
+   <channel name="f360x_photo_cyan" index="1">
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_magenta" index="2">
+    <subchannel color="1" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <subchannel color="4">
+     <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">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+    </subchannel>
+    <subchannel color="0" subchannel="1">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="GrayValue"/>
+     <SubchannelScaleParam name="GrayScale"/>
+    </subchannel>
+   </channel>
+   <channel name="f360x_photo_cyan" index="1">
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_magenta" index="2">
+    <subchannel color="1" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <subchannel color="4">
+     <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">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360x_photo_cyan" index="1">
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_magenta" index="2">
+    <subchannel color="1" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <subchannel color="4">
+     <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">
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_magenta" index="2">
+    <subchannel color="1" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <subchannel color="4">
+     <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">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_magenta" index="2">
+    <subchannel color="1" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <subchannel color="4">
+     <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">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_magenta" index="2">
+    <subchannel color="1" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <subchannel color="4">
+     <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">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_black" index="1">
+    <subchannel color="0" subchannel="1">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_extended_photo3_black" index="2">
+    <subchannel color="0" subchannel="3" headOffset="1">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="3">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_extended_cyan" index="4">
+    <subchannel color="2" subchannel="1" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_magenta" index="5">
+    <subchannel color="1" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="6">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="7">
+    <subchannel color="4">
+     <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
new file mode 100644
index 0000000..f0a8d1c
--- /dev/null
+++ b/src/xml/escp2/inks/nx100.xml
@@ -0,0 +1,139 @@
+<?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="nx100">
+<InkList translate="text" name="None" text="EPSON Standard Inks">
+ <Shades>
+  <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="CMYK" text="Four Color Standard" InkID="CMYK">
+  <Channels>
+   <channel name="c64_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c64_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c64_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" headOffset="90">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c64_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" headOffset="180">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="RGB" text="Three Color Composite" InkID="CMYK">
+  <Channels>
+   <channel name="c64_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c64_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" headOffset="90">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c64_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" headOffset="180">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="c64_cyan" index="0">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c64_magenta" index="1">
+    <subchannel color="1" headOffset="90">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c64_yellow" index="2">
+    <subchannel color="4" headOffset="180">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="c64_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c64_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c64_magenta" index="2">
+    <subchannel color="1" headOffset="90">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c64_yellow" index="3">
+    <subchannel color="4" headOffset="180">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+</escp2:InkGroup>
+</gutenprint>
diff --git a/src/xml/escp2/inks/photo_gen0.xml b/src/xml/escp2/inks/photo_gen0.xml
new file mode 100644
index 0000000..8a61dcd
--- /dev/null
+++ b/src/xml/escp2/inks/photo_gen0.xml
@@ -0,0 +1,320 @@
+<?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="photo_gen0">
+<InkList translate="text" name="None" text="EPSON Standard Inks">
+ <Shades>
+  <shade count="1">1.000000</shade>
+  <shade count="2">1.000000 0.305000</shade>
+  <shade count="2">1.000000 0.315000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+ </Shades>
+
+ <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK">
+  <Channels>
+   <channel name="photo_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhotoCMY" text="Five Color Photo Composite" InkID="CcMmYK">
+  <Channels>
+   <channel name="photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="RGB" text="Three Color Composite" InkID="CMYK">
+  <Channels>
+   <channel name="standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_cyan" index="0">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="1">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="2">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmY" text="Five Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_cyan" index="0">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="1">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="3">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="4">
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmYK" text="Six Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="photo_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="2">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="3">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="4">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="5">
+    <subchannel color="4" subchannel="0">
+     <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>
+ </Shades>
+
+ <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>
+    <subchannel color="2">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="Gray3Value"/>
+     <SubchannelScaleParam name="Gray3Scale"/>
+    </subchannel>
+    <subchannel color="1">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="Gray2Value"/>
+     <SubchannelScaleParam name="Gray2Scale"/>
+    </subchannel>
+    <subchannel color="4">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="Gray1Value"/>
+     <SubchannelScaleParam name="Gray1Scale"/>
+    </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
new file mode 100644
index 0000000..e616e0e
--- /dev/null
+++ b/src/xml/escp2/inks/photo_gen1.xml
@@ -0,0 +1,320 @@
+<?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="photo_gen1">
+<InkList translate="text" name="None" text="EPSON Standard Inks">
+ <Shades>
+  <shade count="1">1.000000</shade>
+  <shade count="2">1.000000 0.305000</shade>
+  <shade count="2">1.000000 0.315000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+ </Shades>
+
+ <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK">
+  <Channels>
+   <channel name="photo_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhotoCMY" text="Five Color Photo Composite" InkID="CcMmYK">
+  <Channels>
+   <channel name="photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="RGB" text="Three Color Composite" InkID="CMYK">
+  <Channels>
+   <channel name="standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_cyan" index="0">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="1">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="2">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmY" text="Five Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_cyan" index="0">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="1">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="3">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="4">
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmYK" text="Six Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="photo_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="2">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="3">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="4">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="5">
+    <subchannel color="4" subchannel="0">
+     <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>
+ </Shades>
+
+ <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>
+    <subchannel color="2">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="Gray3Value"/>
+     <SubchannelScaleParam name="Gray3Scale"/>
+    </subchannel>
+    <subchannel color="1">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="Gray2Value"/>
+     <SubchannelScaleParam name="Gray2Scale"/>
+    </subchannel>
+    <subchannel color="4">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="Gray1Value"/>
+     <SubchannelScaleParam name="Gray1Scale"/>
+    </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
new file mode 100644
index 0000000..bb6d6eb
--- /dev/null
+++ b/src/xml/escp2/inks/photo_gen2.xml
@@ -0,0 +1,319 @@
+<?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="photo_gen2">
+<InkList translate="text" name="None" text="EPSON Standard Inks">
+ <Shades>
+  <shade count="1">1.000000</shade>
+  <shade count="2">1.000000 0.290000</shade>
+  <shade count="2">1.000000 0.290000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+ </Shades>
+
+ <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK">
+  <Channels>
+   <channel name="photo_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhotoCMY" text="Five Color Photo Composite" InkID="CcMmYK">
+  <Channels>
+   <channel name="photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="RGB" text="Three Color Composite" InkID="CMYK">
+  <Channels>
+   <channel name="standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_cyan" index="0">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="1">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="2">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmY" text="Five Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_cyan" index="0">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="1">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="3">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="4">
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmYK" text="Six Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="photo_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="2">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="3">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="4">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="5">
+    <subchannel color="4" subchannel="0">
+     <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>
+ </Shades>
+
+ <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>
+    <subchannel color="2">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="Gray3Value"/>
+     <SubchannelScaleParam name="Gray3Scale"/>
+    </subchannel>
+    <subchannel color="1">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="Gray2Value"/>
+     <SubchannelScaleParam name="Gray2Scale"/>
+    </subchannel>
+    <subchannel color="4">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="Gray1Value"/>
+     <SubchannelScaleParam name="Gray1Scale"/>
+    </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
new file mode 100644
index 0000000..923f2b6
--- /dev/null
+++ b/src/xml/escp2/inks/photo_gen3.xml
@@ -0,0 +1,320 @@
+<?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="photo_gen3">
+<InkList translate="text" name="None" text="EPSON Standard Inks">
+ <Shades>
+  <shade count="1">1.000000</shade>
+  <shade count="2">1.000000 0.350000</shade>
+  <shade count="2">1.000000 0.350000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+ </Shades>
+
+ <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK">
+  <Channels>
+   <channel name="photo_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhotoCMY" text="Five Color Photo Composite" InkID="CcMmYK">
+  <Channels>
+   <channel name="photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="RGB" text="Three Color Composite" InkID="CMYK">
+  <Channels>
+   <channel name="standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_cyan" index="0">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="1">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="2">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmY" text="Five Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_cyan" index="0">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="1">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="3">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="4">
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmYK" text="Six Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="photo_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="2">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="3">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="4">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="5">
+    <subchannel color="4" subchannel="0">
+     <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>
+ </Shades>
+
+ <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>
+    <subchannel color="2">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="Gray3Value"/>
+     <SubchannelScaleParam name="Gray3Scale"/>
+    </subchannel>
+    <subchannel color="1">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="Gray2Value"/>
+     <SubchannelScaleParam name="Gray2Scale"/>
+    </subchannel>
+    <subchannel color="4">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="Gray1Value"/>
+     <SubchannelScaleParam name="Gray1Scale"/>
+    </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
new file mode 100644
index 0000000..fb85d5e
--- /dev/null
+++ b/src/xml/escp2/inks/photo_gen3_4.xml
@@ -0,0 +1,174 @@
+<?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="photo_gen3_4">
+<InkList translate="text" name="None" text="EPSON Standard Inks">
+ <Shades>
+  <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="CMYK" text="Four Color Standard" InkID="CMYK">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="RGB" text="Three Color Composite" InkID="CMYK">
+  <Channels>
+   <channel name="standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_cyan" index="0">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="1">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="2">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <subchannel color="4">
+     <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>
+ </Shades>
+
+ <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>
+    <subchannel color="2">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="Gray3Value"/>
+     <SubchannelScaleParam name="Gray3Scale"/>
+    </subchannel>
+    <subchannel color="1">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="Gray2Value"/>
+     <SubchannelScaleParam name="Gray2Scale"/>
+    </subchannel>
+    <subchannel color="4">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="Gray1Value"/>
+     <SubchannelScaleParam name="Gray1Scale"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+</escp2:InkGroup>
+</gutenprint>
diff --git a/src/xml/escp2/inks/photo_gen4.xml b/src/xml/escp2/inks/photo_gen4.xml
new file mode 100644
index 0000000..6c08316
--- /dev/null
+++ b/src/xml/escp2/inks/photo_gen4.xml
@@ -0,0 +1,285 @@
+<?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="photo_gen3">
+<InkList translate="text" name="None" text="EPSON Standard Inks">
+ <Shades>
+  <shade count="1">1.000000</shade>
+  <shade count="2">1.000000 0.350000</shade>
+  <shade count="2">1.000000 0.350000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+ </Shades>
+
+ <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK">
+  <Channels>
+   <channel name="photo_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhotoCMY" text="Five Color Photo Composite" InkID="CcMmYK">
+  <Channels>
+   <channel name="photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="RGB" text="Three Color Composite" InkID="CMYK">
+  <Channels>
+   <channel name="standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_cyan" index="0">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="1">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="2">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmY" text="Five Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_cyan" index="0">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="1">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="3">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="4">
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmYK" text="Six Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="photo_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="2">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="3">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="4">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="5">
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+</escp2:InkGroup>
+</gutenprint>
diff --git a/src/xml/escp2/inks/photo_pigment.xml b/src/xml/escp2/inks/photo_pigment.xml
new file mode 100644
index 0000000..c5d047b
--- /dev/null
+++ b/src/xml/escp2/inks/photo_pigment.xml
@@ -0,0 +1,285 @@
+<?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="photo_pigment">
+<InkList translate="text" name="None" text="EPSON Standard Inks">
+ <Shades>
+  <shade count="1">1.000000</shade>
+  <shade count="2">1.000000 0.227000</shade>
+  <shade count="2">1.000000 0.227000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+ </Shades>
+
+ <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK">
+  <Channels>
+   <channel name="photo_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhotoCMY" text="Five Color Photo Composite" InkID="CcMmYK">
+  <Channels>
+   <channel name="photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="RGB" text="Three Color Composite" InkID="CMYK">
+  <Channels>
+   <channel name="standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_cyan" index="0">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="1">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="2">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmY" text="Five Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_cyan" index="0">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="1">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="3">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="4">
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmYK" text="Six Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="photo_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="2">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="3">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="4">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="5">
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+</escp2:InkGroup>
+</gutenprint>
diff --git a/src/xml/escp2/inks/picturemate_4.xml b/src/xml/escp2/inks/picturemate_4.xml
new file mode 100644
index 0000000..5b1e6fe
--- /dev/null
+++ b/src/xml/escp2/inks/picturemate_4.xml
@@ -0,0 +1,86 @@
+<?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="picturemate_4">
+<InkList translate="text" name="picturemate_4" text="Standard">
+ <Shades>
+  <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="CMYK" text="Four Color Photo" InkID="CMYK">
+  <Channels>
+   <channel name="photo_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="picturemate_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="picturemate_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="picturemate_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="photo_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="picturemate_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="picturemate_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="picturemate_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+</escp2:InkGroup>
+</gutenprint>
diff --git a/src/xml/escp2/inks/picturemate_6.xml b/src/xml/escp2/inks/picturemate_6.xml
new file mode 100644
index 0000000..9ccb684
--- /dev/null
+++ b/src/xml/escp2/inks/picturemate_6.xml
@@ -0,0 +1,220 @@
+<?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="picturemate_6">
+<InkList translate="text" name="picturemate_6" text="Standard">
+ <Shades>
+  <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>
+  <shade count="1">1.000000</shade>
+ </Shades>
+
+ <InkName translate="text" name="CMYKRB" text="Six Color Photo" InkID="OTHER">
+  <Channels>
+   <channel name="photo_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="picturemate_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <HueCurve>
+    <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+     <sequence count="48" lower-bound="0" upper-bound="4">
+	1	1	1	1	1	1	1	1
+	1	0.875	0.7	0.55	0.4	0.3	0.2	0.1
+	0	0	0	0	0	0	0	0
+	0	0	0	0	0	0	0	0
+	0	0.125	0.25	0.375	0.5	0.625	0.75	0.875
+	1	1	1	1	1	1	1	1
+     </sequence>
+    </curve>
+    </HueCurve>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="picturemate_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <HueCurve>
+    <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+     <sequence count="48" lower-bound="0" upper-bound="4">
+	0	0	0	0	0	0	0	0
+	0	0	0	0.002	0.05	0.3	0.6	0.8
+	1	1	0.85	0.7	0.6	0.5	0.4	0.3
+	0.2	0.1	0.05	0	0	0	0	0
+	0	0	0	0	0	0	0	0
+	0	0	0	0	0	0	0	0
+     </sequence>
+    </curve>
+    </HueCurve>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="picturemate_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <HueCurve>
+    <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+     <sequence count="48" lower-bound="0" upper-bound="4">
+	0	0	0	0	0	0	0	0
+	0	0	0	0	0	0	0	0
+	0	0	0	0	0	0	0.05	0.15
+	0.25	0.35	0.45	0.55	0.65	0.75	0.85	0.95
+	1	1	1	1	1	1	1	1
+	1	0.875	0.75	0.625	0.5	0.375	0.25	0.125
+     </sequence>
+    </curve>
+    </HueCurve>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="picturemate_red" index="4">
+    <HueCurveParam name="RedHueCurve"/>
+    <HueCurve>
+    <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+     <sequence count="48" lower-bound="0" upper-bound="4">
+	0	0	0	0	0	0	0	0
+	0	0	0	0	0	0	0	0
+	0.025	0.4	0.6	0.75	0.89	1	1	1
+	1	0.875	0.75	0.625	0.5	0.375	0.25	0.125
+	0	0	0	0	0	0	0	0
+	0	0	0	0	0	0	0	0
+     </sequence>
+    </curve>
+    </HueCurve>
+    <subchannel color="7">
+     <ChannelDensityParam name="RedDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="picturemate_blue" index="5">
+    <HueCurveParam name="BlueHueCurve"/>
+    <HueCurve>
+    <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+     <sequence count="48" lower-bound="0" upper-bound="4">
+	0	0.25	0.475	0.7	0.81	0.875	0.94	1
+	1	0.975	0.93	0.875	0.81	0.74	0.65	0.4
+	0.04	0.002	0	0	0	0	0	0
+	0	0	0	0	0	0	0	0
+	0	0	0	0	0	0	0	0
+	0	0	0	0	0	0	0	0
+     </sequence>
+    </curve>
+    </HueCurve>
+    <subchannel color="8" headOffset="1">
+     <ChannelDensityParam name="BlueDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="CMYK" text="Four Color Photo" InkID="CMYK">
+  <Channels>
+   <channel name="photo_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="picturemate_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="picturemate_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="picturemate_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYKRB" text="Six Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="photo_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="picturemate_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="picturemate_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="picturemate_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="picturemate_red" index="4">
+    <subchannel color="7">
+     <ChannelDensityParam name="RedDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="picturemate_blue" index="5">
+    <subchannel color="8" headOffset="1">
+     <ChannelDensityParam name="BlueDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="photo_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="picturemate_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="picturemate_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="picturemate_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+</escp2:InkGroup>
+</gutenprint>
diff --git a/src/xml/escp2/inks/pro_gen1.xml b/src/xml/escp2/inks/pro_gen1.xml
new file mode 100644
index 0000000..9d9dca6
--- /dev/null
+++ b/src/xml/escp2/inks/pro_gen1.xml
@@ -0,0 +1,320 @@
+<?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="pro_gen1">
+<InkList translate="text" name="None" text="EPSON Standard Inks">
+ <Shades>
+  <shade count="1">1.000000</shade>
+  <shade count="2">1.000000 0.305000</shade>
+  <shade count="2">1.000000 0.315000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+ </Shades>
+
+ <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK">
+  <Channels>
+   <channel name="photo_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhotoCMY" text="Five Color Photo Composite" InkID="CcMmYK">
+  <Channels>
+   <channel name="photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="RGB" text="Three Color Composite" InkID="CMYK">
+  <Channels>
+   <channel name="standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_cyan" index="0">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="1">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="2">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmY" text="Five Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_cyan" index="0">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="1">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="3">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="4">
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmYK" text="Six Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="photo_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="2">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="3">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="4">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="5">
+    <subchannel color="4" subchannel="0">
+     <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>
+ </Shades>
+
+ <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>
+    <subchannel color="2">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="Gray3Value"/>
+     <SubchannelScaleParam name="Gray3Scale"/>
+    </subchannel>
+    <subchannel color="1">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="Gray2Value"/>
+     <SubchannelScaleParam name="Gray2Scale"/>
+    </subchannel>
+    <subchannel color="4">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="Gray1Value"/>
+     <SubchannelScaleParam name="Gray1Scale"/>
+    </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
new file mode 100644
index 0000000..0eaac3a
--- /dev/null
+++ b/src/xml/escp2/inks/pro_gen2.xml
@@ -0,0 +1,320 @@
+<?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="pro_gen2">
+<InkList translate="text" name="None" text="EPSON Standard Inks">
+ <Shades>
+  <shade count="1">1.000000</shade>
+  <shade count="2">1.000000 0.290000</shade>
+  <shade count="2">1.000000 0.290000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+ </Shades>
+
+ <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK">
+  <Channels>
+   <channel name="photo_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhotoCMY" text="Five Color Photo Composite" InkID="CcMmYK">
+  <Channels>
+   <channel name="photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="RGB" text="Three Color Composite" InkID="CMYK">
+  <Channels>
+   <channel name="standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_cyan" index="0">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="1">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="2">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmY" text="Five Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_cyan" index="0">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="1">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="3">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="4">
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmYK" text="Six Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="photo_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="2">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="3">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="4">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="5">
+    <subchannel color="4" subchannel="0">
+     <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>
+ </Shades>
+
+ <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>
+    <subchannel color="2">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="Gray3Value"/>
+     <SubchannelScaleParam name="Gray3Scale"/>
+    </subchannel>
+    <subchannel color="1">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="Gray2Value"/>
+     <SubchannelScaleParam name="Gray2Scale"/>
+    </subchannel>
+    <subchannel color="4">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="Gray1Value"/>
+     <SubchannelScaleParam name="Gray1Scale"/>
+    </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
new file mode 100644
index 0000000..59caecb
--- /dev/null
+++ b/src/xml/escp2/inks/pro_pigment.xml
@@ -0,0 +1,285 @@
+<?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="pro_pigment">
+<InkList translate="text" name="None" text="EPSON Standard Inks">
+ <Shades>
+  <shade count="1">1.000000</shade>
+  <shade count="2">1.000000 0.227000</shade>
+  <shade count="2">1.000000 0.227000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+ </Shades>
+
+ <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK">
+  <Channels>
+   <channel name="photo_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhotoCMY" text="Five Color Photo Composite" InkID="CcMmYK">
+  <Channels>
+   <channel name="photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="RGB" text="Three Color Composite" InkID="CMYK">
+  <Channels>
+   <channel name="standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_cyan" index="0">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="1">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="2">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmY" text="Five Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_cyan" index="0">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="1">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="3">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="4">
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmYK" text="Six Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="photo_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="2">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="3">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="4">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="5">
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+</escp2:InkGroup>
+</gutenprint>
diff --git a/src/xml/escp2/inks/pro_ultrachrome.xml b/src/xml/escp2/inks/pro_ultrachrome.xml
new file mode 100644
index 0000000..9ef31f3
--- /dev/null
+++ b/src/xml/escp2/inks/pro_ultrachrome.xml
@@ -0,0 +1,775 @@
+<?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="pro_ultrachrome">
+<InkList translate="text" name="ultraphoto" text="UltraChrome Photo Black">
+<Shades>
+ <shade count="2">1.000000 0.480000</shade>
+ <shade count="2">1.000000 0.330000</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>
+</Shades>
+
+ <InkName translate="text" name="PhotoCMYK7" text="Seven Color Photo" InkID="CcMmYKk">
+  <Channels>
+   <channel name="photo2_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+    </subchannel>
+    <subchannel color="0" subchannel="1">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="GrayValue"/>
+     <SubchannelScaleParam name="GrayScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK">
+  <Channels>
+   <channel name="photo_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhotoCMY" text="Five Color Photo Composite" InkID="CcMmYK">
+  <Channels>
+   <channel name="photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="RGB" text="Three Color Composite" InkID="CMYK">
+  <Channels>
+   <channel name="standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="Gray2" text="Two Level Grayscale" InkID="CcMmYKk">
+  <Channels>
+   <channel name="photo2_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+    </subchannel>
+    <subchannel color="0" subchannel="1">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="GrayValue"/>
+     <SubchannelScaleParam name="GrayScale"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack2" text="Two Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="photo_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_black" index="1">
+    <subchannel color="0" subchannel="1">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_cyan" index="0">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="1">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="2">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmY" text="Five Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_cyan" index="0">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="1">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="3">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="4">
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmYK" text="Six Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="photo_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="2">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="3">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="4">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="5">
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmYKk" text="Seven Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="photo_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_black" index="1">
+    <subchannel color="0" subchannel="1">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="2">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="3">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="4">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="5">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="6">
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+
+<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>
+  <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>
+ </Shades>
+
+ <InkName translate="text" name="PhotoCMYK7" text="Seven Color Photo" InkID="CcMmYKk">
+  <Channels>
+   <channel name="photo2_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+    </subchannel>
+    <subchannel color="0" subchannel="1">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="GrayValue"/>
+     <SubchannelScaleParam name="GrayScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_cyan" index="1">
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_magenta" index="2">
+    <subchannel color="1" subchannel="0">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="3">
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK">
+  <Channels>
+   <channel name="photo_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_cyan" index="1">
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_magenta" index="2">
+    <subchannel color="1" subchannel="0">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="3">
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhotoCMY" text="Five Color Photo Composite" InkID="CcMmYK">
+  <Channels>
+   <channel name="photo_cyan" index="1">
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_magenta" index="2">
+    <subchannel color="1" subchannel="0">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="3">
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="RGB" text="Three Color Composite" InkID="CMYK">
+  <Channels>
+   <channel name="standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="Gray2" text="Two Level Grayscale" InkID="CcMmYKk">
+  <Channels>
+   <channel name="photo2_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+    </subchannel>
+    <subchannel color="0" subchannel="1">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="GrayValue"/>
+     <SubchannelScaleParam name="GrayScale"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack2" text="Two Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="photo_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_black" index="1">
+    <subchannel color="0" subchannel="1">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_cyan" index="0">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="1">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="2">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmY" text="Five Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_cyan" index="0">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="1">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="3">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="4">
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmYK" text="Six Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="photo_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="2">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="3">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="4">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="5">
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmYKk" text="Seven Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="photo_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_black" index="1">
+    <subchannel color="0" subchannel="1">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="2">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="3">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="4">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="5">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="6">
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+</escp2:InkGroup>
+</gutenprint>
diff --git a/src/xml/escp2/inks/pro_ultrachrome_k3.xml b/src/xml/escp2/inks/pro_ultrachrome_k3.xml
new file mode 100644
index 0000000..8038997
--- /dev/null
+++ b/src/xml/escp2/inks/pro_ultrachrome_k3.xml
@@ -0,0 +1,590 @@
+<?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="pro_ultrachrome_k3">
+<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.350000</shade>
+  <shade count="2">1.000000 0.200000</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="photo3_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="DarkGrayTrans"/>
+    </subchannel>
+    <subchannel color="0" subchannel="1">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="DarkGrayTrans"/>
+     <SubchannelValueParam name="DarkGrayValue"/>
+     <SubchannelScaleParam name="DarkGrayScale"/>
+    </subchannel>
+    <subchannel color="0" subchannel="2">
+     <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">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <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">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhotoCMYK7" text="Seven Color Photo" InkID="CcMmYKk">
+  <Channels>
+   <channel name="photo2_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+    </subchannel>
+    <subchannel color="0" subchannel="1">
+     <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">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <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">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK">
+  <Channels>
+   <channel name="black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360x_photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <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">
+     <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">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <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">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
+  <Channels>
+   <channel name="black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <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">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYKkk" text="Eight Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_black" index="1">
+    <subchannel color="0" subchannel="1">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_photo3_black" index="2">
+    <subchannel color="0" subchannel="3">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="3">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="4">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="5">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="6">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="7">
+    <subchannel color="4">
+     <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.350000</shade>
+  <shade count="2">1.000000 0.200000</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="photo3_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="DarkGrayTrans"/>
+    </subchannel>
+    <subchannel color="0" subchannel="1">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="DarkGrayTrans"/>
+     <SubchannelValueParam name="DarkGrayValue"/>
+     <SubchannelScaleParam name="DarkGrayScale"/>
+    </subchannel>
+    <subchannel color="0" subchannel="3">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="LightGrayTrans"/>
+     <SubchannelValueParam name="LightGrayValue"/>
+     <SubchannelScaleParam name="LightGrayScale"/>
+    </subchannel>
+   </channel>
+   <channel name="f360x_photo_cyan" index="1">
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_magenta" index="2">
+    <subchannel color="1" subchannel="0">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhotoCMYK7" text="Seven Color Photo" InkID="CcMmYKk">
+  <Channels>
+   <channel name="photo2_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+    </subchannel>
+    <subchannel color="0" subchannel="1">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="GrayValue"/>
+     <SubchannelScaleParam name="GrayScale"/>
+    </subchannel>
+   </channel>
+   <channel name="f360x_photo_cyan" index="1">
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_magenta" index="2">
+    <subchannel color="1" subchannel="0">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK">
+  <Channels>
+   <channel name="black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360x_photo_cyan" index="1">
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_magenta" index="2">
+    <subchannel color="1" subchannel="0">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <subchannel color="4">
+     <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">
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_magenta" index="2">
+    <subchannel color="1" subchannel="0">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
+  <Channels>
+   <channel name="black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <subchannel color="4">
+     <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">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYKkk" text="Eight Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_black" index="1">
+    <subchannel color="0" subchannel="1">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_photo3_black" index="2">
+    <subchannel color="0" subchannel="3">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="3">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="4">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="5">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="6">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="7">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+</escp2:InkGroup>
+</gutenprint>
diff --git a/src/xml/escp2/inks/standard.xml b/src/xml/escp2/inks/standard.xml
new file mode 100644
index 0000000..afd21c4
--- /dev/null
+++ b/src/xml/escp2/inks/standard.xml
@@ -0,0 +1,174 @@
+<?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="standard">
+<InkList translate="text" name="None" text="EPSON Standard Inks">
+ <Shades>
+  <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="CMYK" text="Four Color Standard" InkID="CMYK">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="RGB" text="Three Color Composite" InkID="CMYK">
+  <Channels>
+   <channel name="standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_cyan" index="0">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="1">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="2">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <subchannel color="4">
+     <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>
+ </Shades>
+
+ <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>
+    <subchannel color="2">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="Gray3Value"/>
+     <SubchannelScaleParam name="Gray3Scale"/>
+    </subchannel>
+    <subchannel color="1">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="Gray2Value"/>
+     <SubchannelScaleParam name="Gray2Scale"/>
+    </subchannel>
+    <subchannel color="4">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="Gray1Value"/>
+     <SubchannelScaleParam name="Gray1Scale"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+</escp2:InkGroup>
+</gutenprint>
diff --git a/src/xml/escp2/inks/standard_gen0.xml b/src/xml/escp2/inks/standard_gen0.xml
new file mode 100644
index 0000000..7c04253
--- /dev/null
+++ b/src/xml/escp2/inks/standard_gen0.xml
@@ -0,0 +1,174 @@
+<?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="standard_gen0">
+<InkList translate="text" name="None" text="EPSON Standard Inks">
+ <Shades>
+  <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="CMYK" text="Four Color Standard" InkID="CMYK">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="RGB" text="Three Color Composite" InkID="CMYK">
+  <Channels>
+   <channel name="standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_cyan" index="0">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="1">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="2">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <subchannel color="4">
+     <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>
+ </Shades>
+
+ <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>
+    <subchannel color="2">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="Gray3Value"/>
+     <SubchannelScaleParam name="Gray3Scale"/>
+    </subchannel>
+    <subchannel color="1">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="Gray2Value"/>
+     <SubchannelScaleParam name="Gray2Scale"/>
+    </subchannel>
+    <subchannel color="4">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="Gray1Value"/>
+     <SubchannelScaleParam name="Gray1Scale"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+</escp2:InkGroup>
+</gutenprint>
diff --git a/src/xml/escp2/inks/ultrachrome.xml b/src/xml/escp2/inks/ultrachrome.xml
new file mode 100644
index 0000000..2a3b442
--- /dev/null
+++ b/src/xml/escp2/inks/ultrachrome.xml
@@ -0,0 +1,775 @@
+<?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="ultrachrome">
+<InkList translate="text" name="ultraphoto" text="UltraChrome Photo Black">
+ <Shades>
+  <shade count="2">1.000000 0.480000</shade>
+  <shade count="2">1.000000 0.330000</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>
+ </Shades>
+
+ <InkName translate="text" name="PhotoCMYK7" text="Seven Color Photo" InkID="CcMmYKk">
+  <Channels>
+   <channel name="photo2_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+    </subchannel>
+    <subchannel color="0" subchannel="1">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="GrayValue"/>
+     <SubchannelScaleParam name="GrayScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK">
+  <Channels>
+   <channel name="photo_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhotoCMY" text="Five Color Photo Composite" InkID="CcMmYK">
+  <Channels>
+   <channel name="photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="RGB" text="Three Color Composite" InkID="CMYK">
+  <Channels>
+   <channel name="standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="Gray2" text="Two Level Grayscale" InkID="CcMmYKk">
+  <Channels>
+   <channel name="photo2_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+    </subchannel>
+    <subchannel color="0" subchannel="1">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="GrayValue"/>
+     <SubchannelScaleParam name="GrayScale"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack2" text="Two Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="photo_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_black" index="1">
+    <subchannel color="0" subchannel="1">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_cyan" index="0">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="1">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="2">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmY" text="Five Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_cyan" index="0">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="1">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="3">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="4">
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmYK" text="Six Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="photo_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="2">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="3">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="4">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="5">
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmYKk" text="Seven Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="photo_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_black" index="1">
+    <subchannel color="0" subchannel="1">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="2">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="3">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="4">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="5">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="6">
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+
+<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>
+  <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>
+ </Shades>
+
+ <InkName translate="text" name="PhotoCMYK7" text="Seven Color Photo" InkID="CcMmYKk">
+  <Channels>
+   <channel name="photo2_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+    </subchannel>
+    <subchannel color="0" subchannel="1">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="GrayValue"/>
+     <SubchannelScaleParam name="GrayScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_cyan" index="1">
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_magenta" index="2">
+    <subchannel color="1" subchannel="0">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="3">
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK">
+  <Channels>
+   <channel name="photo_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_cyan" index="1">
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_magenta" index="2">
+    <subchannel color="1" subchannel="0">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="3">
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhotoCMY" text="Five Color Photo Composite" InkID="CcMmYK">
+  <Channels>
+   <channel name="photo_cyan" index="1">
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_magenta" index="2">
+    <subchannel color="1" subchannel="0">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="3">
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="RGB" text="Three Color Composite" InkID="CMYK">
+  <Channels>
+   <channel name="standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="Gray2" text="Two Level Grayscale" InkID="CcMmYKk">
+  <Channels>
+   <channel name="photo2_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+    </subchannel>
+    <subchannel color="0" subchannel="1">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="GrayValue"/>
+     <SubchannelScaleParam name="GrayScale"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack2" text="Two Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="photo_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_black" index="1">
+    <subchannel color="0" subchannel="1">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_cyan" index="0">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="1">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="2">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmY" text="Five Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_cyan" index="0">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="1">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="3">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="4">
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmYK" text="Six Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="photo_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="2">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="3">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="4">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="5">
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmYKk" text="Seven Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="photo_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_black" index="1">
+    <subchannel color="0" subchannel="1">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="2">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="3">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="4">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="5">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="6">
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+</escp2:InkGroup>
+</gutenprint>
diff --git a/src/xml/escp2/inks/wf40.xml b/src/xml/escp2/inks/wf40.xml
new file mode 100644
index 0000000..6bf5a9a
--- /dev/null
+++ b/src/xml/escp2/inks/wf40.xml
@@ -0,0 +1,142 @@
+<?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="wf40">
+<InkList translate="text" name="None" text="EPSON Standard Inks">
+ <Shades>
+  <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="CMYK" text="Four Color Standard" InkID="CMYK">
+  <Channels>
+   <channel name="wf40_black" index="0">
+    <subchannel color="0" subchannel="6">
+     <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">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="wf40_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="wf40_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="RGB" text="Three Color Composite" InkID="CMYK">
+  <Channels>
+   <channel name="wf40_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" headOffset="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="wf40_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="wf40_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="wf40_black" index="0">
+    <subchannel color="0" subchannel="6">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SplitChannels count="3">0 64 96</SplitChannels>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="wf40_cyan" index="0">
+    <subchannel color="2" headOffset="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="wf40_magenta" index="1">
+    <subchannel color="1" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="wf40_yellow" index="2">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="wf40_black" index="0">
+    <subchannel color="0" subchannel="6">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SplitChannels count="3">0 64 96</SplitChannels>
+    </subchannel>
+   </channel>
+   <channel name="wf40_cyan" index="1">
+    <subchannel color="2" headOffset="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="wf40_magenta" index="2">
+    <subchannel color="1" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="wf40_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+</escp2:InkGroup>
+</gutenprint>
diff --git a/src/xml/escp2/inks/wf500.xml b/src/xml/escp2/inks/wf500.xml
new file mode 100644
index 0000000..5fc2282
--- /dev/null
+++ b/src/xml/escp2/inks/wf500.xml
@@ -0,0 +1,139 @@
+<?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="wf500">
+<InkList translate="text" name="None" text="EPSON Standard Inks">
+ <Shades>
+  <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="CMYK" text="Four Color Standard" InkID="CMYK">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="cx3650_standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" headOffset="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="RGB" text="Three Color Composite" InkID="CMYK">
+  <Channels>
+   <channel name="cx3650_standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" headOffset="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="cx3650_standard_cyan" index="0">
+    <subchannel color="2" headOffset="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_magenta" index="1">
+    <subchannel color="1" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="2">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="cx3650_standard_cyan" index="1">
+    <subchannel color="2" headOffset="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_magenta" index="2">
+    <subchannel color="1" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+</escp2:InkGroup>
+</gutenprint>
diff --git a/src/xml/escp2/inks/x80.xml b/src/xml/escp2/inks/x80.xml
new file mode 100644
index 0000000..6c24d24
--- /dev/null
+++ b/src/xml/escp2/inks/x80.xml
@@ -0,0 +1,139 @@
+<?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="x80">
+<InkList translate="text" name="None" text="EPSON Standard Inks">
+ <Shades>
+  <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="CMYK" text="Four Color Standard" InkID="CMYK">
+  <Channels>
+   <channel name="x80_black" index="0">
+    <subchannel color="0" headOffset="48">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="x80_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" headOffset="96">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="x80_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" headOffset="48">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="x80_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="RGB" text="Three Color Composite" InkID="CMYK">
+  <Channels>
+   <channel name="x80_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" headOffset="96">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="x80_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" headOffset="48">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="x80_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="x80_cyan" index="0">
+    <subchannel color="2" headOffset="96">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="x80_magenta" index="1">
+    <subchannel color="1" headOffset="48">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="x80_yellow" index="2">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="x80_black" index="0">
+    <subchannel color="0" headOffset="48">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="x80_cyan" index="1">
+    <subchannel color="2" headOffset="96">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="x80_magenta" index="2">
+    <subchannel color="1" headOffset="48">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="x80_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+</escp2:InkGroup>
+</gutenprint>
diff --git a/src/xml/escp2/inputslots/Makefile.am b/src/xml/escp2/inputslots/Makefile.am
new file mode 100644
index 0000000..942922a
--- /dev/null
+++ b/src/xml/escp2/inputslots/Makefile.am
@@ -0,0 +1,50 @@
+## $Id: Makefile.am,v 1.2 2008/06/10 13:10:25 rlk Exp $
+## Copyright (C) 2008 Robert Krawitz
+##
+## 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, 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.
+
+## Process this file with automake to produce Makefile.in.
+
+@SET_MAKE@
+
+include $(top_srcdir)/scripts/global.mk
+
+## Variables
+
+pkgxmldatadir = $(pkgdatadir)/@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@/xml/escp2/inputslots
+
+pkgxmldata_DATA =				\
+	b500.xml				\
+	cd_cutter_roll_feed.xml			\
+	cd_roll_feed.xml			\
+	cutter_roll_feed.xml			\
+	default.xml				\
+	pro_roll_feed.xml			\
+	r1800.xml				\
+	r2400.xml				\
+	rx700.xml				\
+	spro5000.xml				\
+	standard_roll_feed.xml
+
+xml-stamp: $(pkgxmldata_DATA) Makefile.am
+	-rm -f xml-stamp
+	touch xml-stamp
+	for f in $(pkgxmldata_DATA) ; do echo $$f >> xml-stamp; done
+
+all-local: xml-stamp
+
+CLEANFILES = xmli18n-tmp.h xml-stamp
+
+EXTRA_DIST = $(pkgxmldata_DATA)
diff --git a/src/xml/escp2/inputslots/Makefile.in b/src/xml/escp2/inputslots/Makefile.in
new file mode 100644
index 0000000..8f0043f
--- /dev/null
+++ b/src/xml/escp2/inputslots/Makefile.in
@@ -0,0 +1,504 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# Variables
+
+#export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
+#export STP_DATA_PATH = $(top_srcdir)/src/xml
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(top_srcdir)/scripts/global.mk
+subdir = src/xml/escp2/inputslots
+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
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(pkgxmldatadir)"
+pkgxmldataDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(pkgxmldata_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_CUPS_PPDS = @BUILD_CUPS_PPDS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CONVERT = @CONVERT@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+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@
+DB2PS = @DB2PS@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DIALOG = @DIALOG@
+DOXYGEN = @DOXYGEN@
+DSYMUTIL = @DSYMUTIL@
+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@
+FIND = @FIND@
+FOOMATIC_CONFIGURE = @FOOMATIC_CONFIGURE@
+FOOMATIC_KITLOAD = @FOOMATIC_KITLOAD@
+FOOMATIC_PPDFILE = @FOOMATIC_PPDFILE@
+GENPPD_LIBS = @GENPPD_LIBS@
+GIMP2_CFLAGS = @GIMP2_CFLAGS@
+GIMP2_LIBS = @GIMP2_LIBS@
+GIMPTOOL2_CHECK = @GIMPTOOL2_CHECK@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GNUCFLAGS = @GNUCFLAGS@
+GREP = @GREP@
+GTK2_CFLAGS = @GTK2_CFLAGS@
+GTK2_LIBS = @GTK2_LIBS@
+GUTENPRINTUI2_BINARY_AGE = @GUTENPRINTUI2_BINARY_AGE@
+GUTENPRINTUI2_CFLAGS = @GUTENPRINTUI2_CFLAGS@
+GUTENPRINTUI2_CURRENT_INTERFACE = @GUTENPRINTUI2_CURRENT_INTERFACE@
+GUTENPRINTUI2_INTERFACE_AGE = @GUTENPRINTUI2_INTERFACE_AGE@
+GUTENPRINTUI2_LIBDEPS = @GUTENPRINTUI2_LIBDEPS@
+GUTENPRINTUI2_LIBS = $(top_builddir)/src/gutenprintui2/libgutenprintui2.la
+GUTENPRINTUI2_VERSION = @GUTENPRINTUI2_VERSION@
+GUTENPRINT_BINARY_AGE = @GUTENPRINT_BINARY_AGE@
+GUTENPRINT_CFLAGS = @GUTENPRINT_CFLAGS@
+GUTENPRINT_CURRENT_INTERFACE = @GUTENPRINT_CURRENT_INTERFACE@
+GUTENPRINT_INTERFACE_AGE = @GUTENPRINT_INTERFACE_AGE@
+GUTENPRINT_LIBDEPS = @GUTENPRINT_LIBDEPS@
+
+# Libraries
+GUTENPRINT_LIBS = $(top_builddir)/src/main/libgutenprint.la
+GUTENPRINT_MAJOR_VERSION = @GUTENPRINT_MAJOR_VERSION@
+GUTENPRINT_MICRO_VERSION = @GUTENPRINT_MICRO_VERSION@
+GUTENPRINT_MINOR_VERSION = @GUTENPRINT_MINOR_VERSION@
+GUTENPRINT_VERSION = @GUTENPRINT_VERSION@
+IJS_CFLAGS = @IJS_CFLAGS@
+IJS_CONFIG = @IJS_CONFIG@
+IJS_LIBS = @IJS_LIBS@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBREADLINE_DEPS = @LIBREADLINE_DEPS@
+LIBS = $(INTLLIBS) @LIBS@
+LIBTOOL = @LIBTOOL@
+LIBTOOL_DEPS = @LIBTOOL_DEPS@
+LN_S = @LN_S@
+LTALLOCA = @LTALLOCA@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PKG_CONFIG = @PKG_CONFIG@
+PLUG_IN_PATH = @PLUG_IN_PATH@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+RELEASE_DATE = @RELEASE_DATE@
+RM = @RM@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TEST = @TEST@
+TEXI2HTML = @TEXI2HTML@
+TRUE = @TRUE@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WHICH_PPDS = @WHICH_PPDS@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+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@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+cups_bindir = @cups_bindir@
+cups_conf_datadir = @cups_conf_datadir@
+cups_conf_serverbin = @cups_conf_serverbin@
+cups_conf_serverroot = @cups_conf_serverroot@
+cups_exec_prefix = @cups_exec_prefix@
+cups_prefix = @cups_prefix@
+cups_sbindir = @cups_sbindir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+gimp2_plug_indir = @gimp2_plug_indir@
+gutenprint_cflags = @gutenprint_cflags@
+gutenprint_libdeps = @gutenprint_libdeps@
+gutenprint_libs = @gutenprint_libs@
+gutenprintui2_cflags = @gutenprintui2_cflags@
+gutenprintui2_libdeps = @gutenprintui2_libdeps@
+gutenprintui2_libs = @gutenprintui2_libs@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+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/inputslots
+pkgxmldata_DATA = \
+	b500.xml				\
+	cd_cutter_roll_feed.xml			\
+	cd_roll_feed.xml			\
+	cutter_roll_feed.xml			\
+	default.xml				\
+	pro_roll_feed.xml			\
+	r1800.xml				\
+	r2400.xml				\
+	rx700.xml				\
+	spro5000.xml				\
+	standard_roll_feed.xml
+
+CLEANFILES = xmli18n-tmp.h xml-stamp
+EXTRA_DIST = $(pkgxmldata_DATA)
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/scripts/global.mk $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/xml/escp2/inputslots/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  src/xml/escp2/inputslots/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-pkgxmldataDATA: $(pkgxmldata_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(pkgxmldatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgxmldatadir)"
+	@list='$(pkgxmldata_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(pkgxmldataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgxmldatadir)/$$f'"; \
+	  $(pkgxmldataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgxmldatadir)/$$f"; \
+	done
+
+uninstall-pkgxmldataDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(pkgxmldata_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(pkgxmldatadir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(pkgxmldatadir)/$$f"; \
+	done
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA) all-local
+installdirs:
+	for dir in "$(DESTDIR)$(pkgxmldatadir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-pkgxmldataDATA
+
+install-dvi: install-dvi-am
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-info: install-info-am
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+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 \
+	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 \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am uninstall uninstall-am uninstall-pkgxmldataDATA
+
+
+@SET_MAKE@
+
+# Rules
+
+$(top_builddir)/src/main/libgutenprint.la:
+	cd $(top_builddir)/src/main; \
+	$(MAKE)
+
+$(top_builddir)/src/gutenprintui/libgutenprintui.la:
+	cd $(top_builddir)/src/gutenprintui; \
+	$(MAKE)
+
+$(top_builddir)/src/gutenprintui2/libgutenprintui2.la:
+	cd $(top_builddir)/src/gutenprintui2; \
+	$(MAKE)
+
+xml-stamp: $(pkgxmldata_DATA) Makefile.am
+	-rm -f xml-stamp
+	touch xml-stamp
+	for f in $(pkgxmldata_DATA) ; do echo $$f >> xml-stamp; done
+
+all-local: 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/b500.xml b/src/xml/escp2/inputslots/b500.xml
new file mode 100644
index 0000000..9e9652a
--- /dev/null
+++ b/src/xml/escp2/inputslots/b500.xml
@@ -0,0 +1,35 @@
+<?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="b500">
+
+ <slot translate="text" name="Rear" text="Rear Tray">
+  <Duplex><Tumble/></Duplex>
+  <InitSequence>PP\003\000\000\001\000</InitSequence>
+ </slot>
+
+ <slot translate="text" name="Front" text="Front Tray">
+  <Duplex><Tumble/></Duplex>
+  <InitSequence>PP\003\000\000\001\001</InitSequence>
+ </slot>
+</escp2:InputSlots>
+</gutenprint>
diff --git a/src/xml/escp2/inputslots/cd_cutter_roll_feed.xml b/src/xml/escp2/inputslots/cd_cutter_roll_feed.xml
new file mode 100644
index 0000000..cd702fe
--- /dev/null
+++ b/src/xml/escp2/inputslots/cd_cutter_roll_feed.xml
@@ -0,0 +1,53 @@
+<?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="cd_cutter_roll_feed">
+
+ <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="Manual" text="Manual Feed">
+  <InitSequence>PM\002\000\000\000IR\002\000\000\001EX\006\000\000\000\000\000\005\000FP\003\000\000\000\000PP\003\000\000\002\001</InitSequence>
+  <DeinitSequence>IR\002\000\000\000</DeinitSequence>
+ </slot>
+
+ <slot translate="text" name="CD" text="Print to CD">
+  <CD/>
+  <InitSequence>PM\002\000\000\000IR\002\000\000\001EX\006\000\000\000\000\000\005\000FP\003\000\000\000\000PP\003\000\000\002\001</InitSequence>
+  <DeinitSequence>IR\002\000\000\000</DeinitSequence>
+ </slot>
+
+ <slot translate="text" name="RollCutPage" text="Roll Feed (cut each page)">
+  <RollFeed><CutAll/></RollFeed>
+  <InitSequence>IR\002\000\000\001EX\006\000\000\000\000\000\005\001PP\003\000\000\001\377</InitSequence>
+  <DeinitSequence>IR\002\000\000\002</DeinitSequence>
+ </slot>
+
+ <slot translate="text" name="RollCutNone" text="Roll Feed (do not cut)">
+  <RollFeed><DontEject/></RollFeed>
+  <InitSequence>IR\002\000\000\001EX\006\000\000\000\000\000\005\001PP\003\000\000\001\377</InitSequence>
+  <DeinitSequence>IR\002\000\000\002</DeinitSequence>
+ </slot>
+</escp2:InputSlots>
+</gutenprint>
diff --git a/src/xml/escp2/inputslots/cd_roll_feed.xml b/src/xml/escp2/inputslots/cd_roll_feed.xml
new file mode 100644
index 0000000..259ac2d
--- /dev/null
+++ b/src/xml/escp2/inputslots/cd_roll_feed.xml
@@ -0,0 +1,47 @@
+<?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="cd_roll_feed">
+
+ <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="Manual" text="Manual Feed">
+  <InitSequence>PM\002\000\000\000IR\002\000\000\001EX\006\000\000\000\000\000\005\000FP\003\000\000\000\000PP\003\000\000\002\001</InitSequence>
+  <DeinitSequence>IR\002\000\000\000</DeinitSequence>
+ </slot>
+
+ <slot translate="text" name="CD" text="Print to CD">
+  <CD/>
+  <InitSequence>PM\002\000\000\000IR\002\000\000\001EX\006\000\000\000\000\000\005\000FP\003\000\000\000\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\001\377</InitSequence>
+  <DeinitSequence>IR\002\000\000\002</DeinitSequence>
+ </slot>
+</escp2:InputSlots>
+</gutenprint>
diff --git a/src/xml/escp2/inputslots/cutter_roll_feed.xml b/src/xml/escp2/inputslots/cutter_roll_feed.xml
new file mode 100644
index 0000000..f316783
--- /dev/null
+++ b/src/xml/escp2/inputslots/cutter_roll_feed.xml
@@ -0,0 +1,42 @@
+<?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="cutter_roll_feed">
+
+ <slot translate="text" name="Standard" text="Standard">
+  <InitSequence>IR\002\000\000\001EX\006\000\000\000\000\000\005\000</InitSequence>
+  <DeinitSequence>IR\002\000\000\000</DeinitSequence>
+ </slot>
+
+ <slot translate="text" name="RollCutPage" text="Roll Feed (cut each page)">
+  <RollFeed><CutAll/></RollFeed>
+  <InitSequence>IR\002\000\000\001EX\006\000\000\000\000\000\005\001</InitSequence>
+  <DeinitSequence>IR\002\000\000\002</DeinitSequence>
+ </slot>
+
+ <slot translate="text" name="RollCutNone" text="Roll Feed (do not cut)">
+  <RollFeed><DontEject/></RollFeed>
+  <InitSequence>IR\002\000\000\001EX\006\000\000\000\000\000\005\001</InitSequence>
+  <DeinitSequence>IR\002\000\000\002</DeinitSequence>
+ </slot>
+</escp2:InputSlots>
+</gutenprint>
diff --git a/src/xml/escp2/inputslots/default.xml b/src/xml/escp2/inputslots/default.xml
new file mode 100644
index 0000000..44e829c
--- /dev/null
+++ b/src/xml/escp2/inputslots/default.xml
@@ -0,0 +1,24 @@
+<?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="default"/>
+</gutenprint>
diff --git a/src/xml/escp2/inputslots/pro_roll_feed.xml b/src/xml/escp2/inputslots/pro_roll_feed.xml
new file mode 100644
index 0000000..98cf0b7
--- /dev/null
+++ b/src/xml/escp2/inputslots/pro_roll_feed.xml
@@ -0,0 +1,34 @@
+<?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="pro_roll_feed">
+
+ <slot translate="text" name="Standard" text="Standard">
+  <InitSequence>PP\003\000\000\002\000</InitSequence>
+ </slot>
+
+ <slot translate="text" name="Roll" text="Roll Feed">
+  <RollFeed/>
+  <InitSequence>PP\003\000\000\003\000</InitSequence>
+ </slot>
+</escp2:InputSlots>
+</gutenprint>
diff --git a/src/xml/escp2/inputslots/r1800.xml b/src/xml/escp2/inputslots/r1800.xml
new file mode 100644
index 0000000..f8ad994
--- /dev/null
+++ b/src/xml/escp2/inputslots/r1800.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="r1800">
+
+ <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="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>
+
+ <slot translate="text" name="CD" text="Print to CD">
+  <CD/>
+  <InitSequence>PM\002\000\000\000IR\002\000\000\001EX\006\000\000\000\000\000\005\000FP\003\000\000\000\000PP\003\000\000\002\001</InitSequence>
+  <DeinitSequence>IR\002\000\000\000</DeinitSequence>
+ </slot>
+</escp2:InputSlots>
+</gutenprint>
diff --git a/src/xml/escp2/inputslots/r2400.xml b/src/xml/escp2/inputslots/r2400.xml
new file mode 100644
index 0000000..4d94dcf
--- /dev/null
+++ b/src/xml/escp2/inputslots/r2400.xml
@@ -0,0 +1,46 @@
+<?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="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/inputslots/rx700.xml b/src/xml/escp2/inputslots/rx700.xml
new file mode 100644
index 0000000..de405dd
--- /dev/null
+++ b/src/xml/escp2/inputslots/rx700.xml
@@ -0,0 +1,46 @@
+<?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="rx700">
+
+ <slot translate="text" name="Rear" text="Rear Tray">
+  <InitSequence>IR\002\000\000\001EX\006\000\000\000\000\000\005\000PP\003\000\000\001\000</InitSequence>
+  <DeinitSequence>IR\002\000\000\000</DeinitSequence>
+ </slot>
+
+ <slot translate="text" name="Front" text="Front Tray">
+  <InitSequence>IR\002\000\000\001EX\006\000\000\000\000\000\005\000PP\003\000\000\001\001</InitSequence>
+  <DeinitSequence>IR\002\000\000\000</DeinitSequence>
+ </slot>
+
+ <slot translate="text" name="CD" text="Print to CD">
+  <CD/>
+  <InitSequence>PM\002\000\000\000IR\002\000\000\001EX\006\000\000\000\000\000\005\000FP\003\000\000\000\000PP\003\000\000\002\001</InitSequence>
+  <DeinitSequence>IR\002\000\000\000</DeinitSequence>
+ </slot>
+
+ <slot translate="text" name="PhotoBoard" text="Photo Board">
+  <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>
+</escp2:InputSlots>
+</gutenprint>
diff --git a/src/xml/escp2/inputslots/spro5000.xml b/src/xml/escp2/inputslots/spro5000.xml
new file mode 100644
index 0000000..0900d1a
--- /dev/null
+++ b/src/xml/escp2/inputslots/spro5000.xml
@@ -0,0 +1,41 @@
+<?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="spro5000">
+
+ <slot translate="text" name="CutSheet1" text="Cut Sheet Bin 1">
+  <InitSequence>PP\003\000\000\001\001</InitSequence>
+ </slot>
+
+ <slot translate="text" name="CutSheet2" text="Cut Sheet Bin 2">
+  <InitSequence>PP\003\000\000\002\001</InitSequence>
+ </slot>
+
+ <slot translate="text" name="CutSheetAuto" text="Cut Sheet Autoselect">
+  <InitSequence>PP\003\000\000\001\377</InitSequence>
+ </slot>
+
+ <slot translate="text" name="ManualSelect" text="Manual Selection">
+  <InitSequence>PP\003\000\000\002\001</InitSequence>
+</slot>
+</escp2:InputSlots>
+</gutenprint>
diff --git a/src/xml/escp2/inputslots/standard_roll_feed.xml b/src/xml/escp2/inputslots/standard_roll_feed.xml
new file mode 100644
index 0000000..818310e
--- /dev/null
+++ b/src/xml/escp2/inputslots/standard_roll_feed.xml
@@ -0,0 +1,36 @@
+ <?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="standard_roll_feed">
+
+ <slot translate="text" name="Standard" text="Standard">
+  <InitSequence>IR\002\000\000\001EX\006\000\000\000\000\000\005\000</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\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
new file mode 100644
index 0000000..759b709
--- /dev/null
+++ b/src/xml/escp2/media/Makefile.am
@@ -0,0 +1,75 @@
+## $Id: Makefile.am,v 1.8 2008/10/19 13:57:27 rlk Exp $
+## Copyright (C) 2008 Robert Krawitz
+##
+## 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, 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.
+
+## Process this file with automake to produce Makefile.in.
+
+@SET_MAKE@
+
+include $(top_srcdir)/scripts/global.mk
+
+## Variables
+
+pkgxmldatadir = $(pkgdatadir)/@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@/xml/escp2/media
+
+pkgxmldata_DATA =				\
+	b500.xml				\
+	c120.xml				\
+	c64.xml					\
+	c80.xml					\
+	c82.xml					\
+	claria.xml				\
+	claria1400.xml				\
+	cmy.xml					\
+	cmykrb.xml				\
+	cmykro.xml				\
+	cx3650.xml				\
+	f360.xml				\
+	f360_photo.xml				\
+	f360_photo7_japan.xml			\
+	f360_ultrachrome.xml			\
+	f360_ultrachrome_k3.xml			\
+	photo_gen0.xml				\
+	photo_gen1.xml				\
+	photo_gen2.xml				\
+	photo_gen3.xml				\
+	photo_gen3_4.xml			\
+	photo_gen4.xml				\
+	photo_pigment.xml			\
+	picturemate_4.xml			\
+	picturemate_6.xml			\
+	pro_gen1.xml				\
+	pro_gen2.xml				\
+	pro_pigment.xml				\
+	pro_ultrachrome.xml			\
+	pro_ultrachrome_k3.xml			\
+	r800.xml				\
+	standard.xml				\
+	standard_gen0.xml			\
+	ultrachrome.xml				\
+	wf500.xml				\
+	x80.xml
+
+xml-stamp: $(pkgxmldata_DATA) Makefile.am
+	-rm -f xml-stamp
+	touch xml-stamp
+	for f in $(pkgxmldata_DATA) ; do echo $$f >> xml-stamp; done
+
+all-local: xml-stamp
+
+CLEANFILES = xmli18n-tmp.h xml-stamp
+
+EXTRA_DIST = $(pkgxmldata_DATA)
diff --git a/src/xml/escp2/media/Makefile.in b/src/xml/escp2/media/Makefile.in
new file mode 100644
index 0000000..085fb09
--- /dev/null
+++ b/src/xml/escp2/media/Makefile.in
@@ -0,0 +1,529 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# Variables
+
+#export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
+#export STP_DATA_PATH = $(top_srcdir)/src/xml
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(top_srcdir)/scripts/global.mk
+subdir = src/xml/escp2/media
+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
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(pkgxmldatadir)"
+pkgxmldataDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(pkgxmldata_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_CUPS_PPDS = @BUILD_CUPS_PPDS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CONVERT = @CONVERT@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+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@
+DB2PS = @DB2PS@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DIALOG = @DIALOG@
+DOXYGEN = @DOXYGEN@
+DSYMUTIL = @DSYMUTIL@
+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@
+FIND = @FIND@
+FOOMATIC_CONFIGURE = @FOOMATIC_CONFIGURE@
+FOOMATIC_KITLOAD = @FOOMATIC_KITLOAD@
+FOOMATIC_PPDFILE = @FOOMATIC_PPDFILE@
+GENPPD_LIBS = @GENPPD_LIBS@
+GIMP2_CFLAGS = @GIMP2_CFLAGS@
+GIMP2_LIBS = @GIMP2_LIBS@
+GIMPTOOL2_CHECK = @GIMPTOOL2_CHECK@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GNUCFLAGS = @GNUCFLAGS@
+GREP = @GREP@
+GTK2_CFLAGS = @GTK2_CFLAGS@
+GTK2_LIBS = @GTK2_LIBS@
+GUTENPRINTUI2_BINARY_AGE = @GUTENPRINTUI2_BINARY_AGE@
+GUTENPRINTUI2_CFLAGS = @GUTENPRINTUI2_CFLAGS@
+GUTENPRINTUI2_CURRENT_INTERFACE = @GUTENPRINTUI2_CURRENT_INTERFACE@
+GUTENPRINTUI2_INTERFACE_AGE = @GUTENPRINTUI2_INTERFACE_AGE@
+GUTENPRINTUI2_LIBDEPS = @GUTENPRINTUI2_LIBDEPS@
+GUTENPRINTUI2_LIBS = $(top_builddir)/src/gutenprintui2/libgutenprintui2.la
+GUTENPRINTUI2_VERSION = @GUTENPRINTUI2_VERSION@
+GUTENPRINT_BINARY_AGE = @GUTENPRINT_BINARY_AGE@
+GUTENPRINT_CFLAGS = @GUTENPRINT_CFLAGS@
+GUTENPRINT_CURRENT_INTERFACE = @GUTENPRINT_CURRENT_INTERFACE@
+GUTENPRINT_INTERFACE_AGE = @GUTENPRINT_INTERFACE_AGE@
+GUTENPRINT_LIBDEPS = @GUTENPRINT_LIBDEPS@
+
+# Libraries
+GUTENPRINT_LIBS = $(top_builddir)/src/main/libgutenprint.la
+GUTENPRINT_MAJOR_VERSION = @GUTENPRINT_MAJOR_VERSION@
+GUTENPRINT_MICRO_VERSION = @GUTENPRINT_MICRO_VERSION@
+GUTENPRINT_MINOR_VERSION = @GUTENPRINT_MINOR_VERSION@
+GUTENPRINT_VERSION = @GUTENPRINT_VERSION@
+IJS_CFLAGS = @IJS_CFLAGS@
+IJS_CONFIG = @IJS_CONFIG@
+IJS_LIBS = @IJS_LIBS@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBREADLINE_DEPS = @LIBREADLINE_DEPS@
+LIBS = $(INTLLIBS) @LIBS@
+LIBTOOL = @LIBTOOL@
+LIBTOOL_DEPS = @LIBTOOL_DEPS@
+LN_S = @LN_S@
+LTALLOCA = @LTALLOCA@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PKG_CONFIG = @PKG_CONFIG@
+PLUG_IN_PATH = @PLUG_IN_PATH@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+RELEASE_DATE = @RELEASE_DATE@
+RM = @RM@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TEST = @TEST@
+TEXI2HTML = @TEXI2HTML@
+TRUE = @TRUE@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WHICH_PPDS = @WHICH_PPDS@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+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@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+cups_bindir = @cups_bindir@
+cups_conf_datadir = @cups_conf_datadir@
+cups_conf_serverbin = @cups_conf_serverbin@
+cups_conf_serverroot = @cups_conf_serverroot@
+cups_exec_prefix = @cups_exec_prefix@
+cups_prefix = @cups_prefix@
+cups_sbindir = @cups_sbindir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+gimp2_plug_indir = @gimp2_plug_indir@
+gutenprint_cflags = @gutenprint_cflags@
+gutenprint_libdeps = @gutenprint_libdeps@
+gutenprint_libs = @gutenprint_libs@
+gutenprintui2_cflags = @gutenprintui2_cflags@
+gutenprintui2_libdeps = @gutenprintui2_libdeps@
+gutenprintui2_libs = @gutenprintui2_libs@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+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 = \
+	b500.xml				\
+	c120.xml				\
+	c64.xml					\
+	c80.xml					\
+	c82.xml					\
+	claria.xml				\
+	claria1400.xml				\
+	cmy.xml					\
+	cmykrb.xml				\
+	cmykro.xml				\
+	cx3650.xml				\
+	f360.xml				\
+	f360_photo.xml				\
+	f360_photo7_japan.xml			\
+	f360_ultrachrome.xml			\
+	f360_ultrachrome_k3.xml			\
+	photo_gen0.xml				\
+	photo_gen1.xml				\
+	photo_gen2.xml				\
+	photo_gen3.xml				\
+	photo_gen3_4.xml			\
+	photo_gen4.xml				\
+	photo_pigment.xml			\
+	picturemate_4.xml			\
+	picturemate_6.xml			\
+	pro_gen1.xml				\
+	pro_gen2.xml				\
+	pro_pigment.xml				\
+	pro_ultrachrome.xml			\
+	pro_ultrachrome_k3.xml			\
+	r800.xml				\
+	standard.xml				\
+	standard_gen0.xml			\
+	ultrachrome.xml				\
+	wf500.xml				\
+	x80.xml
+
+CLEANFILES = xmli18n-tmp.h xml-stamp
+EXTRA_DIST = $(pkgxmldata_DATA)
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/scripts/global.mk $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/xml/escp2/media/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  src/xml/escp2/media/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-pkgxmldataDATA: $(pkgxmldata_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(pkgxmldatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgxmldatadir)"
+	@list='$(pkgxmldata_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(pkgxmldataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgxmldatadir)/$$f'"; \
+	  $(pkgxmldataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgxmldatadir)/$$f"; \
+	done
+
+uninstall-pkgxmldataDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(pkgxmldata_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(pkgxmldatadir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(pkgxmldatadir)/$$f"; \
+	done
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA) all-local
+installdirs:
+	for dir in "$(DESTDIR)$(pkgxmldatadir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-pkgxmldataDATA
+
+install-dvi: install-dvi-am
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-info: install-info-am
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+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 \
+	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 \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am uninstall uninstall-am uninstall-pkgxmldataDATA
+
+
+@SET_MAKE@
+
+# Rules
+
+$(top_builddir)/src/main/libgutenprint.la:
+	cd $(top_builddir)/src/main; \
+	$(MAKE)
+
+$(top_builddir)/src/gutenprintui/libgutenprintui.la:
+	cd $(top_builddir)/src/gutenprintui; \
+	$(MAKE)
+
+$(top_builddir)/src/gutenprintui2/libgutenprintui2.la:
+	cd $(top_builddir)/src/gutenprintui2; \
+	$(MAKE)
+
+xml-stamp: $(pkgxmldata_DATA) Makefile.am
+	-rm -f xml-stamp
+	touch xml-stamp
+	for f in $(pkgxmldata_DATA) ; do echo $$f >> xml-stamp; done
+
+all-local: 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/b500.xml b/src/xml/escp2/media/b500.xml
new file mode 100644
index 0000000..198ec4b
--- /dev/null
+++ b/src/xml/escp2/media/b500.xml
@@ -0,0 +1,895 @@
+<?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="b500">
+<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	0	-0.02	-0.04	-0.08	-0.12	-0.16
+	-0.2	-0.24	-0.28	-0.32	-0.36	-0.37	-0.38	-0.39
+	-0.4	-0.45	-0.5	-0.52	-0.52	-0.5	-0.45	-0.4
+	-0.35	-0.27	-0.15	-0.06	0	0	0	0
+	0	0	-0.03	-0.06	-0.09	-0.13	-0.17	-0.21
+	-0.25	-0.22	-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.63	0.64	0.66	0.69	0.73	0.78	0.82	0.85
+	0.85	0.82	0.78	0.78	0.79	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	1	0.99	0.98	0.97	0.95	0.93
+	0.9	0.76	0.68	0.65	0.64	0.63	0.63	0.63
+   </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.2	1.2	1.3	1.5	1.7	1.9	2	2
+	2	2	2	2	2	2	2	2
+	2	1.8	1.6	1.4	1.2	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1.15	1.4	1.7	2	2.3	2.4	2.4
+	2.4	2.4	2.4	2.3	2	1.7	1.4	1.15
+   </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">0x21</parameter>
+
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720x360hq">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x720hq">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</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="BrightWhite" text="Bright White Paper" class="plain">
+ <parameter type="integer" name="PaperMedia">0</parameter>
+ <parameter type="integer" name="PrintMethod">0x21</parameter>
+
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720x360hq">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x720hq">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</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">
+ <parameter type="integer" name="PaperMedia">5</parameter>
+ <parameter type="integer" name="PrintMethod">0x21</parameter>
+
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720x360hq">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720hq">
+  <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.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</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="Transparency" text="Transparencies" class="transparency">
+ <parameter type="integer" name="PaperMedia">9</parameter>
+ <parameter type="integer" name="PrintMethod">0x51</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.050000</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">
+ <parameter type="integer" name="PaperMedia">37</parameter>
+ <parameter type="integer" name="PrintMethod">0x21</parameter>
+
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720x360hq">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x720hq">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</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">
+ <parameter type="integer" name="PaperMedia">10</parameter>
+ <parameter type="integer" name="PrintMethod">0x52</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.050000</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">
+ <parameter type="integer" name="PaperMedia">128</parameter>
+ <parameter type="integer" name="PrintMethod">0x71</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.850000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.975000</parameter>
+  <parameter type="float" name="YellowBalance">0.975000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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">0x71</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.850000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.975000</parameter>
+  <parameter type="float" name="YellowBalance">0.975000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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">0x21</parameter>
+
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720x360hq">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="1440x720hq">
+  <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="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.850000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</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">
+ <parameter type="integer" name="PaperMedia">1</parameter>
+ <parameter type="integer" name="PrintMethod">0x21</parameter>
+
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720x360hq">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x720hq">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.850000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</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">
+ <parameter type="integer" name="PaperMedia">3</parameter>
+ <parameter type="integer" name="PrintMethod">0x21</parameter>
+
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720x360hq">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="1440x720hq">
+  <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="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.850000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</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">
+ <parameter type="integer" name="PaperMedia">6</parameter>
+ <parameter type="integer" name="PrintMethod">0xb0</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.850000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.800000</parameter>
+  <parameter type="float" name="YellowBalance">0.800000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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">0xb0</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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">0.800000</parameter>
+  <parameter type="float" name="YellowBalance">0.800000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="GlossyPhoto170" text="Premium Glossy Photo Paper 170 wt" class="premium">
+ <parameter type="integer" name="PaperMedia">140</parameter>
+ <parameter type="integer" name="PrintMethod">0xb0</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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">0.800000</parameter>
+  <parameter type="float" name="YellowBalance">0.800000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="GlossyPhoto250" text="Premium Glossy Photo Paper 250 wt" class="premium">
+ <parameter type="integer" name="PaperMedia">137</parameter>
+ <parameter type="integer" name="PrintMethod">0xb0</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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">0.800000</parameter>
+  <parameter type="float" name="YellowBalance">0.800000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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">0xb0</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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">0.800000</parameter>
+  <parameter type="float" name="YellowBalance">0.800000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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">0xb0</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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">0.800000</parameter>
+  <parameter type="float" name="YellowBalance">0.800000</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="Semigloss170" text="Premium Semigloss Photo Paper 170 wt" class="premium">
+ <parameter type="integer" name="PaperMedia">141</parameter>
+ <parameter type="integer" name="PrintMethod">0xb0</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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">0.800000</parameter>
+  <parameter type="float" name="YellowBalance">0.800000</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="Semigloss250" text="Premium Semigloss Photo Paper 250 wt" class="premium">
+ <parameter type="integer" name="PaperMedia">138</parameter>
+ <parameter type="integer" name="PrintMethod">0xb0</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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">0.800000</parameter>
+  <parameter type="float" name="YellowBalance">0.800000</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">0xb0</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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">0.800000</parameter>
+  <parameter type="float" name="YellowBalance">0.800000</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="Luster250" text="Premium Luster Photo Paper 250 wt" class="premium">
+ <parameter type="integer" name="PaperMedia">139</parameter>
+ <parameter type="integer" name="PrintMethod">0xb0</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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">0.800000</parameter>
+  <parameter type="float" name="YellowBalance">0.800000</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">0xb0</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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">0.800000</parameter>
+  <parameter type="float" name="YellowBalance">0.800000</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="photo">
+ <parameter type="integer" name="PaperMedia">19</parameter>
+ <parameter type="integer" name="PrintMethod">0xb0</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.830000</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="ColorLife" text="ColorLife Paper" class="premium">
+ <parameter type="integer" name="PaperMedia">23</parameter>
+ <parameter type="integer" name="PrintMethod">0xb0</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.830000</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">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</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/c120.xml b/src/xml/escp2/media/c120.xml
new file mode 100644
index 0000000..6905b8a
--- /dev/null
+++ b/src/xml/escp2/media/c120.xml
@@ -0,0 +1,1142 @@
+<?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="c120">
+<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	0	-0.02	-0.04	-0.08	-0.12	-0.16
+	-0.2	-0.24	-0.28	-0.32	-0.36	-0.37	-0.38	-0.39
+	-0.4	-0.45	-0.5	-0.52	-0.52	-0.5	-0.45	-0.4
+	-0.35	-0.27	-0.15	-0.06	0	0	0	0
+	0	0	-0.03	-0.06	-0.09	-0.13	-0.17	-0.21
+	-0.25	-0.22	-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.63	0.64	0.66	0.69	0.73	0.78	0.82	0.85
+	0.85	0.82	0.78	0.78	0.79	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	1	0.99	0.98	0.97	0.95	0.93
+	0.9	0.76	0.68	0.65	0.64	0.63	0.63	0.63
+   </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.2	1.2	1.3	1.5	1.7	1.9	2	2
+	2	2	2	2	2	2	2	2
+	2	1.8	1.6	1.4	1.2	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1.15	1.4	1.7	2	2.3	2.4	2.4
+	2.4	2.4	2.4	2.3	2	1.7	1.4	1.15
+   </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">0x30</parameter>
+
+ <resolution name="360x120sw">
+  <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">0x10</parameter>
+ </resolution>
+ <resolution name="360hq">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720x360hq">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</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">
+ <parameter type="integer" name="PaperMedia">5</parameter>
+ <parameter type="integer" name="PrintMethod">0x30</parameter>
+
+ <resolution name="360x120sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="360hq">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="720x360hq">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <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">0x52</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</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">
+ <parameter type="integer" name="PaperMedia">7</parameter>
+ <parameter type="integer" name="PrintMethod">0x30</parameter>
+
+ <resolution name="360x120sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="360hq">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720x360hq">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <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.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</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">
+ <parameter type="integer" name="PaperMedia">9</parameter>
+ <parameter type="integer" name="PrintMethod">0x30</parameter>
+
+ <resolution name="360x120sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="360hq">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720x360hq">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <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.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</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">
+ <parameter type="integer" name="PaperMedia">37</parameter>
+ <parameter type="integer" name="PrintMethod">0x30</parameter>
+
+ <resolution name="360x120sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="360hq">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720x360hq">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</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">
+ <parameter type="integer" name="PaperMedia">10</parameter>
+ <parameter type="integer" name="PrintMethod">0x30</parameter>
+
+ <resolution name="360x120sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="360hq">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720x360hq">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <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.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</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">
+ <parameter type="integer" name="PaperMedia">0</parameter>
+ <parameter type="integer" name="PrintMethod">0x30</parameter>
+
+ <resolution name="360x120sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="360hq">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="720x360hq">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <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">0x52</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.850000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.975000</parameter>
+  <parameter type="float" name="YellowBalance">0.975000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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">0x30</parameter>
+
+ <resolution name="360x120sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="360hq">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720x360hq">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.850000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.975000</parameter>
+  <parameter type="float" name="YellowBalance">0.975000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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">0x30</parameter>
+
+ <resolution name="360x120sw">
+  <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">0x10</parameter>
+ </resolution>
+ <resolution name="360hq">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720x360hq">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.850000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</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">
+ <parameter type="integer" name="PaperMedia">3</parameter>
+ <parameter type="integer" name="PrintMethod">0x30</parameter>
+
+ <resolution name="360x120sw">
+  <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">0x10</parameter>
+ </resolution>
+ <resolution name="360hq">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720x360hq">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.850000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</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">
+ <parameter type="integer" name="PaperMedia">6</parameter>
+ <parameter type="integer" name="PrintMethod">0x30</parameter>
+
+ <resolution name="360x120sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="360hq">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="720x360hq">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0xa0</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="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.850000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.800000</parameter>
+  <parameter type="float" name="YellowBalance">0.800000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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">0x30</parameter>
+
+ <resolution name="360x120sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="360hq">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="720x360hq">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0xa0</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="None" text="EPSON Standard Inks">
+  <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">0.800000</parameter>
+  <parameter type="float" name="YellowBalance">0.800000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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">0x30</parameter>
+
+ <resolution name="360x120sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="360hq">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="720x360hq">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0xa0</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="None" text="EPSON Standard Inks">
+  <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">0.800000</parameter>
+  <parameter type="float" name="YellowBalance">0.800000</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">0x30</parameter>
+
+ <resolution name="360x120sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="360hq">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="720x360hq">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0xa0</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="None" text="EPSON Standard Inks">
+  <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">0.800000</parameter>
+  <parameter type="float" name="YellowBalance">0.800000</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="photo">
+ <parameter type="integer" name="PaperMedia">19</parameter>
+ <parameter type="integer" name="PrintMethod">0x30</parameter>
+
+ <resolution name="360x120sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="360hq">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="720x360hq">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0xa0</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="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.830000</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="ColorLife" text="ColorLife Paper" class="premium">
+ <parameter type="integer" name="PaperMedia">22</parameter>
+ <parameter type="integer" name="PrintMethod">0x30</parameter>
+
+ <resolution name="360x120sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="360hq">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="720x360hq">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0xa0</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="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.830000</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">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</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/c64.xml b/src/xml/escp2/media/c64.xml
new file mode 100644
index 0000000..86698bb
--- /dev/null
+++ b/src/xml/escp2/media/c64.xml
@@ -0,0 +1,788 @@
+<?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="c64">
+<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	0	-0.02	-0.04	-0.08	-0.12	-0.16
+	-0.2	-0.24	-0.28	-0.32	-0.32	-0.32	-0.32	-0.32
+	-0.36	-0.4	-0.44	-0.48	-0.5	-0.45	-0.4	-0.3
+	-0.12	-0.07	-0.04	-0.02	0	0	0	0
+	0	0	-0.03	-0.06	-0.09	-0.13	-0.17	-0.21
+	-0.25	-0.22	-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.56	0.58	0.62	0.68	0.73	0.78	0.82	0.85
+	0.85	0.82	0.78	0.78	0.79	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	1	0.99	0.98	0.97	0.95	0.93
+	0.9	0.76	0.65	0.58	0.58	0.57	0.56	0.56
+   </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.2	1.2	1.3	1.5	1.7	1.9	2	2
+	2	2	2	2	2	2	2	2
+	2	1.8	1.6	1.4	1.2	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1.15	1.4	1.7	2	2.3	2.4	2.4
+	2.4	2.4	2.4	2.3	2	1.7	1.4	1.15
+   </sequence>
+  </curve>
+ </namedParam>
+</Curves>
+<paper translate="text" name="Plain" text="Plain Paper" class="plain">
+ <parameter type="integer" name="FeedSequence">1</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</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="Quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">5</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</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="Quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">2</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.050000</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="Quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">3</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.800000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</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="Quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">3</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.800000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</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="Quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">4</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.050000</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="Quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">6</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.800000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</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="Quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.900000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.975000</parameter>
+  <parameter type="float" name="YellowBalance">0.975000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="Quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.900000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.975000</parameter>
+  <parameter type="float" name="YellowBalance">0.975000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="Quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</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="Quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</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="Quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</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="Quadtone" text="Quadtone">
+  <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"
+class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</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">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>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <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"
+class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</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">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>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</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">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>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <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"
+class="photo">
+ <parameter type="integer" name="FeedSequence">6</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</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="Quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</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="Quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</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="Quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">0</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.050000</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="Quadtone" text="Quadtone">
+  <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
new file mode 100644
index 0000000..5a3bbc8
--- /dev/null
+++ b/src/xml/escp2/media/c80.xml
@@ -0,0 +1,790 @@
+<?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="c80">
+<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	0	-0.02	-0.04	-0.08	-0.12	-0.16
+	-0.2	-0.24	-0.28	-0.32	-0.32	-0.32	-0.32	-0.32
+	-0.36	-0.4	-0.44	-0.48	-0.5	-0.45	-0.4	-0.3
+	-0.12	-0.07	-0.04	-0.02	0	0	0	0
+	0	0	-0.03	-0.06	-0.09	-0.13	-0.17	-0.21
+	-0.25	-0.22	-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.56	0.58	0.62	0.68	0.73	0.78	0.82	0.85
+	0.85	0.82	0.78	0.78	0.79	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	1	0.99	0.98	0.97	0.95	0.93
+	0.9	0.76	0.65	0.58	0.58	0.57	0.56	0.56
+   </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.2	1.2	1.3	1.5	1.7	1.9	2	2
+	2	2	2	2	2	2	2	2
+	2	1.8	1.6	1.4	1.2	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1.15	1.4	1.7	2	2.3	2.4	2.4
+	2.4	2.4	2.4	2.3	2	1.7	1.4	1.15
+   </sequence>
+  </curve>
+ </namedParam>
+</Curves>
+<paper translate="text" name="Plain" text="Plain Paper" class="plain">
+ <parameter type="integer" name="FeedSequence">1</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</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="Quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">5</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</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="Quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">2</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.050000</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="Quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">3</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.800000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</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="Quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">3</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.800000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</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="Quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">4</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.050000</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="Quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">6</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.800000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</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="Quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.900000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.975000</parameter>
+  <parameter type="float" name="YellowBalance">0.975000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.100000</parameter>
+  <parameter 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="Quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.900000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.975000</parameter>
+  <parameter type="float" name="YellowBalance">0.975000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="Quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</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="Quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</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.100000</parameter>
+  <parameter 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="Quadtone" text="Quadtone">
+  <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"
+PreferredInktype="RGB">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</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="Quadtone" text="Quadtone">
+  <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"
+class="premium" PreferredInktype="RGB">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</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">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>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <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"
+class="premium" PreferredInktype="RGB">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</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">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>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <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"
+PreferredInktype="RGB">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</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">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>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <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"
+class="photo" PreferredInktype="RGB">
+ <parameter type="integer" name="FeedSequence">6</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</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="Quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</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="Quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</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="Quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">0</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.050000</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="Quadtone" text="Quadtone">
+  <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
new file mode 100644
index 0000000..0e084c7
--- /dev/null
+++ b/src/xml/escp2/media/c82.xml
@@ -0,0 +1,788 @@
+<?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="c82">
+<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	0	-0.02	-0.04	-0.08	-0.12	-0.16
+	-0.2	-0.24	-0.28	-0.32	-0.32	-0.32	-0.32	-0.32
+	-0.36	-0.4	-0.44	-0.48	-0.5	-0.45	-0.4	-0.3
+	-0.12	-0.07	-0.04	-0.02	0	0	0	0
+	0	0	-0.03	-0.06	-0.09	-0.13	-0.17	-0.21
+	-0.25	-0.22	-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.56	0.58	0.62	0.68	0.73	0.78	0.82	0.85
+	0.85	0.82	0.78	0.78	0.79	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	1	0.99	0.98	0.97	0.95	0.93
+	0.9	0.76	0.65	0.58	0.58	0.57	0.56	0.56
+   </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.2	1.2	1.3	1.5	1.7	1.9	2	2
+	2	2	2	2	2	2	2	2
+	2	1.8	1.6	1.4	1.2	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1.15	1.4	1.7	2	2.3	2.4	2.4
+	2.4	2.4	2.4	2.3	2	1.7	1.4	1.15
+   </sequence>
+  </curve>
+ </namedParam>
+</Curves>
+<paper translate="text" name="Plain" text="Plain Paper" class="plain">
+ <parameter type="integer" name="FeedSequence">1</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</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="Quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">5</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</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="Quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">2</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.050000</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="Quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">3</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.800000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</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="Quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">3</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.800000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</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="Quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">4</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.050000</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="Quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">6</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.800000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</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="Quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.900000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.975000</parameter>
+  <parameter type="float" name="YellowBalance">0.975000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="Quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.900000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.975000</parameter>
+  <parameter type="float" name="YellowBalance">0.975000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="Quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</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="Quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</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="Quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</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="Quadtone" text="Quadtone">
+  <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"
+class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</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">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>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <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"
+class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</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">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>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</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">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>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <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"
+class="photo">
+ <parameter type="integer" name="FeedSequence">6</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</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="Quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</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="Quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</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="Quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">0</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.050000</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="Quadtone" text="Quadtone">
+  <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/claria.xml b/src/xml/escp2/media/claria.xml
new file mode 100644
index 0000000..101bf57
--- /dev/null
+++ b/src/xml/escp2/media/claria.xml
@@ -0,0 +1,1261 @@
+<?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">0x41</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">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</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">0x41</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">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</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">0x41</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">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</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">0x10</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</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.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">0x10</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</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.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">0x41</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">0x10</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">0x10</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</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.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">0x41</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">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x54</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">0x54</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">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</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">0x54</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">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</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">0x41</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">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</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">0x54</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">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</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">0x54</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">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x42</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</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">0x54</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">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x42</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</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">0x54</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">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x42</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</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">0x54</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">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x42</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</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">0x54</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">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x42</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</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">0x54</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">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x42</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</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">0x54</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">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x42</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</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">0x54</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">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x42</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</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">0x54</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">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x42</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</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/claria1400.xml b/src/xml/escp2/media/claria1400.xml
new file mode 100644
index 0000000..94da1cb
--- /dev/null
+++ b/src/xml/escp2/media/claria1400.xml
@@ -0,0 +1,1260 @@
+<?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">0x41</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">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</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">0x41</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">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</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">0x41</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">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</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">0x10</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</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.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">0x10</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</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.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">0x41</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">0x10</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">0x10</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</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.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">0x41</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">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x54</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">0x54</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">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</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">0x54</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">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</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">0x41</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">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</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">0x54</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">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</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">0x54</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">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</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">0x54</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">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</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">0x54</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">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</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">0x54</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">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</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">0x54</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">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</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">0x54</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">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</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">0x54</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">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</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">0x54</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">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</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">0x54</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">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</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/cmy.xml b/src/xml/escp2/media/cmy.xml
new file mode 100644
index 0000000..300da1e
--- /dev/null
+++ b/src/xml/escp2/media/cmy.xml
@@ -0,0 +1,446 @@
+<?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="cmy">
+<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	0	-0.02	-0.04	-0.08	-0.12	-0.16
+	-0.2	-0.24	-0.28	-0.32	-0.32	-0.32	-0.32	-0.32
+	-0.36	-0.4	-0.44	-0.48	-0.5	-0.45	-0.4	-0.3
+	-0.12	-0.07	-0.04	-0.02	0	0	0	0
+	0	0	-0.03	-0.06	-0.09	-0.13	-0.17	-0.21
+	-0.25	-0.22	-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.56	0.58	0.62	0.68	0.73	0.78	0.82	0.85
+	0.85	0.82	0.78	0.78	0.79	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	1	0.99	0.98	0.97	0.95	0.93
+	0.9	0.76	0.65	0.58	0.58	0.57	0.56	0.56
+   </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.2	1.2	1.3	1.5	1.7	1.9	2	2
+	2	2	2	2	2	2	2	2
+	2	1.8	1.6	1.4	1.2	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1.15	1.4	1.7	2	2.3	2.4	2.4
+	2.4	2.4	2.4	2.3	2	1.7	1.4	1.15
+   </sequence>
+  </curve>
+ </namedParam>
+</Curves>
+<paper translate="text" name="Plain" text="Plain Paper" class="plain">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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"
+class="premium">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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"
+class="premium">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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"
+class="premium">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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/cmykrb.xml b/src/xml/escp2/media/cmykrb.xml
new file mode 100644
index 0000000..22ed8c0
--- /dev/null
+++ b/src/xml/escp2/media/cmykrb.xml
@@ -0,0 +1,1466 @@
+<?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="cmykrb">
+<feature name="PaperMedia"/>
+<feature name="PrintMethod"/>
+<Curves>
+ <namedParam name="cmykrbPhotoHue">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="-6" upper-bound="6">
+	0	-0.07	-0.1	-0.15	-0.19	-0.25	-0.3	-0.35
+	-0.38	-0.38	-0.3	-0.2	-0.1	0	0	0
+	0	0	0	0	0	0	0	0
+	0	0	0	0	0	0	0	0
+	0	0.02	0.05	0.09	0.13	0.15	0.16	0.17
+	0.17	0.17	0.16	0.15	0.13	0.09	0.05	0.02
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="cmykrbPhotoLum">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	0.75	0.75	0.75	0.75	0.76	0.8	0.85	0.9
+	0.9	0.88	0.82	0.85	0.87	0.89	0.91	0.95
+	0.98	0.98	0.97	0.97	0.96	0.96	0.96	0.96
+	0.96	0.97	0.98	0.98	0.99	1	1	1
+	1	1	1	0.99	0.98	0.97	0.96	0.93
+	0.88	0.87	0.86	0.85	0.82	0.79	0.76	0.75
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="cmykrbPhotoSat">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	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.03	1.06	1.09	1.12	1.15	1.18	1.2
+	1.2	1.15	1.1	1.05	1	1	1	1
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="cmykrbMatteHue">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="-6" upper-bound="6">
+	0	-0.07	-0.1	-0.15	-0.19	-0.25	-0.3	-0.35
+	-0.38	-0.38	-0.3	-0.2	-0.1	0	0.02	0.02
+	0	0	0	0	0	0	0	0
+	0	0	0	0	0	0	0	0
+	0	0.02	0.05	0.09	0.13	0.15	0.16	0.17
+	0.17	0.17	0.16	0.15	0.13	0.09	0.05	0.02
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="cmykrbMatteLum">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	0.75	0.75	0.75	0.75	0.76	0.8	0.85	0.9
+	0.9	0.88	0.82	0.78	0.78	0.82	0.85	0.92
+	0.98	0.98	0.97	0.97	0.96	0.96	0.96	0.96
+	0.96	0.97	0.98	0.98	0.99	1	1	1
+	1	1	1	0.99	0.98	0.97	0.96	0.93
+	0.88	0.87	0.86	0.85	0.82	0.79	0.76	0.75
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="cmykrbMatteSat">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	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.03	1.06	1.09	1.12	1.15	1.18	1.2
+	1.2	1.15	1.1	1.05	1	1	1	1
+   </sequence>
+  </curve>
+ </namedParam>
+</Curves>
+<paper translate="text" name="Plain" text="Plain Paper" class="plain" PreferredInkset="r800Matte">
+ <parameter type="integer" name="PaperMedia">0</parameter>
+ <parameter type="integer" name="PrintMethod">0x40</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x22</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">0x70</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+
+ <ink translate="text" name="cmykrbphoto" text="Photo 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.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykrbmatte" 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.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Postcard" text="Postcard" class="plain" PreferredInkset="r800Matte">
+ <parameter type="integer" name="PaperMedia">1</parameter>
+ <parameter type="integer" name="PrintMethod">0x41</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x23</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</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="cmykrbphoto" text="Photo 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.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykrbmatte" 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.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyFilm" text="Glossy Film" class="photo" PreferredInkset="r800Photo">
+ <parameter type="integer" name="PaperMedia">7</parameter>
+ <parameter type="integer" name="PrintMethod">0x40</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x22</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">0x70</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+
+ <ink translate="text" name="cmykrbphoto" text="Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykrbmatte" text="Matte Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Transparency" text="Transparencies" class="transparency" PreferredInkset="r800Photo">
+ <parameter type="integer" name="PaperMedia">9</parameter>
+ <parameter type="integer" name="PrintMethod">0x40</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x22</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">0x70</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+
+ <ink translate="text" name="cmykrbphoto" 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.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykrbmatte" text="Matte Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Envelope" text="Envelopes" class="plain" PreferredInkset="r800Matte">
+ <parameter type="integer" name="PaperMedia">1</parameter>
+ <parameter type="integer" name="PrintMethod">0x41</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x23</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</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="cmykrbphoto" text="Photo 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.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykrbmatte" 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.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="BackFilm" text="Back Light Film" class="transparency" PreferredInkset="r800Photo">
+ <parameter type="integer" name="PaperMedia">10</parameter>
+ <parameter type="integer" name="PrintMethod">0x40</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x22</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">0x70</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+
+ <ink translate="text" name="cmykrbphoto" 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.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykrbmatte" text="Matte Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Matte" text="Matte Paper" class="good" PreferredInkset="r800Matte">
+ <parameter type="integer" name="PaperMedia">3</parameter>
+ <parameter type="integer" name="PrintMethod">0x41</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x23</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</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="cmykrbphoto" text="Photo 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.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykrbmatte" text="Matte Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="MatteHeavy" text="Matte Paper Heavyweight" class="good" PreferredInkset="r800Matte">
+ <parameter type="integer" name="PaperMedia">5</parameter>
+ <parameter type="integer" name="PrintMethod">0x41</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x23</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x72</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x90</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x90</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x90</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x90</parameter>
+ </resolution>
+
+ <ink translate="text" name="cmykrbphoto" text="Photo 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.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykrbmatte" text="Matte Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Inkjet" text="Inkjet Paper" class="good" PreferredInkset="r800Matte">
+ <parameter type="integer" name="PaperMedia">1</parameter>
+ <parameter type="integer" name="PrintMethod">0x41</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x23</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</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="cmykrbphoto" 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.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykrbmatte" text="Matte Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.300000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Coated" text="Photo Quality Inkjet Paper" class="good" PreferredInkset="r800Photo">
+ <parameter type="integer" name="PaperMedia">3</parameter>
+ <parameter type="integer" name="PrintMethod">0x40</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x22</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">0x70</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+
+ <ink translate="text" name="cmykrbphoto" 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.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykrbmatte" text="Matte Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Photo" text="Photo Paper" class="photo" PreferredInkset="r800Photo">
+ <parameter type="integer" name="PaperMedia">6</parameter>
+ <parameter type="integer" name="PrintMethod">0x41</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x23</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x72</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x72</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x72</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x72</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x72</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x72</parameter>
+ </resolution>
+
+ <ink translate="text" name="cmykrbphoto" text="Photo Black">
+  <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.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykrbmatte" text="Matte Black">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyPhoto" text="Premium Glossy Photo Paper" class="premium" PreferredInkset="r800Photo">
+ <parameter type="integer" name="PaperMedia">11</parameter>
+ <parameter type="integer" name="PrintMethod">0x41</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x23</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x73</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x90</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x90</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x90</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x90</parameter>
+ </resolution>
+
+ <ink translate="text" name="cmykrbphoto" text="Photo Black">
+  <parameter type="float" name="Density">0.600000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">2.000000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</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="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykrbmatte" text="Matte Black">
+  <parameter type="float" name="Density">0.546000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</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="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Semigloss" text="Premium Semigloss Photo Paper" class="premium" PreferredInkset="r800Photo">
+ <parameter type="integer" name="PaperMedia">12</parameter>
+ <parameter type="integer" name="PrintMethod">0x41</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x23</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x73</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x90</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x90</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x90</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x90</parameter>
+ </resolution>
+
+ <ink translate="text" name="cmykrbphoto" text="Photo Black">
+  <parameter type="float" name="Density">0.600000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">2.000000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</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="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykrbmatte" text="Matte Black">
+  <parameter type="float" name="Density">0.546000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</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="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Luster" text="Premium Luster Photo Paper" class="premium" PreferredInkset="r800Photo">
+ <parameter type="integer" name="PaperMedia">13</parameter>
+ <parameter type="integer" name="PrintMethod">0x41</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x23</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x73</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x90</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x90</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x90</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x90</parameter>
+ </resolution>
+
+ <ink translate="text" name="cmykrbphoto" text="Photo Black">
+  <parameter type="float" name="Density">0.600000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">2.000000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</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="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykrbmatte" text="Matte Black">
+  <parameter type="float" name="Density">0.546000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</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="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="ArchivalMatte" text="Archival Matte Paper" class="premium" PreferredInkset="r800Matte">
+ <parameter type="integer" name="PaperMedia">15</parameter>
+ <parameter type="integer" name="PrintMethod">0x41</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x23</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x73</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x90</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x90</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x90</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x90</parameter>
+ </resolution>
+
+ <ink translate="text" name="cmykrbphoto" text="Photo 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.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykrbmatte" text="Matte Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="WaterColorRadiant" text="Watercolor Paper - Radiant White" class="premium" PreferredInkset="r800Matte">
+ <parameter type="integer" name="PaperMedia">16</parameter>
+ <parameter type="integer" name="PrintMethod">0x41</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x23</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x73</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x90</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x90</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x90</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x90</parameter>
+ </resolution>
+
+ <ink translate="text" name="cmykrbphoto" text="Photo 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.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykrbmatte" text="Matte Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper" class="photo" PreferredInkset="r800Photo">
+ <parameter type="integer" name="PaperMedia">19</parameter>
+ <parameter type="integer" name="PrintMethod">0x41</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x23</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x72</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x72</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x72</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x72</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x72</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x72</parameter>
+ </resolution>
+
+ <ink translate="text" name="cmykrbphoto" text="Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykrbmatte" text="Matte Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Ilford" text="Ilford Heavy Paper" class="premium" PreferredInkset="r800Matte">
+ <parameter type="integer" name="PaperMedia">15</parameter>
+ <parameter type="integer" name="PrintMethod">0x41</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x23</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x73</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x90</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x90</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x90</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x90</parameter>
+ </resolution>
+
+ <ink translate="text" name="cmykrbphoto" text="Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykrbmatte" text="Matte Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="ColorLife" text="ColorLife Paper" class="premium" PreferredInkset="r800Photo">
+ <parameter type="integer" name="PaperMedia">23</parameter>
+ <parameter type="integer" name="PrintMethod">0x41</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x23</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x73</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x90</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x90</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x90</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x90</parameter>
+ </resolution>
+
+ <ink translate="text" name="cmykrbphoto" text="Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykrbmatte" text="Matte Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Other" text="Other" class="plain" PreferredInkset="r800Matte">
+ <ink translate="text" name="cmykrbphoto" text="Photo 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.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykrbmatte" 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.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbMatteSat"/>
+ </ink>
+</paper>
+</escp2:papers>
+</gutenprint>
diff --git a/src/xml/escp2/media/cmykro.xml b/src/xml/escp2/media/cmykro.xml
new file mode 100644
index 0000000..f923a3a
--- /dev/null
+++ b/src/xml/escp2/media/cmykro.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="cmykro">
+<feature name="PlatenGap"/>
+<feature name="PaperMedia"/>
+<feature name="PrintMethod"/>
+<feature name="FeedSequence"/>
+<Curves>
+ <namedParam name="cmykroPhotoHue">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="-6" upper-bound="6">
+	0	-0.07	-0.1	-0.15	-0.19	-0.25	-0.3	-0.35
+	-0.35	-0.25	-0.17	-0.10	-0.06	-0.03	-0.00	0
+	0	0	0	0	0	0	0	0
+	0	0	0	0	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="cmykroPhotoLum">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	0.75	0.75	0.75	0.75	0.76	0.8	0.85	0.9
+	0.9	0.88	0.82	0.82	0.85	0.88	0.91	0.95
+	0.98	0.98	0.97	0.97	0.96	0.96	0.96	0.96
+	0.96	0.97	0.98	0.98	0.99	1	1	1
+	1	1	1	0.99	0.98	0.97	0.96	0.93
+	0.88	0.87	0.86	0.85	0.82	0.79	0.76	0.75
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="cmykroPhotoSat">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	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.03	1.06	1.09	1.12	1.15	1.18	1.2
+	1.2	1.15	1.1	1.05	1	1	1	1
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="cmykroMatteHue">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="-6" upper-bound="6">
+	0	-0.07	-0.1	-0.15	-0.19	-0.25	-0.3	-0.35
+	-0.38	-0.38	-0.3	-0.2	-0.1	0	0.02	0.02
+	0	0	0	0	0	0	0	0
+	0	0	0	0	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="cmykroMatteLum">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	0.75	0.75	0.75	0.75	0.76	0.8	0.85	0.9
+	0.9	0.88	0.82	0.78	0.78	0.82	0.85	0.92
+	0.98	0.98	0.97	0.97	0.96	0.96	0.96	0.96
+	0.96	0.97	0.98	0.98	0.99	1	1	1
+	1	1	1	0.99	0.98	0.97	0.96	0.93
+	0.88	0.87	0.86	0.85	0.82	0.79	0.76	0.75
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="cmykroMatteSat">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	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.03	1.06	1.09	1.12	1.15	1.18	1.2
+	1.2	1.15	1.1	1.05	1	1	1	1
+   </sequence>
+  </curve>
+ </namedParam>
+</Curves>
+<paper translate="text" name="Plain" text="Plain Paper" class="plain" PreferredInkset="r800Matte">
+ <parameter type="integer" name="PaperMedia">0</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">0x20</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+
+ <ink translate="text" name="cmykrophoto" text="Photo 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.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykroPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykroPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykroPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykromatte" 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.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykroMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykroMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykroMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Postcard" text="Postcard" class="plain" PreferredInkset="r800Matte">
+ <parameter type="integer" name="PaperMedia">1</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">0x20</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+
+ <ink translate="text" name="cmykrophoto" text="Photo 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.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykroPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykroPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykroPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykromatte" 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.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykroMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykroMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykroMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyFilm" text="Glossy Film" class="photo" PreferredInkset="r800Photo">
+ <parameter type="integer" name="PaperMedia">7</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">0x20</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+
+ <ink translate="text" name="cmykrophoto" text="Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykroPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykroPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykroPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykromatte" text="Matte Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykroMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykroMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykroMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Transparency" text="Transparencies" class="transparency" PreferredInkset="r800Photo">
+ <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">0x20</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+
+ <ink translate="text" name="cmykrophoto" 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.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykroPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykroPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykroPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykromatte" text="Matte Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykroMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykroMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykroMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Envelope" text="Envelopes" class="plain" PreferredInkset="r800Matte">
+ <parameter type="integer" name="PaperMedia">1</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">0x20</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+
+ <ink translate="text" name="cmykrophoto" text="Photo 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.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykroPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykroPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykroPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykromatte" 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.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykroMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykroMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykroMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="BackFilm" text="Back Light Film" class="transparency" PreferredInkset="r800Photo">
+ <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">0x20</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+
+ <ink translate="text" name="cmykrophoto" 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.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykroPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykroPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykroPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykromatte" text="Matte Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykroMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykroMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykroMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Matte" text="Matte Paper" class="good" PreferredInkset="r800Matte">
+ <parameter type="integer" name="PaperMedia">5</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">0x20</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+
+ <ink translate="text" name="cmykrophoto" text="Photo 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.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykroPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykroPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykroPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykromatte" text="Matte Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykroMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykroMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykroMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="MatteHeavy" text="Matte Paper Heavyweight" class="good" PreferredInkset="r800Matte">
+ <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">0x70</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x70</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="cmykrophoto" text="Photo 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.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykroPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykroPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykroPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykromatte" text="Matte Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykroMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykroMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykroMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Inkjet" text="Inkjet Paper" class="good" PreferredInkset="r800Matte">
+ <parameter type="integer" name="PaperMedia">1</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">0x20</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+
+ <ink translate="text" name="cmykrophoto" 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.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykroPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykroPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykroPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykromatte" text="Matte Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.300000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykroMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykroMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykroMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Coated" text="Photo Quality Inkjet Paper" class="good" PreferredInkset="r800Photo">
+ <parameter type="integer" name="PaperMedia">29</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">0x20</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x72</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x72</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x72</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x72</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x72</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x72</parameter>
+ </resolution>
+
+ <ink translate="text" name="cmykrophoto" 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.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykroPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykroPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykroPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykromatte" text="Matte Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykroMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykroMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykroMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Photo" text="Photo Paper" class="photo" PreferredInkset="r800Photo">
+ <parameter type="integer" name="PaperMedia">43</parameter>
+ <parameter type="integer" name="PrintMethod">0x52</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+
+ <ink translate="text" name="cmykrophoto" text="Photo Black">
+  <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.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykroPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykroPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykroPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykromatte" text="Matte Black">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykroMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykroMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykroMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyPhoto" text="Premium Glossy Photo Paper" class="premium" PreferredInkset="r800Photo">
+ <parameter type="integer" name="PaperMedia">11</parameter>
+ <parameter type="integer" name="PrintMethod">0x52</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+
+ <ink translate="text" name="cmykrophoto" text="Photo Black">
+  <parameter type="float" name="Density">0.800000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">2.000000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</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="cmykroPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykroPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykroPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykromatte" text="Matte Black">
+  <parameter type="float" name="Density">0.800000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</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="cmykroMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykroMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykroMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Semigloss" text="Premium Semigloss Photo Paper" class="premium" PreferredInkset="r800Photo">
+ <parameter type="integer" name="PaperMedia">12</parameter>
+ <parameter type="integer" name="PrintMethod">0x52</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+
+ <ink translate="text" name="cmykrophoto" text="Photo Black">
+  <parameter type="float" name="Density">0.800000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">2.000000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</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="cmykroPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykroPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykroPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykromatte" text="Matte Black">
+  <parameter type="float" name="Density">0.800000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</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="cmykroMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykroMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykroMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Luster" text="Premium Luster Photo Paper" class="premium" PreferredInkset="r800Photo">
+ <parameter type="integer" name="PaperMedia">13</parameter>
+ <parameter type="integer" name="PrintMethod">0x52</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+
+ <ink translate="text" name="cmykrophoto" text="Photo Black">
+  <parameter type="float" name="Density">0.800000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">2.000000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</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="cmykroPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykroPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykroPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykromatte" text="Matte Black">
+  <parameter type="float" name="Density">0.800000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</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="cmykroMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykroMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykroMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="ArchivalMatte" text="Archival Matte Paper" class="premium" PreferredInkset="r800Matte">
+ <parameter type="integer" name="PaperMedia">15</parameter>
+ <parameter type="integer" name="PrintMethod">0x52</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x71</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="cmykrophoto" text="Photo 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.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykroPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykroPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykroPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykromatte" text="Matte Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykroMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykroMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykroMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="WaterColorRadiant" text="Watercolor Paper - Radiant White" class="premium" PreferredInkset="r800Matte">
+ <parameter type="integer" name="PaperMedia">16</parameter>
+ <parameter type="integer" name="PrintMethod">0x52</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x71</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="cmykrophoto" text="Photo 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.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykroPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykroPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykroPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykromatte" text="Matte Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykroMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykroMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykroMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper" class="photo" PreferredInkset="r800Photo">
+ <parameter type="integer" name="PaperMedia">43</parameter>
+ <parameter type="integer" name="PrintMethod">0x52</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+
+ <ink translate="text" name="cmykrophoto" text="Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykroPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykroPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykroPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykromatte" text="Matte Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykroMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykroMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykroMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Ilford" text="Ilford Heavy Paper" class="premium" PreferredInkset="r800Matte">
+ <parameter type="integer" name="PaperMedia">15</parameter>
+ <parameter type="integer" name="PrintMethod">0x52</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x71</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="cmykrophoto" text="Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykroPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykroPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykroPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykromatte" text="Matte Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykroMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykroMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykroMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="ColorLife" text="ColorLife Paper" class="premium" PreferredInkset="r800Photo">
+ <parameter type="integer" name="PaperMedia">23</parameter>
+ <parameter type="integer" name="PrintMethod">0x52</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+
+ <ink translate="text" name="cmykrophoto" text="Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykroPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykroPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykroPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykromatte" text="Matte Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykroMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykroMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykroMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Other" text="Other" class="plain" PreferredInkset="r800Matte">
+ <ink translate="text" name="cmykrophoto" text="Photo 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.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykroPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykroPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykroPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykromatte" 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.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykroMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykroMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykroMatteSat"/>
+ </ink>
+</paper>
+</escp2:papers>
+</gutenprint>
diff --git a/src/xml/escp2/media/cx3650.xml b/src/xml/escp2/media/cx3650.xml
new file mode 100644
index 0000000..07d5ea0
--- /dev/null
+++ b/src/xml/escp2/media/cx3650.xml
@@ -0,0 +1,788 @@
+<?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="cx3650">
+<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	0	-0.02	-0.04	-0.08	-0.12	-0.16
+	-0.2	-0.24	-0.28	-0.32	-0.32	-0.32	-0.32	-0.32
+	-0.36	-0.4	-0.44	-0.48	-0.5	-0.45	-0.4	-0.3
+	-0.12	-0.07	-0.04	-0.02	0	0	0	0
+	0	0	-0.03	-0.06	-0.09	-0.13	-0.17	-0.21
+	-0.25	-0.22	-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.56	0.58	0.62	0.68	0.73	0.78	0.82	0.85
+	0.85	0.82	0.78	0.78	0.79	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	1	0.99	0.98	0.97	0.95	0.93
+	0.9	0.76	0.65	0.58	0.58	0.57	0.56	0.56
+   </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.2	1.2	1.3	1.5	1.7	1.9	2	2
+	2	2	2	2	2	2	2	2
+	2	1.8	1.6	1.4	1.2	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1.15	1.4	1.7	2	2.3	2.4	2.4
+	2.4	2.4	2.4	2.3	2	1.7	1.4	1.15
+   </sequence>
+  </curve>
+ </namedParam>
+</Curves>
+<paper translate="text" name="Plain" text="Plain Paper" class="plain">
+ <parameter type="integer" name="FeedSequence">1</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</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="Quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">5</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</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="Quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">2</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.050000</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="Quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">3</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.800000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</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="Quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">3</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.800000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</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="Quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">4</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.050000</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="Quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">6</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.800000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</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="Quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.900000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.975000</parameter>
+  <parameter type="float" name="YellowBalance">0.975000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="Quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.900000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.975000</parameter>
+  <parameter type="float" name="YellowBalance">0.975000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="Quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</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="Quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</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="Quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</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="Quadtone" text="Quadtone">
+  <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"
+class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</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">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>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <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"
+class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</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">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>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</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">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>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <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"
+class="photo">
+ <parameter type="integer" name="FeedSequence">6</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</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="Quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</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="Quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</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="Quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">0</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.050000</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="Quadtone" text="Quadtone">
+  <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
new file mode 100644
index 0000000..574d0fb
--- /dev/null
+++ b/src/xml/escp2/media/f360.xml
@@ -0,0 +1,788 @@
+<?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">
+<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	0	-0.02	-0.04	-0.08	-0.12	-0.16
+	-0.2	-0.24	-0.28	-0.32	-0.32	-0.32	-0.32	-0.32
+	-0.36	-0.4	-0.44	-0.48	-0.5	-0.45	-0.4	-0.3
+	-0.12	-0.07	-0.04	-0.02	0	0	0	0
+	0	0	-0.03	-0.06	-0.09	-0.13	-0.17	-0.21
+	-0.25	-0.22	-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.56	0.58	0.62	0.68	0.73	0.78	0.82	0.85
+	0.85	0.82	0.78	0.78	0.79	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	1	0.99	0.98	0.97	0.95	0.93
+	0.9	0.76	0.65	0.58	0.58	0.57	0.56	0.56
+   </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.2	1.2	1.3	1.5	1.7	1.9	2	2
+	2	2	2	2	2	2	2	2
+	2	1.8	1.6	1.4	1.2	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1.15	1.4	1.7	2	2.3	2.4	2.4
+	2.4	2.4	2.4	2.3	2	1.7	1.4	1.15
+   </sequence>
+  </curve>
+ </namedParam>
+</Curves>
+<paper translate="text" name="Plain" text="Plain Paper" class="plain">
+ <parameter type="integer" name="FeedSequence">1</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</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="Quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">5</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</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="Quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">2</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.050000</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="Quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">3</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.800000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</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="Quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">3</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.800000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</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="Quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">4</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.050000</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="Quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">6</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.800000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</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="Quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.900000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.975000</parameter>
+  <parameter type="float" name="YellowBalance">0.975000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="Quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.900000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.975000</parameter>
+  <parameter type="float" name="YellowBalance">0.975000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="Quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</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="Quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</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="Quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</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="Quadtone" text="Quadtone">
+  <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"
+class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</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">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>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <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"
+class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</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">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>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</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">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>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <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"
+class="photo">
+ <parameter type="integer" name="FeedSequence">6</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</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="Quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</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="Quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</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="Quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">0</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.050000</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="Quadtone" text="Quadtone">
+  <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_photo.xml b/src/xml/escp2/media/f360_photo.xml
new file mode 100644
index 0000000..375d452
--- /dev/null
+++ b/src/xml/escp2/media/f360_photo.xml
@@ -0,0 +1,501 @@
+<?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_photo">
+<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.23	-0.24	-0.25	-0.26	-0.27
+	-0.28	-0.33	-0.38	-0.45	-0.5	-0.4	-0.3	-0.2
+	-0.12	-0.07	-0.04	-0.02	0	0	0	0
+	0	0	0	0	0	0	0	0
+	0	0	0	0	0	0	0	0
+   </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.58	0.63	0.7	0.75	0.8	0.86	0.88	0.9
+	0.9	0.83	0.78	0.78	0.78	0.79	0.83	0.86
+	0.93	0.95	0.97	0.98	1	1	1	1
+	1	1	1	1	1	1	1	1
+	1	0.99	0.98	0.97	0.96	0.94	0.93	0.89
+	0.86	0.73	0.65	0.58	0.59	0.59	0.58	0.58
+   </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>
+ <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.23	-0.24	-0.25	-0.26	-0.27
+	-0.28	-0.33	-0.38	-0.45	-0.5	-0.4	-0.3	-0.2
+	-0.12	-0.07	-0.04	-0.02	0	0	0	0
+	0	0	0	0	0	0	0	0
+	0	0	0	0	0	0	0	0
+   </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.58	0.6	0.65	0.69	0.74	0.79	0.82	0.84
+	0.86	0.81	0.76	0.76	0.78	0.79	0.83	0.86
+	0.93	0.95	0.97	0.98	1	1	1	1
+	1	1	1	1	1	1	1	1
+	1	0.99	0.98	0.97	0.96	0.94	0.93	0.89
+	0.86	0.73	0.65	0.58	0.59	0.59	0.58	0.58
+   </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.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="FeedSequence">1</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.860000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.200000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</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="PlainFast" text="Plain Paper Fast Load" class="plain">
+ <parameter type="integer" name="FeedSequence">5</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.860000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.200000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</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="Postcard" text="Postcard" class="plain">
+ <parameter type="integer" name="FeedSequence">2</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.900000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.200000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</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">
+ <parameter type="integer" name="FeedSequence">3</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.900000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.300000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</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">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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="FeedSequence">3</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.900000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.200000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</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="Envelope" text="Envelopes" class="plain">
+ <parameter type="integer" name="FeedSequence">4</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.860000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.200000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</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="BackFilm" text="Back Light Film" class="transparency">
+ <parameter type="integer" name="FeedSequence">6</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.900000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.200000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</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="Matte" text="Matte Paper" class="good">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.900000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</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">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.900000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.300000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</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">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.900000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.200000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</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="Coated" text="Photo Quality Inkjet Paper" class="good">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.900000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.300000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</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">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.900000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.300000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</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">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.900000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.300000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</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">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</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">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.900000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.300000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</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">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</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">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.900000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.300000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</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">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</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="GlossyPaper" text="Photo Quality Glossy Paper"
+class="premium">
+ <parameter type="integer" name="FeedSequence">6</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.900000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.300000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</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="Ilford" text="Ilford Heavy Paper" class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.300000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</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">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.900000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.300000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</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">
+ <parameter type="integer" name="FeedSequence">0</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.860000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.200000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</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>
+</escp2:papers>
+</gutenprint>
diff --git a/src/xml/escp2/media/f360_photo7_japan.xml b/src/xml/escp2/media/f360_photo7_japan.xml
new file mode 100644
index 0000000..eec937c
--- /dev/null
+++ b/src/xml/escp2/media/f360_photo7_japan.xml
@@ -0,0 +1,501 @@
+<?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_photo7_japan">
+<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.23	-0.24	-0.25	-0.26	-0.27
+	-0.28	-0.33	-0.38	-0.45	-0.5	-0.4	-0.3	-0.2
+	-0.12	-0.07	-0.04	-0.02	0	0	0	0
+	0	0	0	0	0	0	0	0
+	0	0	0	0	0	0	0	0
+   </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.58	0.63	0.7	0.75	0.8	0.86	0.88	0.9
+	0.9	0.83	0.78	0.78	0.78	0.79	0.83	0.86
+	0.93	0.95	0.97	0.98	1	1	1	1
+	1	1	1	1	1	1	1	1
+	1	0.99	0.98	0.97	0.96	0.94	0.93	0.89
+	0.86	0.73	0.65	0.58	0.59	0.59	0.58	0.58
+   </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>
+ <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.23	-0.24	-0.25	-0.26	-0.27
+	-0.28	-0.33	-0.38	-0.45	-0.5	-0.4	-0.3	-0.2
+	-0.12	-0.07	-0.04	-0.02	0	0	0	0
+	0	0	0	0	0	0	0	0
+	0	0	0	0	0	0	0	0
+   </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.58	0.6	0.65	0.69	0.74	0.79	0.82	0.84
+	0.86	0.81	0.76	0.76	0.78	0.79	0.83	0.86
+	0.93	0.95	0.97	0.98	1	1	1	1
+	1	1	1	1	1	1	1	1
+	1	0.99	0.98	0.97	0.96	0.94	0.93	0.89
+	0.86	0.73	0.65	0.58	0.59	0.59	0.58	0.58
+   </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.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="FeedSequence">1</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.860000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.200000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</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="PlainFast" text="Plain Paper Fast Load" class="plain">
+ <parameter type="integer" name="FeedSequence">5</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.860000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.200000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</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="Postcard" text="Postcard" class="plain">
+ <parameter type="integer" name="FeedSequence">2</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.900000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.200000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</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">
+ <parameter type="integer" name="FeedSequence">3</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.900000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.300000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</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">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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="FeedSequence">3</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.900000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.200000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</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="Envelope" text="Envelopes" class="plain">
+ <parameter type="integer" name="FeedSequence">4</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.860000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.200000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</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="BackFilm" text="Back Light Film" class="transparency">
+ <parameter type="integer" name="FeedSequence">6</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.900000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.200000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</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="Matte" text="Matte Paper" class="good">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.900000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</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">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.900000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.300000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</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">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.900000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.200000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</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="Coated" text="Photo Quality Inkjet Paper" class="good">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.900000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.300000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</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">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.900000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.300000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</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">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.900000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.300000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</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">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</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">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.900000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.300000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</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">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</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">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.900000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.300000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</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">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</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="GlossyPaper" text="Photo Quality Glossy Paper"
+class="premium">
+ <parameter type="integer" name="FeedSequence">6</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.900000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.300000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</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="Ilford" text="Ilford Heavy Paper" class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.300000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</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">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.900000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.300000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</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">
+ <parameter type="integer" name="FeedSequence">0</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.860000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.200000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</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>
+</escp2:papers>
+</gutenprint>
diff --git a/src/xml/escp2/media/f360_ultrachrome.xml b/src/xml/escp2/media/f360_ultrachrome.xml
new file mode 100644
index 0000000..5a0bdbd
--- /dev/null
+++ b/src/xml/escp2/media/f360_ultrachrome.xml
@@ -0,0 +1,918 @@
+<?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">
+<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.19	-0.22
+	-0.25	-0.22	-0.19	-0.15	-0.12	-0.1	-0.06	-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.49	0.51	0.55	0.61	0.67	0.71	0.76	0.79
+	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.94	0.93	0.9	0.86
+	0.82	0.69	0.6	0.54	0.52	0.51	0.5	0.49
+   </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.49	0.53	0.6	0.64	0.69	0.73	0.77	0.8
+	0.84	0.81	0.77	0.77	0.78	0.8	0.84	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.69	0.61	0.55	0.53	0.52	0.5	0.49
+   </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="FeedSequence">1</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="ultramatte" text="UltraChrome 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.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</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="PlainFast" text="Plain Paper Fast Load" class="plain"
+PreferredInkset="UltraMatte">
+ <parameter type="integer" name="FeedSequence">5</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="ultramatte" text="UltraChrome 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.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</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="Postcard" text="Postcard" class="plain"
+PreferredInkset="UltraMatte">
+ <parameter type="integer" name="FeedSequence">2</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="ultramatte" text="UltraChrome 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.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</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="GlossyFilm" text="Glossy Film" class="photo"
+PreferredInkset="UltraPhoto">
+ <parameter type="integer" name="FeedSequence">3</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="ultramatte" text="UltraChrome 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</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="Transparency" text="Transparencies" class="transparency"
+PreferredInkset="UltraPhoto">
+ <parameter type="integer" name="FeedSequence">3</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="ultramatte" text="UltraChrome 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</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="Envelope" text="Envelopes" class="plain"
+PreferredInkset="UltraMatte">
+ <parameter type="integer" name="FeedSequence">4</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="ultramatte" text="UltraChrome 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.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</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="BackFilm" text="Back Light Film" class="transparency"
+PreferredInkset="UltraPhoto">
+ <parameter type="integer" name="FeedSequence">6</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="ultramatte" text="UltraChrome 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</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="Matte" text="Matte Paper" class="good"
+PreferredInkset="UltraMatte">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="ultramatte" text="UltraChrome 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">1.250000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</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="MatteHeavy" text="Matte Paper Heavyweight" class="good"
+PreferredInkset="UltraMatte">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="ultramatte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</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="Inkjet" text="Inkjet Paper" class="good"
+PreferredInkset="UltraMatte">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="ultramatte" text="UltraChrome 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</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="Coated" text="Photo Quality Inkjet Paper" class="good"
+PreferredInkset="UltraPhoto">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="ultramatte" text="UltraChrome 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</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="Photo" text="Photo Paper" class="photo"
+PreferredInkset="UltraPhoto">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo Black">
+  <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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="ultramatte" text="UltraChrome 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</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="GlossyPhoto" text="Premium Glossy Photo Paper"
+class="premium" PreferredInkset="UltraPhoto">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.800000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">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="ultramatte" text="UltraChrome 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</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">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="FeedSequence">8</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.800000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">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="ultramatte" text="UltraChrome 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</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">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="FeedSequence">8</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.800000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">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="ultramatte" text="UltraChrome 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">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="FeedSequence">7</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="ultramatte" text="UltraChrome 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</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="FeedSequence">7</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="ultramatte" text="UltraChrome 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</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="GlossyPaper" text="Photo Quality Glossy Paper"
+class="photo" PreferredInkset="UltraPhoto">
+ <parameter type="integer" name="FeedSequence">6</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="ultramatte" text="UltraChrome 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</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="Ilford" text="Ilford Heavy Paper" class="premium"
+PreferredInkset="UltraMatte">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="ultramatte" text="UltraChrome 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</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="ColorLife" text="ColorLife Paper" class="premium"
+PreferredInkset="UltraPhoto">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="ultramatte" text="UltraChrome 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</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="Other" text="Other" class="plain"
+PreferredInkset="UltraMatte">
+ <parameter type="integer" name="FeedSequence">0</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="ultramatte" text="UltraChrome 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.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</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>
+</escp2:papers>
+</gutenprint>
diff --git a/src/xml/escp2/media/f360_ultrachrome_k3.xml b/src/xml/escp2/media/f360_ultrachrome_k3.xml
new file mode 100644
index 0000000..770816d
--- /dev/null
+++ b/src/xml/escp2/media/f360_ultrachrome_k3.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">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.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.950000</parameter>
+  <parameter type="float" name="YellowBalance">0.900000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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">1.250000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.950000</parameter>
+  <parameter type="float" name="YellowBalance">0.900000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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">0x51</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">0x51</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</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.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.950000</parameter>
+  <parameter type="float" name="YellowBalance">0.900000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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">1.250000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.950000</parameter>
+  <parameter type="float" name="YellowBalance">0.900000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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">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">0x40</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">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.950000</parameter>
+  <parameter type="float" name="YellowBalance">0.900000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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">1.250000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.950000</parameter>
+  <parameter type="float" name="YellowBalance">0.900000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.950000</parameter>
+  <parameter type="float" name="YellowBalance">0.900000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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">1.250000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.950000</parameter>
+  <parameter type="float" name="YellowBalance">0.900000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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">0x41</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">0x51</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</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.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.950000</parameter>
+  <parameter type="float" name="YellowBalance">0.900000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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">1.250000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.950000</parameter>
+  <parameter type="float" name="YellowBalance">0.900000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.950000</parameter>
+  <parameter type="float" name="YellowBalance">0.900000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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">1.250000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.950000</parameter>
+  <parameter type="float" name="YellowBalance">0.900000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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">0x51</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">0x51</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</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.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.950000</parameter>
+  <parameter type="float" name="YellowBalance">0.900000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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">1.250000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.950000</parameter>
+  <parameter type="float" name="YellowBalance">0.900000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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">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">0x51</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x74</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x90</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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.950000</parameter>
+  <parameter type="float" name="YellowBalance">0.900000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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">1.250000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.950000</parameter>
+  <parameter type="float" name="YellowBalance">0.900000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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">0x51</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">0x51</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</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.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.950000</parameter>
+  <parameter type="float" name="YellowBalance">0.900000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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">1.250000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.950000</parameter>
+  <parameter type="float" name="YellowBalance">0.900000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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">0x51</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">0x51</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</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.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.950000</parameter>
+  <parameter type="float" name="YellowBalance">0.900000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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">1.250000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.950000</parameter>
+  <parameter type="float" name="YellowBalance">0.900000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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">0x51</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">0x51</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.950000</parameter>
+  <parameter type="float" name="YellowBalance">0.900000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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">1.250000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.950000</parameter>
+  <parameter type="float" name="YellowBalance">0.900000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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">0x51</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">0x51</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x90</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.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.800000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.950000</parameter>
+  <parameter type="float" name="YellowBalance">0.900000</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">1.250000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.950000</parameter>
+  <parameter type="float" name="YellowBalance">0.900000</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">0x51</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">0x51</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x90</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.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.800000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.950000</parameter>
+  <parameter type="float" name="YellowBalance">0.900000</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">1.250000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.950000</parameter>
+  <parameter type="float" name="YellowBalance">0.900000</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">0x51</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">0x51</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x90</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.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.800000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.950000</parameter>
+  <parameter type="float" name="YellowBalance">0.900000</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">1.250000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.950000</parameter>
+  <parameter type="float" name="YellowBalance">0.900000</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">0x51</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">0x51</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x74</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x90</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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.950000</parameter>
+  <parameter type="float" name="YellowBalance">0.900000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</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">0x51</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">0x51</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x74</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x90</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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.950000</parameter>
+  <parameter type="float" name="YellowBalance">0.900000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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">1.250000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.950000</parameter>
+  <parameter type="float" name="YellowBalance">0.900000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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">0x51</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">0x51</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+
+ <ink translate="text" name="ultra3photo" text="Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.950000</parameter>
+  <parameter type="float" name="YellowBalance">0.900000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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">1.250000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.950000</parameter>
+  <parameter type="float" name="YellowBalance">0.900000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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">0x51</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">0x51</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x74</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x90</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">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.950000</parameter>
+  <parameter type="float" name="YellowBalance">0.900000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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">1.250000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.950000</parameter>
+  <parameter type="float" name="YellowBalance">0.900000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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">0x51</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">0x51</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x73</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x90</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">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.950000</parameter>
+  <parameter type="float" name="YellowBalance">0.900000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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">1.250000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.950000</parameter>
+  <parameter type="float" name="YellowBalance">0.900000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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.100000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.950000</parameter>
+  <parameter type="float" name="YellowBalance">0.900000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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">1.250000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.950000</parameter>
+  <parameter type="float" name="YellowBalance">0.900000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="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
new file mode 100644
index 0000000..71c858f
--- /dev/null
+++ b/src/xml/escp2/media/photo_gen0.xml
@@ -0,0 +1,769 @@
+<?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="photo_gen0">
+<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	0	-0.02	-0.04	-0.08	-0.12	-0.16
+	-0.2	-0.24	-0.28	-0.32	-0.32	-0.32	-0.32	-0.32
+	-0.36	-0.4	-0.44	-0.48	-0.5	-0.45	-0.4	-0.3
+	-0.12	-0.07	-0.04	-0.02	0	0	0	0
+	0	0	-0.03	-0.06	-0.09	-0.13	-0.17	-0.21
+	-0.25	-0.22	-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.56	0.58	0.62	0.68	0.73	0.78	0.82	0.85
+	0.85	0.82	0.78	0.78	0.79	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	1	0.99	0.98	0.97	0.95	0.93
+	0.9	0.76	0.65	0.58	0.58	0.57	0.56	0.56
+   </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.2	1.2	1.3	1.5	1.7	1.9	2	2
+	2	2	2	2	2	2	2	2
+	2	1.8	1.6	1.4	1.2	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1.15	1.4	1.7	2	2.3	2.4	2.4
+	2.4	2.4	2.4	2.3	2	1.7	1.4	1.15
+   </sequence>
+  </curve>
+ </namedParam>
+</Curves>
+<paper translate="text" name="Plain" text="Plain Paper" class="plain">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</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="quadtone" text="Quadtone">
+  <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">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</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="quadtone" text="Quadtone">
+  <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">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</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="quadtone" text="Quadtone">
+  <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">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.200000</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="quadtone" text="Quadtone">
+  <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">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.200000</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="quadtone" text="Quadtone">
+  <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">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</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="quadtone" text="Quadtone">
+  <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">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.200000</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="quadtone" text="Quadtone">
+  <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">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.200000</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="quadtone" text="Quadtone">
+  <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">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.350000</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="quadtone" text="Quadtone">
+  <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">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.375000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</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">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="quadtone" text="Quadtone">
+  <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">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.350000</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="quadtone" text="Quadtone">
+  <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">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.350000</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="quadtone" text="Quadtone">
+  <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"
+class="premium">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.350000</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="quadtone" text="Quadtone">
+  <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"
+class="premium">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.350000</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="quadtone" text="Quadtone">
+  <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">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.350000</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="quadtone" text="Quadtone">
+  <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"
+class="premium">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.350000</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="quadtone" text="Quadtone">
+  <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">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.350000</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="quadtone" text="Quadtone">
+  <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">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.350000</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="quadtone" text="Quadtone">
+  <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">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</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="quadtone" text="Quadtone">
+  <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
new file mode 100644
index 0000000..aa2c0fd
--- /dev/null
+++ b/src/xml/escp2/media/photo_gen1.xml
@@ -0,0 +1,788 @@
+<?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="photo_gen1">
+<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	0	-0.02	-0.04	-0.08	-0.12	-0.16
+	-0.2	-0.24	-0.28	-0.32	-0.32	-0.32	-0.32	-0.32
+	-0.36	-0.4	-0.44	-0.48	-0.5	-0.45	-0.4	-0.3
+	-0.12	-0.07	-0.04	-0.02	0	0	0	0
+	0	0	-0.03	-0.06	-0.09	-0.13	-0.17	-0.21
+	-0.25	-0.22	-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.56	0.58	0.62	0.68	0.73	0.78	0.82	0.85
+	0.85	0.82	0.78	0.78	0.79	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	1	0.99	0.98	0.97	0.95	0.93
+	0.9	0.76	0.65	0.58	0.58	0.57	0.56	0.56
+   </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.2	1.2	1.3	1.5	1.7	1.9	2	2
+	2	2	2	2	2	2	2	2
+	2	1.8	1.6	1.4	1.2	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1.15	1.4	1.7	2	2.3	2.4	2.4
+	2.4	2.4	2.4	2.3	2	1.7	1.4	1.15
+   </sequence>
+  </curve>
+ </namedParam>
+</Curves>
+<paper translate="text" name="Plain" text="Plain Paper" class="plain">
+ <parameter type="integer" name="FeedSequence">1</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">5</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">2</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">3</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.200000</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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">3</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.200000</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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">4</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">6</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.200000</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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.200000</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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.350000</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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.375000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</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">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.350000</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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.350000</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="quadtone" text="Quadtone">
+  <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"
+class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.350000</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="quadtone" text="Quadtone">
+  <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"
+class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.350000</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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.350000</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="quadtone" text="Quadtone">
+  <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"
+class="premium">
+ <parameter type="integer" name="FeedSequence">6</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.350000</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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.350000</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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.350000</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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">0</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</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="quadtone" text="Quadtone">
+  <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
new file mode 100644
index 0000000..9f042cb
--- /dev/null
+++ b/src/xml/escp2/media/photo_gen2.xml
@@ -0,0 +1,788 @@
+<?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="photo_gen2">
+<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	0	-0.02	-0.04	-0.08	-0.12	-0.16
+	-0.2	-0.24	-0.28	-0.32	-0.32	-0.32	-0.32	-0.32
+	-0.36	-0.4	-0.44	-0.48	-0.5	-0.45	-0.4	-0.3
+	-0.12	-0.07	-0.04	-0.02	0	0	0	0
+	0	0	-0.03	-0.06	-0.09	-0.13	-0.17	-0.21
+	-0.25	-0.22	-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.56	0.58	0.62	0.68	0.73	0.78	0.82	0.85
+	0.85	0.82	0.78	0.78	0.79	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	1	0.99	0.98	0.97	0.95	0.93
+	0.9	0.76	0.65	0.58	0.58	0.57	0.56	0.56
+   </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.2	1.2	1.3	1.5	1.7	1.9	2	2
+	2	2	2	2	2	2	2	2
+	2	1.8	1.6	1.4	1.2	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1.15	1.4	1.7	2	2.3	2.4	2.4
+	2.4	2.4	2.4	2.3	2	1.7	1.4	1.15
+   </sequence>
+  </curve>
+ </namedParam>
+</Curves>
+<paper translate="text" name="Plain" text="Plain Paper" class="plain">
+ <parameter type="integer" name="FeedSequence">1</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.738000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">5</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.738000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">2</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">3</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</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">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">3</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">0.250000</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">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">4</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.738000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">6</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">0.250000</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">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</parameter>
+  <parameter type="float" name="GCRLower">0.300000</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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">0.300000</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">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.200000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">0.250000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.890000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">0.250000</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">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="quadtone" text="Quadtone">
+  <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"
+class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.300000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.900000</parameter>
+  <parameter type="float" name="MagentaBalance">0.980000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</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>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <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"
+class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.300000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.900000</parameter>
+  <parameter type="float" name="MagentaBalance">0.980000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</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>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.300000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.900000</parameter>
+  <parameter type="float" name="MagentaBalance">0.980000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</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>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <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"
+class="premium">
+ <parameter type="integer" name="FeedSequence">6</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">0.250000</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">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">0.250000</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">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">0.250000</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">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">0</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.738000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</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="quadtone" text="Quadtone">
+  <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
new file mode 100644
index 0000000..1b5fbdc
--- /dev/null
+++ b/src/xml/escp2/media/photo_gen3.xml
@@ -0,0 +1,788 @@
+<?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="photo_gen3">
+<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.01	-0.03	-0.06	-0.1	-0.15	-0.2	-0.25
+	-0.28	-0.3	-0.34	-0.35	-0.35	-0.34	-0.33	-0.33
+	-0.36	-0.4	-0.44	-0.48	-0.5	-0.45	-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.82	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="FeedSequence">1</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.350000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</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">0.850000</parameter>
+  <parameter type="float" name="YellowBalance">0.850000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">5</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.350000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</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">0.850000</parameter>
+  <parameter type="float" name="YellowBalance">0.850000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">2</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.692000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.350000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</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.850000</parameter>
+  <parameter type="float" name="YellowBalance">0.850000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">3</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</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.800000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">3</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.350000</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.590000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">4</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.350000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</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">0.850000</parameter>
+  <parameter type="float" name="YellowBalance">0.850000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">6</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</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.590000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.350000</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.670000</parameter>
+  <parameter type="float" name="YellowBalance">0.720000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.350000</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.850000</parameter>
+  <parameter type="float" name="YellowBalance">0.850000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.709000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</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.850000</parameter>
+  <parameter type="float" name="YellowBalance">0.850000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.450000</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.760000</parameter>
+  <parameter type="float" name="YellowBalance">0.840000</parameter>
+  <parameter type="float" name="BlackDensity">0.660000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</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.590000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="quadtone" text="Quadtone">
+  <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"
+class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.750000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.300000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">1.050000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.850000</parameter>
+  <parameter type="float" name="YellowBalance">0.850000</parameter>
+  <parameter type="float" name="BlackDensity">0.660000</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>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <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"
+class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.750000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</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.850000</parameter>
+  <parameter type="float" name="YellowBalance">0.850000</parameter>
+  <parameter type="float" name="BlackDensity">0.660000</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>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.750000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</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.850000</parameter>
+  <parameter type="float" name="YellowBalance">0.850000</parameter>
+  <parameter type="float" name="BlackDensity">0.660000</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>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <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"
+class="premium">
+ <parameter type="integer" name="FeedSequence">6</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</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.590000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</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.590000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</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.590000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">0</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.350000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.500000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.850000</parameter>
+  <parameter type="float" name="YellowBalance">0.850000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="quadtone" text="Quadtone">
+  <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
new file mode 100644
index 0000000..3aee075
--- /dev/null
+++ b/src/xml/escp2/media/photo_gen3_4.xml
@@ -0,0 +1,788 @@
+<?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="photo_gen3_4">
+<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.01	-0.03	-0.06	-0.1	-0.15	-0.2	-0.25
+	-0.28	-0.3	-0.34	-0.35	-0.35	-0.34	-0.33	-0.33
+	-0.36	-0.4	-0.44	-0.48	-0.5	-0.45	-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.82	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="FeedSequence">1</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.350000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</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">0.850000</parameter>
+  <parameter type="float" name="YellowBalance">0.850000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">5</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.350000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</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">0.850000</parameter>
+  <parameter type="float" name="YellowBalance">0.850000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">2</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.692000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.350000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</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.850000</parameter>
+  <parameter type="float" name="YellowBalance">0.850000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">3</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</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.800000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">3</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.350000</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.590000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">4</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.350000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</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">0.850000</parameter>
+  <parameter type="float" name="YellowBalance">0.850000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">6</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</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.590000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.350000</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.670000</parameter>
+  <parameter type="float" name="YellowBalance">0.720000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.350000</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.850000</parameter>
+  <parameter type="float" name="YellowBalance">0.850000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.709000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</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.850000</parameter>
+  <parameter type="float" name="YellowBalance">0.850000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.450000</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.760000</parameter>
+  <parameter type="float" name="YellowBalance">0.840000</parameter>
+  <parameter type="float" name="BlackDensity">0.660000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</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.590000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="quadtone" text="Quadtone">
+  <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"
+class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.750000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.300000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">1.050000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.850000</parameter>
+  <parameter type="float" name="YellowBalance">0.850000</parameter>
+  <parameter type="float" name="BlackDensity">0.660000</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>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <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"
+class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.750000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</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.850000</parameter>
+  <parameter type="float" name="YellowBalance">0.850000</parameter>
+  <parameter type="float" name="BlackDensity">0.660000</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>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.750000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</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.850000</parameter>
+  <parameter type="float" name="YellowBalance">0.850000</parameter>
+  <parameter type="float" name="BlackDensity">0.660000</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>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <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"
+class="premium">
+ <parameter type="integer" name="FeedSequence">6</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</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.590000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</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.590000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</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.590000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">0</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.350000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.500000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.850000</parameter>
+  <parameter type="float" name="YellowBalance">0.850000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="quadtone" text="Quadtone">
+  <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_gen4.xml b/src/xml/escp2/media/photo_gen4.xml
new file mode 100644
index 0000000..4b158cf
--- /dev/null
+++ b/src/xml/escp2/media/photo_gen4.xml
@@ -0,0 +1,1003 @@
+<?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="photo_gen4">
+<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.28	-0.3	-0.34	-0.35	-0.35	-0.34	-0.33	-0.33
+	-0.36	-0.4	-0.44	-0.48	-0.5	-0.45	-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.82	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">0x40</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x10</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">0x70</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.350000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</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">0.850000</parameter>
+  <parameter type="float" name="YellowBalance">0.850000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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">1</parameter>
+ <parameter type="integer" name="PrintMethod">0x41</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x11</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x22</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x42</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</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="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.692000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.350000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</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.850000</parameter>
+  <parameter type="float" name="YellowBalance">0.850000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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">0x40</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x22</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">0x70</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</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.500000</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.800000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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">0x40</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x22</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x42</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x72</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x72</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x72</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x72</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x72</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x72</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.350000</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.590000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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">1</parameter>
+ <parameter type="integer" name="PrintMethod">0x41</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x11</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</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="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.350000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</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">0.850000</parameter>
+  <parameter type="float" name="YellowBalance">0.850000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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">0x40</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x22</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x42</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x73</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x80</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.500000</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.590000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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">3</parameter>
+ <parameter type="integer" name="PrintMethod">0x41</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x11</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</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="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.350000</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.670000</parameter>
+  <parameter type="float" name="YellowBalance">0.720000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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">0x41</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x11</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x22</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x42</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x72</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x80</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.350000</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.850000</parameter>
+  <parameter type="float" name="YellowBalance">0.850000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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">0x41</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x11</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</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="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.709000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</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.850000</parameter>
+  <parameter type="float" name="YellowBalance">0.850000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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">0x40</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x10</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">0x70</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</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.450000</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.760000</parameter>
+  <parameter type="float" name="YellowBalance">0.840000</parameter>
+  <parameter type="float" name="BlackDensity">0.660000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x11</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x22</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x42</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x72</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x80</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.500000</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.590000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x11</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x22</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x42</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x73</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x90</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="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.750000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.300000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">1.050000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.850000</parameter>
+  <parameter type="float" name="YellowBalance">0.850000</parameter>
+  <parameter type="float" name="BlackDensity">0.660000</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="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x11</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x22</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x42</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x73</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x90</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="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.750000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</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.850000</parameter>
+  <parameter type="float" name="YellowBalance">0.850000</parameter>
+  <parameter type="float" name="BlackDensity">0.660000</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="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x11</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x22</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x42</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x73</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x90</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="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.750000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</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.850000</parameter>
+  <parameter type="float" name="YellowBalance">0.850000</parameter>
+  <parameter type="float" name="BlackDensity">0.660000</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="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x11</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x22</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x42</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x72</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x80</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.500000</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.590000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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">15</parameter>
+ <parameter type="integer" name="PrintMethod">0x41</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x11</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x22</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x42</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x73</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x90</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x90</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x90</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x90</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.500000</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.590000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x11</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x22</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x42</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x73</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x81</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x91</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x91</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x91</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x91</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.500000</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.590000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.350000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.500000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.850000</parameter>
+  <parameter type="float" name="YellowBalance">0.850000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="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_pigment.xml b/src/xml/escp2/media/photo_pigment.xml
new file mode 100644
index 0000000..ebfea31
--- /dev/null
+++ b/src/xml/escp2/media/photo_pigment.xml
@@ -0,0 +1,547 @@
+<?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="photo_pigment">
+<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.19	-0.22
+	-0.25	-0.22	-0.19	-0.15	-0.12	-0.1	-0.06	-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.49	0.51	0.55	0.61	0.67	0.71	0.76	0.79
+	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.94	0.93	0.9	0.86
+	0.82	0.69	0.6	0.54	0.52	0.51	0.5	0.49
+   </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.49	0.53	0.6	0.64	0.69	0.73	0.77	0.8
+	0.84	0.81	0.77	0.77	0.78	0.8	0.84	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.69	0.61	0.55	0.53	0.52	0.5	0.49
+   </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">
+ <parameter type="integer" name="FeedSequence">1</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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">
+ <parameter type="integer" name="FeedSequence">5</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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="FeedSequence">2</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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="FeedSequence">3</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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="FeedSequence">3</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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="FeedSequence">4</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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="FeedSequence">6</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.800000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">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">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.800000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">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">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.800000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">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">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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="FeedSequence">6</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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">
+ <parameter type="integer" name="FeedSequence">0</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="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/picturemate_4.xml b/src/xml/escp2/media/picturemate_4.xml
new file mode 100644
index 0000000..1cf7b8f
--- /dev/null
+++ b/src/xml/escp2/media/picturemate_4.xml
@@ -0,0 +1,107 @@
+<?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="picturemate_4">
+<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.07	-0.1	-0.15	-0.19	-0.25	-0.3	-0.35
+	-0.38	-0.38	-0.3	-0.2	-0.1	0	0	0
+	0	0	0	0	0	0	0	0
+	0	0	0	0	0	0	0	0
+	0	0.02	0.05	0.09	0.13	0.15	0.16	0.17
+	0.17	0.17	0.16	0.15	0.13	0.09	0.05	0.02
+   </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.75	0.75	0.75	0.75	0.76	0.8	0.85	0.9
+	0.9	0.88	0.82	0.85	0.87	0.89	0.91	0.95
+	0.98	0.98	0.97	0.97	0.96	0.96	0.96	0.96
+	0.96	0.97	0.98	0.98	0.99	1	1	1
+	1	1	1	0.99	0.98	0.97	0.96	0.93
+	0.88	0.87	0.86	0.85	0.82	0.79	0.76	0.75
+   </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	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.03	1.06	1.09	1.12	1.15	1.18	1.2
+	1.2	1.15	1.1	1.05	1	1	1	1
+   </sequence>
+  </curve>
+ </namedParam>
+</Curves>
+<paper translate="text" name="GlossyPhoto" text="Premium Glossy Photo Paper"
+class="premium" PreferredInkset="picturematePhoto">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="picturemate_4" text="Standard">
+  <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.020000</parameter>
+  <parameter type="float" name="GCRUpper">2.000000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</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="Other" text="Other" class="plain"
+PreferredInkset="picturemateMatte">
+ <parameter type="integer" name="FeedSequence">0</parameter>
+
+ <ink translate="text" name="picturemate_4" text="Standard">
+  <parameter type="float" name="Density">0.878000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">2.000000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="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/picturemate_6.xml b/src/xml/escp2/media/picturemate_6.xml
new file mode 100644
index 0000000..5d55fb4
--- /dev/null
+++ b/src/xml/escp2/media/picturemate_6.xml
@@ -0,0 +1,107 @@
+<?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="picturemate_6">
+<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.07	-0.1	-0.15	-0.19	-0.25	-0.3	-0.35
+	-0.38	-0.38	-0.3	-0.2	-0.1	0	0	0
+	0	0	0	0	0	0	0	0
+	0	0	0	0	0	0	0	0
+	0	0.02	0.05	0.09	0.13	0.15	0.16	0.17
+	0.17	0.17	0.16	0.15	0.13	0.09	0.05	0.02
+   </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.75	0.75	0.75	0.75	0.76	0.8	0.85	0.9
+	0.9	0.88	0.82	0.85	0.87	0.89	0.91	0.95
+	0.98	0.98	0.97	0.97	0.96	0.96	0.96	0.96
+	0.96	0.97	0.98	0.98	0.99	1	1	1
+	1	1	1	0.99	0.98	0.97	0.96	0.93
+	0.88	0.87	0.86	0.85	0.82	0.79	0.76	0.75
+   </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	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.03	1.06	1.09	1.12	1.15	1.18	1.2
+	1.2	1.15	1.1	1.05	1	1	1	1
+   </sequence>
+  </curve>
+ </namedParam>
+</Curves>
+<paper translate="text" name="GlossyPhoto" text="Premium Glossy Photo Paper"
+class="premium" PreferredInkset="picturematePhoto">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="picturemate_6" text="Standard">
+  <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.020000</parameter>
+  <parameter type="float" name="GCRUpper">2.000000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</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="Other" text="Other" class="plain"
+PreferredInkset="picturemateMatte">
+ <parameter type="integer" name="FeedSequence">0</parameter>
+
+ <ink translate="text" name="picturemate_6" text="Standard">
+  <parameter type="float" name="Density">0.878000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">2.000000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="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
new file mode 100644
index 0000000..852e535
--- /dev/null
+++ b/src/xml/escp2/media/pro_gen1.xml
@@ -0,0 +1,809 @@
+<?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="pro_gen1">
+<feature name="PaperThickness"/>
+<feature name="VacuumIntensity"/>
+<feature name="FeedAdjustment"/>
+<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	0	-0.02	-0.04	-0.08	-0.12	-0.16
+	-0.2	-0.24	-0.28	-0.32	-0.32	-0.32	-0.32	-0.32
+	-0.36	-0.4	-0.44	-0.48	-0.5	-0.45	-0.4	-0.3
+	-0.12	-0.07	-0.04	-0.02	0	0	0	0
+	0	0	-0.03	-0.06	-0.09	-0.13	-0.17	-0.21
+	-0.25	-0.22	-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.56	0.58	0.62	0.68	0.73	0.78	0.82	0.85
+	0.85	0.82	0.78	0.78	0.79	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	1	0.99	0.98	0.97	0.95	0.93
+	0.9	0.76	0.65	0.58	0.58	0.57	0.56	0.56
+   </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.2	1.2	1.3	1.5	1.7	1.9	2	2
+	2	2	2	2	2	2	2	2
+	2	1.8	1.6	1.4	1.2	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1.15	1.4	1.7	2	2.3	2.4	2.4
+	2.4	2.4	2.4	2.3	2	1.7	1.4	1.15
+   </sequence>
+  </curve>
+ </namedParam>
+</Curves>
+<paper translate="text" name="Plain" text="Plain Paper" class="plain">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="FeedAdjustment">107</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="FeedAdjustment">107</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="FeedAdjustment">0</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="FeedAdjustment">109</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.200000</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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="FeedAdjustment">109</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.200000</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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="FeedAdjustment">107</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="FeedAdjustment">109</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.200000</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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="FeedAdjustment">0</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.200000</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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="FeedAdjustment">0</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.350000</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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="FeedAdjustment">107</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.375000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</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">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="FeedAdjustment">107</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.350000</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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="FeedAdjustment">103</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.350000</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="quadtone" text="Quadtone">
+  <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"
+class="premium">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="FeedAdjustment">128</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.350000</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="quadtone" text="Quadtone">
+  <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"
+class="premium">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="FeedAdjustment">128</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.350000</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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="FeedAdjustment">128</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.350000</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="quadtone" text="Quadtone">
+  <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"
+class="premium">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="FeedAdjustment">107</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.350000</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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="FeedAdjustment">128</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.350000</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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="FeedAdjustment">103</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.350000</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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="FeedAdjustment">107</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</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="quadtone" text="Quadtone">
+  <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
new file mode 100644
index 0000000..958e667
--- /dev/null
+++ b/src/xml/escp2/media/pro_gen2.xml
@@ -0,0 +1,828 @@
+<?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="pro_gen2">
+<feature name="PaperThickness"/>
+<feature name="VacuumIntensity"/>
+<feature name="FeedAdjustment"/>
+<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	0	-0.02	-0.04	-0.08	-0.12	-0.16
+	-0.2	-0.24	-0.28	-0.32	-0.32	-0.32	-0.32	-0.32
+	-0.36	-0.4	-0.44	-0.48	-0.5	-0.45	-0.4	-0.3
+	-0.12	-0.07	-0.04	-0.02	0	0	0	0
+	0	0	-0.03	-0.06	-0.09	-0.13	-0.17	-0.21
+	-0.25	-0.22	-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.56	0.58	0.62	0.68	0.73	0.78	0.82	0.85
+	0.85	0.82	0.78	0.78	0.79	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	1	0.99	0.98	0.97	0.95	0.93
+	0.9	0.76	0.65	0.58	0.58	0.57	0.56	0.56
+   </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.2	1.2	1.3	1.5	1.7	1.9	2	2
+	2	2	2	2	2	2	2	2
+	2	1.8	1.6	1.4	1.2	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1.15	1.4	1.7	2	2.3	2.4	2.4
+	2.4	2.4	2.4	2.3	2	1.7	1.4	1.15
+   </sequence>
+  </curve>
+ </namedParam>
+</Curves>
+<paper translate="text" name="Plain" text="Plain Paper" class="plain">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="VacuumIntensity">26</parameter>
+ <parameter type="integer" name="FeedAdjustment">107</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.738000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="VacuumIntensity">26</parameter>
+ <parameter type="integer" name="FeedAdjustment">107</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.738000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">0</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">109</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</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">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">109</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">0.250000</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">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="VacuumIntensity">26</parameter>
+ <parameter type="integer" name="FeedAdjustment">107</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.738000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">109</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">0.250000</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">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">0</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</parameter>
+  <parameter type="float" name="GCRLower">0.300000</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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">0</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">0.300000</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">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="VacuumIntensity">26</parameter>
+ <parameter type="integer" name="FeedAdjustment">107</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="VacuumIntensity">26</parameter>
+ <parameter type="integer" name="FeedAdjustment">107</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.200000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">0.250000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.890000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">103</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">0.250000</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">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="quadtone" text="Quadtone">
+  <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"
+class="premium">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">128</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.300000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.900000</parameter>
+  <parameter type="float" name="MagentaBalance">0.980000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</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>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <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"
+class="premium">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">128</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.300000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.900000</parameter>
+  <parameter type="float" name="MagentaBalance">0.980000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</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>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">128</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.300000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.900000</parameter>
+  <parameter type="float" name="MagentaBalance">0.980000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</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>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <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"
+class="premium">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="VacuumIntensity">26</parameter>
+ <parameter type="integer" name="FeedAdjustment">107</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">0.250000</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">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">128</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">0.250000</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">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">103</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">0.250000</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">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="VacuumIntensity">26</parameter>
+ <parameter type="integer" name="FeedAdjustment">107</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.738000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</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="quadtone" text="Quadtone">
+  <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_pigment.xml b/src/xml/escp2/media/pro_pigment.xml
new file mode 100644
index 0000000..ba1df50
--- /dev/null
+++ b/src/xml/escp2/media/pro_pigment.xml
@@ -0,0 +1,588 @@
+<?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="pro_pigment">
+<feature name="PaperThickness"/>
+<feature name="VacuumIntensity"/>
+<feature name="FeedAdjustment"/>
+<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.19	-0.22
+	-0.25	-0.22	-0.19	-0.15	-0.12	-0.1	-0.06	-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.49	0.51	0.55	0.61	0.67	0.71	0.76	0.79
+	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.94	0.93	0.9	0.86
+	0.82	0.69	0.6	0.54	0.52	0.51	0.5	0.49
+   </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.49	0.53	0.6	0.64	0.69	0.73	0.77	0.8
+	0.84	0.81	0.77	0.77	0.78	0.8	0.84	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.69	0.61	0.55	0.53	0.52	0.5	0.49
+   </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">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="VacuumIntensity">26</parameter>
+ <parameter type="integer" name="FeedAdjustment">107</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="VacuumIntensity">26</parameter>
+ <parameter type="integer" name="FeedAdjustment">107</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">0</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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="PaperThickness">1</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">109</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">109</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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="PaperThickness">1</parameter>
+ <parameter type="integer" name="VacuumIntensity">26</parameter>
+ <parameter type="integer" name="FeedAdjustment">107</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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="PaperThickness">1</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">109</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">0</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">0</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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="PaperThickness">1</parameter>
+ <parameter type="integer" name="VacuumIntensity">26</parameter>
+ <parameter type="integer" name="FeedAdjustment">107</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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="PaperThickness">1</parameter>
+ <parameter type="integer" name="VacuumIntensity">26</parameter>
+ <parameter type="integer" name="FeedAdjustment">107</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">103</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">128</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.800000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">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">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">128</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.800000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">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">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">128</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.800000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">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">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">0</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">0</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="VacuumIntensity">26</parameter>
+ <parameter type="integer" name="FeedAdjustment">107</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">128</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">103</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="VacuumIntensity">26</parameter>
+ <parameter type="integer" name="FeedAdjustment">107</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="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_ultrachrome.xml b/src/xml/escp2/media/pro_ultrachrome.xml
new file mode 100644
index 0000000..fef1cd1
--- /dev/null
+++ b/src/xml/escp2/media/pro_ultrachrome.xml
@@ -0,0 +1,941 @@
+<?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="pro_ultrachrome">
+<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.19	-0.22
+	-0.25	-0.22	-0.19	-0.15	-0.12	-0.1	-0.06	-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.49	0.51	0.55	0.61	0.67	0.71	0.76	0.79
+	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.94	0.93	0.9	0.86
+	0.82	0.69	0.6	0.54	0.52	0.51	0.5	0.49
+   </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.49	0.53	0.6	0.64	0.69	0.73	0.77	0.8
+	0.84	0.81	0.77	0.77	0.78	0.8	0.84	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.69	0.61	0.55	0.53	0.52	0.5	0.49
+   </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>
+<feature name="PaperThickness"/><feature name="VacuumIntensity"/><feature
+name="FeedAdjustment"/>
+<paper translate="text" name="Plain" text="Plain Paper" class="plain" PreferredInkset="Ultramatte">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="VacuumIntensity">26</parameter>
+ <parameter type="integer" name="FeedAdjustment">107</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="ultramatte" text="UltraChrome 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.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</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="PlainFast" text="Plain Paper Fast Load" class="plain"
+PreferredInkset="Ultramatte">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="VacuumIntensity">26</parameter>
+ <parameter type="integer" name="FeedAdjustment">107</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="ultramatte" text="UltraChrome 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.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</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="Postcard" text="Postcard" class="plain" PreferredInkset="Ultramatte">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">0</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="ultramatte" text="UltraChrome 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.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</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="GlossyFilm" text="Glossy Film" class="photo" PreferredInkset="Ultraphoto">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">109</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="ultramatte" text="UltraChrome 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</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="Transparency" text="Transparencies" class="transparency" PreferredInkset="Ultraphoto">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">109</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="ultramatte" text="UltraChrome 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</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="Envelope" text="Envelopes" class="plain" PreferredInkset="Ultramatte">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="VacuumIntensity">26</parameter>
+ <parameter type="integer" name="FeedAdjustment">107</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="ultramatte" text="UltraChrome 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.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</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="BackFilm" text="Back Light Film" class="transparency" PreferredInkset="Ultraphoto">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">109</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="ultramatte" text="UltraChrome 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</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="Matte" text="Matte Paper" class="good" PreferredInkset="Ultramatte">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">0</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="ultramatte" text="UltraChrome 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">1.250000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</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="MatteHeavy" text="Matte Paper Heavyweight" class="good" PreferredInkset="Ultramatte">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">0</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="ultramatte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</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="Inkjet" text="Inkjet Paper" class="good" PreferredInkset="Ultramatte">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="VacuumIntensity">26</parameter>
+ <parameter type="integer" name="FeedAdjustment">107</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="ultramatte" text="UltraChrome 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</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="Coated" text="Photo Quality Inkjet Paper" class="good" PreferredInkset="Ultraphoto">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="VacuumIntensity">26</parameter>
+ <parameter type="integer" name="FeedAdjustment">107</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="ultramatte" text="UltraChrome 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</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="Photo" text="Photo Paper" class="photo" PreferredInkset="Ultraphoto">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">103</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo Black">
+  <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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="ultramatte" text="UltraChrome 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</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="GlossyPhoto" text="Premium Glossy Photo Paper" class="premium" PreferredInkset="Ultraphoto">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">128</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.800000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">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="ultramatte" text="UltraChrome 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</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">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="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">128</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.800000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">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="ultramatte" text="UltraChrome 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</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">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="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">128</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.800000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">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="ultramatte" text="UltraChrome 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">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="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">0</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="ultramatte" text="UltraChrome 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</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="PaperThickness">2</parameter>
+  <parameter type="integer" name="VacuumIntensity">0</parameter>
+  <parameter type="integer" name="FeedAdjustment">0</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="ultramatte" text="UltraChrome 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</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="GlossyPaper" text="Photo Quality Glossy Paper" class="photo" PreferredInkset="Ultraphoto">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="VacuumIntensity">26</parameter>
+ <parameter type="integer" name="FeedAdjustment">107</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="ultramatte" text="UltraChrome 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</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="Ilford" text="Ilford Heavy Paper" class="premium" PreferredInkset="Ultramatte">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">128</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="ultramatte" text="UltraChrome 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</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="ColorLife" text="ColorLife Paper" class="premium" PreferredInkset="Ultraphoto">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">103</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="ultramatte" text="UltraChrome 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</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="Other" text="Other" class="plain" PreferredInkset="Ultramatte">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="VacuumIntensity">26</parameter>
+ <parameter type="integer" name="FeedAdjustment">107</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="ultramatte" text="UltraChrome 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.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</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>
+</escp2:papers>
+</gutenprint>
diff --git a/src/xml/escp2/media/pro_ultrachrome_k3.xml b/src/xml/escp2/media/pro_ultrachrome_k3.xml
new file mode 100644
index 0000000..8d0cdd4
--- /dev/null
+++ b/src/xml/escp2/media/pro_ultrachrome_k3.xml
@@ -0,0 +1,942 @@
+<?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="pro_ultrachrome">
+<feature name="PaperThickness"/>
+<feature name="VacuumIntensity"/>
+<feature name="FeedAdjustment"/>
+<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.19	-0.22
+	-0.25	-0.22	-0.19	-0.15	-0.12	-0.1	-0.06	-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.49	0.51	0.55	0.61	0.67	0.71	0.76	0.79
+	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.94	0.93	0.9	0.86
+	0.82	0.69	0.6	0.54	0.52	0.51	0.5	0.49
+   </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.49	0.53	0.6	0.64	0.69	0.73	0.77	0.8
+	0.84	0.81	0.77	0.77	0.78	0.8	0.84	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.69	0.61	0.55	0.53	0.52	0.5	0.49
+   </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="ultra3matte">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="VacuumIntensity">26</parameter>
+ <parameter type="integer" name="FeedAdjustment">107</parameter>
+
+ <ink translate="text" name="ultra3photo" text="UltraChrome Photo 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="UltraChrome 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.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</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="PlainFast" text="Plain Paper Fast Load" class="plain"
+PreferredInkset="Ultra3matte">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="VacuumIntensity">26</parameter>
+ <parameter type="integer" name="FeedAdjustment">107</parameter>
+
+ <ink translate="text" name="ultra3photo" text="UltraChrome Photo 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="UltraChrome 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.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</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="Postcard" text="Postcard" class="plain" PreferredInkset="Ultra3matte">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">0</parameter>
+
+ <ink translate="text" name="ultra3photo" text="UltraChrome Photo 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="UltraChrome 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.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</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="GlossyFilm" text="Glossy Film" class="photo" PreferredInkset="Ultra3photo">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">109</parameter>
+
+ <ink translate="text" name="ultra3photo" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="UltraChrome 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</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="Transparency" text="Transparencies" class="transparency" PreferredInkset="Ultra3photo">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">109</parameter>
+
+ <ink translate="text" name="ultra3photo" text="UltraChrome 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="UltraChrome 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</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="Envelope" text="Envelopes" class="plain" PreferredInkset="Ultra3matte">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="VacuumIntensity">26</parameter>
+ <parameter type="integer" name="FeedAdjustment">107</parameter>
+
+ <ink translate="text" name="ultra3photo" text="UltraChrome Photo 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="UltraChrome 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.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</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="BackFilm" text="Back Light Film" class="transparency" PreferredInkset="Ultra3photo">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">109</parameter>
+
+ <ink translate="text" name="ultra3photo" text="UltraChrome 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="UltraChrome 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</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="Matte" text="Matte Paper" class="good" PreferredInkset="Ultra3matte">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">0</parameter>
+
+ <ink translate="text" name="ultra3photo" text="UltraChrome Photo 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="UltraChrome 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">1.250000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</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="MatteHeavy" text="Matte Paper Heavyweight" class="good" PreferredInkset="Ultra3matte">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">0</parameter>
+
+ <ink translate="text" name="ultra3photo" text="UltraChrome Photo 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="UltraChrome Matte Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</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="Inkjet" text="Inkjet Paper" class="good" PreferredInkset="Ultra3matte">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="VacuumIntensity">26</parameter>
+ <parameter type="integer" name="FeedAdjustment">107</parameter>
+
+ <ink translate="text" name="ultra3photo" text="UltraChrome 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="UltraChrome 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</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="Coated" text="Photo Quality Inkjet Paper" class="good" PreferredInkset="Ultra3photo">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="VacuumIntensity">26</parameter>
+ <parameter type="integer" name="FeedAdjustment">107</parameter>
+
+ <ink translate="text" name="ultra3photo" text="UltraChrome 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="UltraChrome 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</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="Photo" text="Photo Paper" class="photo" PreferredInkset="Ultra3photo">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">103</parameter>
+
+ <ink translate="text" name="ultra3photo" text="UltraChrome Photo Black">
+  <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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="UltraChrome 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</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="GlossyPhoto" text="Premium Glossy Photo Paper" class="premium" PreferredInkset="Ultra3photo">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">128</parameter>
+
+ <ink translate="text" name="ultra3photo" text="UltraChrome Photo 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.800000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">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="UltraChrome 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</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">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="Ultra3photo">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">128</parameter>
+
+ <ink translate="text" name="ultra3photo" text="UltraChrome Photo 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.800000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">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="UltraChrome 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</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">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="Ultra3photo">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">128</parameter>
+
+ <ink translate="text" name="ultra3photo" text="UltraChrome Photo 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.800000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">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="UltraChrome 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">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="Ultra3matte">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">0</parameter>
+
+ <ink translate="text" name="ultra3photo" text="UltraChrome Photo 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="UltraChrome 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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="Ultra3matte">
+  <parameter type="integer" name="PaperThickness">2</parameter>
+  <parameter type="integer" name="VacuumIntensity">0</parameter>
+  <parameter type="integer" name="FeedAdjustment">0</parameter>
+
+ <ink translate="text" name="ultra3photo" text="UltraChrome Photo 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="UltraChrome 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</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="GlossyPaper" text="Photo Quality Glossy Paper" class="photo" PreferredInkset="Ultra3photo">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="VacuumIntensity">26</parameter>
+ <parameter type="integer" name="FeedAdjustment">107</parameter>
+
+ <ink translate="text" name="ultra3photo" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="UltraChrome 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</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="Ilford" text="Ilford Heavy Paper" class="premium" PreferredInkset="Ultra3matte">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">128</parameter>
+
+ <ink translate="text" name="ultra3photo" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="UltraChrome 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</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="ColorLife" text="ColorLife Paper" class="premium" PreferredInkset="Ultra3photo">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">103</parameter>
+
+ <ink translate="text" name="ultra3photo" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="UltraChrome 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</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="Other" text="Other" class="plain" PreferredInkset="Ultra3matte">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="VacuumIntensity">26</parameter>
+ <parameter type="integer" name="FeedAdjustment">107</parameter>
+
+ <ink translate="text" name="ultra3photo" text="UltraChrome Photo 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="UltraChrome 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.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</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>
+</escp2:papers>
+</gutenprint>
diff --git a/src/xml/escp2/media/r800.xml b/src/xml/escp2/media/r800.xml
new file mode 100644
index 0000000..6634d10
--- /dev/null
+++ b/src/xml/escp2/media/r800.xml
@@ -0,0 +1,837 @@
+<?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="r800">
+<Curves>
+ <namedParam name="cmykrbPhotoHue">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="-6" upper-bound="6">
+	0	-0.07	-0.1	-0.15	-0.19	-0.25	-0.3	-0.35
+	-0.38	-0.38	-0.3	-0.2	-0.1	0	0	0
+	0	0	0	0	0	0	0	0
+	0	0	0	0	0	0	0	0
+	0	0.02	0.05	0.09	0.13	0.15	0.16	0.17
+	0.17	0.17	0.16	0.15	0.13	0.09	0.05	0.02
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="cmykrbPhotoLum">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	0.75	0.75	0.75	0.75	0.76	0.8	0.85	0.9
+	0.9	0.88	0.82	0.85	0.87	0.89	0.91	0.95
+	0.98	0.98	0.97	0.97	0.96	0.96	0.96	0.96
+	0.96	0.97	0.98	0.98	0.99	1	1	1
+	1	1	1	0.99	0.98	0.97	0.96	0.93
+	0.88	0.87	0.86	0.85	0.82	0.79	0.76	0.75
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="cmykrbPhotoSat">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	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.03	1.06	1.09	1.12	1.15	1.18	1.2
+	1.2	1.15	1.1	1.05	1	1	1	1
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="cmykrbMatteHue">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="-6" upper-bound="6">
+	0	-0.07	-0.1	-0.15	-0.19	-0.25	-0.3	-0.35
+	-0.38	-0.38	-0.3	-0.2	-0.1	0	0.02	0.02
+	0	0	0	0	0	0	0	0
+	0	0	0	0	0	0	0	0
+	0	0.02	0.05	0.09	0.13	0.15	0.16	0.17
+	0.17	0.17	0.16	0.15	0.13	0.09	0.05	0.02
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="cmykrbMatteLum">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	0.75	0.75	0.75	0.75	0.76	0.8	0.85	0.9
+	0.9	0.88	0.82	0.78	0.78	0.82	0.85	0.92
+	0.98	0.98	0.97	0.97	0.96	0.96	0.96	0.96
+	0.96	0.97	0.98	0.98	0.99	1	1	1
+	1	1	1	0.99	0.98	0.97	0.96	0.93
+	0.88	0.87	0.86	0.85	0.82	0.79	0.76	0.75
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="cmykrbMatteSat">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	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.03	1.06	1.09	1.12	1.15	1.18	1.2
+	1.2	1.15	1.1	1.05	1	1	1	1
+   </sequence>
+  </curve>
+ </namedParam>
+</Curves>
+<paper translate="text" name="Plain" text="Plain Paper" class="plain" PreferredInkset="r800Matte">
+
+ <ink translate="text" name="cmykrbphoto" text="Photo 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.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykrbmatte" 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.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Postcard" text="Postcard" class="plain" PreferredInkset="r800Matte">
+
+ <ink translate="text" name="cmykrbphoto" text="Photo 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.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykrbmatte" 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.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyFilm" text="Glossy Film" class="photo" PreferredInkset="r800Photo">
+
+ <ink translate="text" name="cmykrbphoto" text="Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykrbmatte" text="Matte Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Transparency" text="Transparencies" class="transparency" PreferredInkset="r800Photo">
+
+ <ink translate="text" name="cmykrbphoto" 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.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykrbmatte" text="Matte Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Envelope" text="Envelopes" class="plain" PreferredInkset="r800Matte">
+
+ <ink translate="text" name="cmykrbphoto" text="Photo 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.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykrbmatte" 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.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="BackFilm" text="Back Light Film" class="transparency" PreferredInkset="r800Photo">
+
+ <ink translate="text" name="cmykrbphoto" 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.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykrbmatte" text="Matte Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Matte" text="Matte Paper" class="good" PreferredInkset="r800Matte">
+
+ <ink translate="text" name="cmykrbphoto" text="Photo 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.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykrbmatte" text="Matte Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="MatteHeavy" text="Matte Paper Heavyweight" class="good" PreferredInkset="r800Matte">
+
+ <ink translate="text" name="cmykrbphoto" text="Photo 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.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykrbmatte" text="Matte Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Inkjet" text="Inkjet Paper" class="good" PreferredInkset="r800Matte">
+
+ <ink translate="text" name="cmykrbphoto" 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.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykrbmatte" text="Matte Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.300000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Coated" text="Photo Quality Inkjet Paper" class="good" PreferredInkset="r800Photo">
+
+ <ink translate="text" name="cmykrbphoto" 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.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykrbmatte" text="Matte Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Photo" text="Photo Paper" class="photo" PreferredInkset="r800Photo">
+
+ <ink translate="text" name="cmykrbphoto" text="Photo Black">
+  <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.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykrbmatte" text="Matte Black">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyPhoto" text="Premium Glossy Photo Paper" class="premium" PreferredInkset="r800Photo">
+
+ <ink translate="text" name="cmykrbphoto" text="Photo Black">
+  <parameter type="float" name="Density">0.600000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">2.000000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</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="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykrbmatte" text="Matte Black">
+  <parameter type="float" name="Density">0.546000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</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="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Semigloss" text="Premium Semigloss Photo Paper" class="premium" PreferredInkset="r800Photo">
+
+ <ink translate="text" name="cmykrbphoto" text="Photo Black">
+  <parameter type="float" name="Density">0.600000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">2.000000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</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="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykrbmatte" text="Matte Black">
+  <parameter type="float" name="Density">0.546000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</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="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Luster" text="Premium Luster Photo Paper" class="premium" PreferredInkset="r800Photo">
+
+ <ink translate="text" name="cmykrbphoto" text="Photo Black">
+  <parameter type="float" name="Density">0.600000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">2.000000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</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="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykrbmatte" text="Matte Black">
+  <parameter type="float" name="Density">0.546000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</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="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="ArchivalMatte" text="Archival Matte Paper" class="premium" PreferredInkset="r800Matte">
+
+ <ink translate="text" name="cmykrbphoto" text="Photo 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.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykrbmatte" text="Matte Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="WaterColorRadiant" text="Watercolor Paper - Radiant White" class="premium" PreferredInkset="r800Matte">
+
+ <ink translate="text" name="cmykrbphoto" text="Photo 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.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykrbmatte" text="Matte Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper" class="photo" PreferredInkset="r800Photo">
+
+ <ink translate="text" name="cmykrbphoto" text="Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykrbmatte" text="Matte Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Ilford" text="Ilford Heavy Paper" class="premium" PreferredInkset="r800Matte">
+
+ <ink translate="text" name="cmykrbphoto" text="Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykrbmatte" text="Matte Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="ColorLife" text="ColorLife Paper" class="premium" PreferredInkset="r800Photo">
+
+ <ink translate="text" name="cmykrbphoto" text="Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykrbmatte" text="Matte Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Other" text="Other" class="plain" PreferredInkset="r800Matte">
+ <ink translate="text" name="cmykrbphoto" text="Photo 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.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykrbmatte" 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.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbMatteSat"/>
+ </ink>
+</paper>
+</escp2:papers>
+</gutenprint>
diff --git a/src/xml/escp2/media/standard.xml b/src/xml/escp2/media/standard.xml
new file mode 100644
index 0000000..c70d443
--- /dev/null
+++ b/src/xml/escp2/media/standard.xml
@@ -0,0 +1,788 @@
+<?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="standard">
+<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	0	-0.02	-0.04	-0.08	-0.12	-0.16
+	-0.2	-0.24	-0.28	-0.32	-0.32	-0.32	-0.32	-0.32
+	-0.36	-0.4	-0.44	-0.48	-0.5	-0.45	-0.4	-0.3
+	-0.12	-0.07	-0.04	-0.02	0	0	0	0
+	0	0	-0.03	-0.06	-0.09	-0.13	-0.17	-0.21
+	-0.25	-0.22	-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.56	0.58	0.62	0.68	0.73	0.78	0.82	0.85
+	0.85	0.82	0.78	0.78	0.79	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	1	0.99	0.98	0.97	0.95	0.93
+	0.9	0.76	0.65	0.58	0.58	0.57	0.56	0.56
+   </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.2	1.2	1.3	1.5	1.7	1.9	2	2
+	2	2	2	2	2	2	2	2
+	2	1.8	1.6	1.4	1.2	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1.15	1.4	1.7	2	2.3	2.4	2.4
+	2.4	2.4	2.4	2.3	2	1.7	1.4	1.15
+   </sequence>
+  </curve>
+ </namedParam>
+</Curves>
+<paper translate="text" name="Plain" text="Plain Paper" class="plain">
+ <parameter type="integer" name="FeedSequence">1</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">5</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">2</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">3</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">3</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">4</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">6</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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="quadtone" text="Quadtone">
+  <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"
+class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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="quadtone" text="Quadtone">
+  <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"
+class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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="quadtone" text="Quadtone">
+  <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"
+class="premium">
+ <parameter type="integer" name="FeedSequence">6</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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="quadtone" text="Quadtone">
+  <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">
+ <parameter type="integer" name="FeedSequence">0</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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="quadtone" text="Quadtone">
+  <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
new file mode 100644
index 0000000..49141f1
--- /dev/null
+++ b/src/xml/escp2/media/standard_gen0.xml
@@ -0,0 +1,769 @@
+<?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="standard_gen0">
+<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	0	-0.02	-0.04	-0.08	-0.12	-0.16
+	-0.2	-0.24	-0.28	-0.32	-0.32	-0.32	-0.32	-0.32
+	-0.36	-0.4	-0.44	-0.48	-0.5	-0.45	-0.4	-0.3
+	-0.12	-0.07	-0.04	-0.02	0	0	0	0
+	0	0	-0.03	-0.06	-0.09	-0.13	-0.17	-0.21
+	-0.25	-0.22	-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.56	0.58	0.62	0.68	0.73	0.78	0.82	0.85
+	0.85	0.82	0.78	0.78	0.79	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	1	0.99	0.98	0.97	0.95	0.93
+	0.9	0.76	0.65	0.58	0.58	0.57	0.56	0.56
+   </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.2	1.2	1.3	1.5	1.7	1.9	2	2
+	2	2	2	2	2	2	2	2
+	2	1.8	1.6	1.4	1.2	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1.15	1.4	1.7	2	2.3	2.4	2.4
+	2.4	2.4	2.4	2.3	2	1.7	1.4	1.15
+   </sequence>
+  </curve>
+ </namedParam>
+</Curves>
+<paper translate="text" name="Plain" text="Plain Paper" class="plain">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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="quadtone" text="Quadtone">
+  <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">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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="quadtone" text="Quadtone">
+  <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">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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="quadtone" text="Quadtone">
+  <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">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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="quadtone" text="Quadtone">
+  <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">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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="quadtone" text="Quadtone">
+  <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">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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="quadtone" text="Quadtone">
+  <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">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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="quadtone" text="Quadtone">
+  <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">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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="quadtone" text="Quadtone">
+  <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">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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="quadtone" text="Quadtone">
+  <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">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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="quadtone" text="Quadtone">
+  <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">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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="quadtone" text="Quadtone">
+  <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">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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="quadtone" text="Quadtone">
+  <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"
+class="premium">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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="quadtone" text="Quadtone">
+  <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"
+class="premium">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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="quadtone" text="Quadtone">
+  <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">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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="quadtone" text="Quadtone">
+  <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"
+class="premium">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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="quadtone" text="Quadtone">
+  <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">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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="quadtone" text="Quadtone">
+  <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">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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="quadtone" text="Quadtone">
+  <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">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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="quadtone" text="Quadtone">
+  <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/ultrachrome.xml b/src/xml/escp2/media/ultrachrome.xml
new file mode 100644
index 0000000..2c093f1
--- /dev/null
+++ b/src/xml/escp2/media/ultrachrome.xml
@@ -0,0 +1,918 @@
+<?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="ultrachrome">
+<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.19	-0.22
+	-0.25	-0.22	-0.19	-0.15	-0.12	-0.1	-0.06	-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.49	0.51	0.55	0.61	0.67	0.71	0.76	0.79
+	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.94	0.93	0.9	0.86
+	0.82	0.69	0.6	0.54	0.52	0.51	0.5	0.49
+   </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.49	0.53	0.6	0.64	0.69	0.73	0.77	0.8
+	0.84	0.81	0.77	0.77	0.78	0.8	0.84	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.69	0.61	0.55	0.53	0.52	0.5	0.49
+   </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="FeedSequence">1</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="ultramatte" text="UltraChrome 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.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</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="PlainFast" text="Plain Paper Fast Load" class="plain"
+PreferredInkset="UltraMatte">
+ <parameter type="integer" name="FeedSequence">5</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="ultramatte" text="UltraChrome 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.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</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="Postcard" text="Postcard" class="plain"
+PreferredInkset="UltraMatte">
+ <parameter type="integer" name="FeedSequence">2</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="ultramatte" text="UltraChrome 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.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</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="GlossyFilm" text="Glossy Film" class="photo"
+PreferredInkset="UltraPhoto">
+ <parameter type="integer" name="FeedSequence">3</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="ultramatte" text="UltraChrome 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</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="Transparency" text="Transparencies" class="transparency"
+PreferredInkset="UltraPhoto">
+ <parameter type="integer" name="FeedSequence">3</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="ultramatte" text="UltraChrome 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</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="Envelope" text="Envelopes" class="plain"
+PreferredInkset="UltraMatte">
+ <parameter type="integer" name="FeedSequence">4</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="ultramatte" text="UltraChrome 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.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</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="BackFilm" text="Back Light Film" class="transparency"
+PreferredInkset="UltraPhoto">
+ <parameter type="integer" name="FeedSequence">6</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="ultramatte" text="UltraChrome 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</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="Matte" text="Matte Paper" class="good"
+PreferredInkset="UltraMatte">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="ultramatte" text="UltraChrome 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">1.250000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</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="MatteHeavy" text="Matte Paper Heavyweight" class="good"
+PreferredInkset="UltraMatte">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="ultramatte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</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="Inkjet" text="Inkjet Paper" class="good"
+PreferredInkset="UltraMatte">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="ultramatte" text="UltraChrome 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</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="Coated" text="Photo Quality Inkjet Paper" class="good"
+PreferredInkset="UltraPhoto">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="ultramatte" text="UltraChrome 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</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="Photo" text="Photo Paper" class="photo"
+PreferredInkset="UltraPhoto">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo Black">
+  <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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="ultramatte" text="UltraChrome 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</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="GlossyPhoto" text="Premium Glossy Photo Paper"
+class="premium" PreferredInkset="UltraPhoto">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.800000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">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="ultramatte" text="UltraChrome 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</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">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="FeedSequence">8</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.800000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">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="ultramatte" text="UltraChrome 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</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">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="FeedSequence">8</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.800000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">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="ultramatte" text="UltraChrome 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">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="FeedSequence">7</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="ultramatte" text="UltraChrome 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</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="FeedSequence">7</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="ultramatte" text="UltraChrome 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</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="GlossyPaper" text="Photo Quality Glossy Paper"
+class="photo" PreferredInkset="UltraPhoto">
+ <parameter type="integer" name="FeedSequence">6</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="ultramatte" text="UltraChrome 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</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="Ilford" text="Ilford Heavy Paper" class="premium"
+PreferredInkset="UltraMatte">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="ultramatte" text="UltraChrome 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</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="ColorLife" text="ColorLife Paper" class="premium"
+PreferredInkset="UltraPhoto">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="ultramatte" text="UltraChrome 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</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="Other" text="Other" class="plain"
+PreferredInkset="UltraMatte">
+ <parameter type="integer" name="FeedSequence">0</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo 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.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter 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="ultramatte" text="UltraChrome 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.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</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>
+</escp2:papers>
+</gutenprint>
diff --git a/src/xml/escp2/media/wf500.xml b/src/xml/escp2/media/wf500.xml
new file mode 100644
index 0000000..4a92aac
--- /dev/null
+++ b/src/xml/escp2/media/wf500.xml
@@ -0,0 +1,1142 @@
+<?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="c120">
+<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	0	-0.02	-0.04	-0.08	-0.12	-0.16
+	-0.2	-0.24	-0.28	-0.32	-0.36	-0.37	-0.38	-0.39
+	-0.4	-0.45	-0.5	-0.52	-0.52	-0.5	-0.45	-0.4
+	-0.35	-0.27	-0.15	-0.06	0	0	0	0
+	0	0	-0.03	-0.06	-0.09	-0.13	-0.17	-0.21
+	-0.25	-0.22	-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.63	0.64	0.66	0.69	0.73	0.78	0.82	0.85
+	0.85	0.82	0.78	0.78	0.79	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	1	0.99	0.98	0.97	0.95	0.93
+	0.9	0.76	0.68	0.65	0.64	0.63	0.63	0.63
+   </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.2	1.2	1.3	1.5	1.7	1.9	2	2
+	2	2	2	2	2	2	2	2
+	2	1.8	1.6	1.4	1.2	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1.15	1.4	1.7	2	2.3	2.4	2.4
+	2.4	2.4	2.4	2.3	2	1.7	1.4	1.15
+   </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">0x20</parameter>
+
+ <resolution name="360x120sw">
+  <parameter type="integer" name="PrintMethod">0x00</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x00</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="360hq">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="720x360hq">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <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.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</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">
+ <parameter type="integer" name="PaperMedia">5</parameter>
+ <parameter type="integer" name="PrintMethod">0x20</parameter>
+
+ <resolution name="360x120sw">
+  <parameter type="integer" name="PrintMethod">0x00</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x00</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="360hq">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="720x360hq">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <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.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</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">
+ <parameter type="integer" name="PaperMedia">7</parameter>
+ <parameter type="integer" name="PrintMethod">0x30</parameter>
+
+ <resolution name="360x120sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="360hq">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720x360hq">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <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.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</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">
+ <parameter type="integer" name="PaperMedia">9</parameter>
+ <parameter type="integer" name="PrintMethod">0x30</parameter>
+
+ <resolution name="360x120sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="360hq">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720x360hq">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <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.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</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">
+ <parameter type="integer" name="PaperMedia">37</parameter>
+ <parameter type="integer" name="PrintMethod">0x30</parameter>
+
+ <resolution name="360x120sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="360hq">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720x360hq">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</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">
+ <parameter type="integer" name="PaperMedia">10</parameter>
+ <parameter type="integer" name="PrintMethod">0x30</parameter>
+
+ <resolution name="360x120sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="360hq">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720x360hq">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <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.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</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">
+ <parameter type="integer" name="PaperMedia">0</parameter>
+ <parameter type="integer" name="PrintMethod">0x50</parameter>
+
+ <resolution name="360x120sw">
+  <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="360hq">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="720x360hq">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x61</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x61</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x61</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x61</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x61</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x61</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.850000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.975000</parameter>
+  <parameter type="float" name="YellowBalance">0.975000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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">0x50</parameter>
+
+ <resolution name="360x120sw">
+  <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="360hq">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="720x360hq">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x61</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.850000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.975000</parameter>
+  <parameter type="float" name="YellowBalance">0.975000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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">0x30</parameter>
+
+ <resolution name="360x120sw">
+  <parameter type="integer" name="PrintMethod">0x00</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x00</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="360hq">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="720x360hq">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <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.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.850000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</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">
+ <parameter type="integer" name="PaperMedia">3</parameter>
+ <parameter type="integer" name="PrintMethod">0x30</parameter>
+
+ <resolution name="360x120sw">
+  <parameter type="integer" name="PrintMethod">0x00</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x00</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="360hq">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="720x360hq">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <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.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.850000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</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">
+ <parameter type="integer" name="PaperMedia">6</parameter>
+ <parameter type="integer" name="PrintMethod">0x32</parameter>
+
+ <resolution name="360x120sw">
+  <parameter type="integer" name="PrintMethod">0x32</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x32</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x32</parameter>
+ </resolution>
+ <resolution name="360hq">
+  <parameter type="integer" name="PrintMethod">0x32</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x32</parameter>
+ </resolution>
+ <resolution name="720x360hq">
+  <parameter type="integer" name="PrintMethod">0x32</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x61</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xc0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xc0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xc0</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.850000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.800000</parameter>
+  <parameter type="float" name="YellowBalance">0.800000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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">0x32</parameter>
+
+ <resolution name="360x120sw">
+  <parameter type="integer" name="PrintMethod">0x32</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x32</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x32</parameter>
+ </resolution>
+ <resolution name="360hq">
+  <parameter type="integer" name="PrintMethod">0x32</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x32</parameter>
+ </resolution>
+ <resolution name="720x360hq">
+  <parameter type="integer" name="PrintMethod">0x32</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x61</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xc0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xc0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xc0</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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">0.800000</parameter>
+  <parameter type="float" name="YellowBalance">0.800000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="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">0x32</parameter>
+
+ <resolution name="360x120sw">
+  <parameter type="integer" name="PrintMethod">0x32</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x32</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x32</parameter>
+ </resolution>
+ <resolution name="360hq">
+  <parameter type="integer" name="PrintMethod">0x32</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x32</parameter>
+ </resolution>
+ <resolution name="720x360hq">
+  <parameter type="integer" name="PrintMethod">0x32</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x61</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xc0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xc0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xc0</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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">0.800000</parameter>
+  <parameter type="float" name="YellowBalance">0.800000</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">0x32</parameter>
+
+ <resolution name="360x120sw">
+  <parameter type="integer" name="PrintMethod">0x32</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x32</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x32</parameter>
+ </resolution>
+ <resolution name="360hq">
+  <parameter type="integer" name="PrintMethod">0x32</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x32</parameter>
+ </resolution>
+ <resolution name="720x360hq">
+  <parameter type="integer" name="PrintMethod">0x32</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x61</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xc0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xc0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xc0</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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">0.800000</parameter>
+  <parameter type="float" name="YellowBalance">0.800000</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="photo">
+ <parameter type="integer" name="PaperMedia">19</parameter>
+ <parameter type="integer" name="PrintMethod">0x32</parameter>
+
+ <resolution name="360x120sw">
+  <parameter type="integer" name="PrintMethod">0x32</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x32</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x32</parameter>
+ </resolution>
+ <resolution name="360hq">
+  <parameter type="integer" name="PrintMethod">0x32</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x32</parameter>
+ </resolution>
+ <resolution name="720x360hq">
+  <parameter type="integer" name="PrintMethod">0x32</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x61</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xc0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xc0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xc0</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.830000</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="ColorLife" text="ColorLife Paper" class="premium">
+ <parameter type="integer" name="PaperMedia">22</parameter>
+ <parameter type="integer" name="PrintMethod">0x32</parameter>
+
+ <resolution name="360x120sw">
+  <parameter type="integer" name="PrintMethod">0x32</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x32</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x32</parameter>
+ </resolution>
+ <resolution name="360hq">
+  <parameter type="integer" name="PrintMethod">0x32</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x32</parameter>
+ </resolution>
+ <resolution name="720x360hq">
+  <parameter type="integer" name="PrintMethod">0x32</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x61</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xc0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xc0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xc0</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.830000</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">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</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/x80.xml b/src/xml/escp2/media/x80.xml
new file mode 100644
index 0000000..4aa8a8f
--- /dev/null
+++ b/src/xml/escp2/media/x80.xml
@@ -0,0 +1,465 @@
+<?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="x80">
+<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	0	-0.02	-0.04	-0.08	-0.12	-0.16
+	-0.2	-0.24	-0.28	-0.32	-0.32	-0.32	-0.32	-0.32
+	-0.36	-0.4	-0.44	-0.48	-0.5	-0.45	-0.4	-0.3
+	-0.12	-0.07	-0.04	-0.02	0	0	0	0
+	0	0	-0.03	-0.06	-0.09	-0.13	-0.17	-0.21
+	-0.25	-0.22	-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.56	0.58	0.62	0.68	0.73	0.78	0.82	0.85
+	0.85	0.82	0.78	0.78	0.79	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	1	0.99	0.98	0.97	0.95	0.93
+	0.9	0.76	0.65	0.58	0.58	0.57	0.56	0.56
+   </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.2	1.2	1.3	1.5	1.7	1.9	2	2
+	2	2	2	2	2	2	2	2
+	2	1.8	1.6	1.4	1.2	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1.15	1.4	1.7	2	2.3	2.4	2.4
+	2.4	2.4	2.4	2.3	2	1.7	1.4	1.15
+   </sequence>
+  </curve>
+ </namedParam>
+</Curves>
+<paper translate="text" name="Plain" text="Plain Paper" class="plain">
+ <parameter type="integer" name="FeedSequence">1</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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">
+ <parameter type="integer" name="FeedSequence">5</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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">
+ <parameter type="integer" name="FeedSequence">2</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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">
+ <parameter type="integer" name="FeedSequence">3</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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">
+ <parameter type="integer" name="FeedSequence">3</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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">
+ <parameter type="integer" name="FeedSequence">4</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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">
+ <parameter type="integer" name="FeedSequence">6</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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"
+class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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"
+class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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"
+class="premium">
+ <parameter type="integer" name="FeedSequence">6</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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">
+ <parameter type="integer" name="FeedSequence">0</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <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
new file mode 100644
index 0000000..f458520
--- /dev/null
+++ b/src/xml/escp2/mediasizes/Makefile.am
@@ -0,0 +1,40 @@
+## $Id: Makefile.am,v 1.2 2008/06/10 13:10:51 rlk Exp $
+## Copyright (C) 2008 Robert Krawitz
+##
+## 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, 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.
+
+## Process this file with automake to produce Makefile.in.
+
+@SET_MAKE@
+
+include $(top_srcdir)/scripts/global.mk
+
+## Variables
+
+pkgxmldatadir = $(pkgdatadir)/@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@/xml/escp2/mediasizes
+
+pkgxmldata_DATA =				\
+	standard.xml
+
+xml-stamp: $(pkgxmldata_DATA) Makefile.am
+	-rm -f xml-stamp
+	touch xml-stamp
+	for f in $(pkgxmldata_DATA) ; do echo $$f >> xml-stamp; done
+
+all-local: xml-stamp
+
+CLEANFILES = xmli18n-tmp.h xml-stamp
+
+EXTRA_DIST = $(pkgxmldata_DATA)
diff --git a/src/xml/escp2/mediasizes/Makefile.in b/src/xml/escp2/mediasizes/Makefile.in
new file mode 100644
index 0000000..5b7c459
--- /dev/null
+++ b/src/xml/escp2/mediasizes/Makefile.in
@@ -0,0 +1,494 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# Variables
+
+#export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
+#export STP_DATA_PATH = $(top_srcdir)/src/xml
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(top_srcdir)/scripts/global.mk
+subdir = src/xml/escp2/mediasizes
+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
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(pkgxmldatadir)"
+pkgxmldataDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(pkgxmldata_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_CUPS_PPDS = @BUILD_CUPS_PPDS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CONVERT = @CONVERT@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+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@
+DB2PS = @DB2PS@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DIALOG = @DIALOG@
+DOXYGEN = @DOXYGEN@
+DSYMUTIL = @DSYMUTIL@
+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@
+FIND = @FIND@
+FOOMATIC_CONFIGURE = @FOOMATIC_CONFIGURE@
+FOOMATIC_KITLOAD = @FOOMATIC_KITLOAD@
+FOOMATIC_PPDFILE = @FOOMATIC_PPDFILE@
+GENPPD_LIBS = @GENPPD_LIBS@
+GIMP2_CFLAGS = @GIMP2_CFLAGS@
+GIMP2_LIBS = @GIMP2_LIBS@
+GIMPTOOL2_CHECK = @GIMPTOOL2_CHECK@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GNUCFLAGS = @GNUCFLAGS@
+GREP = @GREP@
+GTK2_CFLAGS = @GTK2_CFLAGS@
+GTK2_LIBS = @GTK2_LIBS@
+GUTENPRINTUI2_BINARY_AGE = @GUTENPRINTUI2_BINARY_AGE@
+GUTENPRINTUI2_CFLAGS = @GUTENPRINTUI2_CFLAGS@
+GUTENPRINTUI2_CURRENT_INTERFACE = @GUTENPRINTUI2_CURRENT_INTERFACE@
+GUTENPRINTUI2_INTERFACE_AGE = @GUTENPRINTUI2_INTERFACE_AGE@
+GUTENPRINTUI2_LIBDEPS = @GUTENPRINTUI2_LIBDEPS@
+GUTENPRINTUI2_LIBS = $(top_builddir)/src/gutenprintui2/libgutenprintui2.la
+GUTENPRINTUI2_VERSION = @GUTENPRINTUI2_VERSION@
+GUTENPRINT_BINARY_AGE = @GUTENPRINT_BINARY_AGE@
+GUTENPRINT_CFLAGS = @GUTENPRINT_CFLAGS@
+GUTENPRINT_CURRENT_INTERFACE = @GUTENPRINT_CURRENT_INTERFACE@
+GUTENPRINT_INTERFACE_AGE = @GUTENPRINT_INTERFACE_AGE@
+GUTENPRINT_LIBDEPS = @GUTENPRINT_LIBDEPS@
+
+# Libraries
+GUTENPRINT_LIBS = $(top_builddir)/src/main/libgutenprint.la
+GUTENPRINT_MAJOR_VERSION = @GUTENPRINT_MAJOR_VERSION@
+GUTENPRINT_MICRO_VERSION = @GUTENPRINT_MICRO_VERSION@
+GUTENPRINT_MINOR_VERSION = @GUTENPRINT_MINOR_VERSION@
+GUTENPRINT_VERSION = @GUTENPRINT_VERSION@
+IJS_CFLAGS = @IJS_CFLAGS@
+IJS_CONFIG = @IJS_CONFIG@
+IJS_LIBS = @IJS_LIBS@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBREADLINE_DEPS = @LIBREADLINE_DEPS@
+LIBS = $(INTLLIBS) @LIBS@
+LIBTOOL = @LIBTOOL@
+LIBTOOL_DEPS = @LIBTOOL_DEPS@
+LN_S = @LN_S@
+LTALLOCA = @LTALLOCA@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PKG_CONFIG = @PKG_CONFIG@
+PLUG_IN_PATH = @PLUG_IN_PATH@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+RELEASE_DATE = @RELEASE_DATE@
+RM = @RM@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TEST = @TEST@
+TEXI2HTML = @TEXI2HTML@
+TRUE = @TRUE@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WHICH_PPDS = @WHICH_PPDS@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+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@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+cups_bindir = @cups_bindir@
+cups_conf_datadir = @cups_conf_datadir@
+cups_conf_serverbin = @cups_conf_serverbin@
+cups_conf_serverroot = @cups_conf_serverroot@
+cups_exec_prefix = @cups_exec_prefix@
+cups_prefix = @cups_prefix@
+cups_sbindir = @cups_sbindir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+gimp2_plug_indir = @gimp2_plug_indir@
+gutenprint_cflags = @gutenprint_cflags@
+gutenprint_libdeps = @gutenprint_libdeps@
+gutenprint_libs = @gutenprint_libs@
+gutenprintui2_cflags = @gutenprintui2_cflags@
+gutenprintui2_libdeps = @gutenprintui2_libdeps@
+gutenprintui2_libs = @gutenprintui2_libs@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+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/mediasizes
+pkgxmldata_DATA = \
+	standard.xml
+
+CLEANFILES = xmli18n-tmp.h xml-stamp
+EXTRA_DIST = $(pkgxmldata_DATA)
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/scripts/global.mk $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/xml/escp2/mediasizes/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  src/xml/escp2/mediasizes/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-pkgxmldataDATA: $(pkgxmldata_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(pkgxmldatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgxmldatadir)"
+	@list='$(pkgxmldata_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(pkgxmldataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgxmldatadir)/$$f'"; \
+	  $(pkgxmldataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgxmldatadir)/$$f"; \
+	done
+
+uninstall-pkgxmldataDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(pkgxmldata_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(pkgxmldatadir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(pkgxmldatadir)/$$f"; \
+	done
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA) all-local
+installdirs:
+	for dir in "$(DESTDIR)$(pkgxmldatadir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-pkgxmldataDATA
+
+install-dvi: install-dvi-am
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-info: install-info-am
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+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 \
+	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 \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am uninstall uninstall-am uninstall-pkgxmldataDATA
+
+
+@SET_MAKE@
+
+# Rules
+
+$(top_builddir)/src/main/libgutenprint.la:
+	cd $(top_builddir)/src/main; \
+	$(MAKE)
+
+$(top_builddir)/src/gutenprintui/libgutenprintui.la:
+	cd $(top_builddir)/src/gutenprintui; \
+	$(MAKE)
+
+$(top_builddir)/src/gutenprintui2/libgutenprintui2.la:
+	cd $(top_builddir)/src/gutenprintui2; \
+	$(MAKE)
+
+xml-stamp: $(pkgxmldata_DATA) Makefile.am
+	-rm -f xml-stamp
+	touch xml-stamp
+	for f in $(pkgxmldata_DATA) ; do echo $$f >> xml-stamp; done
+
+all-local: 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/mediasizes/standard.xml b/src/xml/escp2/mediasizes/standard.xml
new file mode 100644
index 0000000..31cc7e0
--- /dev/null
+++ b/src/xml/escp2/mediasizes/standard.xml
@@ -0,0 +1,118 @@
+<?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:MediaSizes name="default">
+ <MediaSize type="sheet" name="A4">
+  <parameter type="integer" name="PaperMediaSize">0</parameter>
+ </MediaSize>
+ <MediaSize type="sheet" name="Letter">
+  <parameter type="integer" name="PaperMediaSize">1</parameter>
+ </MediaSize>
+ <MediaSize type="sheet" name="Legal">
+  <parameter type="integer" name="PaperMediaSize">2</parameter>
+ </MediaSize>
+ <MediaSize type="sheet" name="A5">
+  <parameter type="integer" name="PaperMediaSize">3</parameter>
+ </MediaSize>
+ <MediaSize type="sheet" name="A6">
+  <parameter type="integer" name="PaperMediaSize">4</parameter>
+ </MediaSize>
+ <MediaSize type="sheet" name="B5">
+  <parameter type="integer" name="PaperMediaSize">5</parameter>
+ </MediaSize>
+ <MediaSize type="sheet" name="Executive">
+  <parameter type="integer" name="PaperMediaSize">6</parameter>
+ </MediaSize>
+ <MediaSize type="sheet" name="Statement">
+  <parameter type="integer" name="PaperMediaSize">7</parameter>
+ </MediaSize>
+ <MediaSize type="sheet" name="w324h495">
+  <parameter type="integer" name="PaperMediaSize">9</parameter>
+ </MediaSize>
+ <MediaSize type="sheet" name="w288h432">
+  <parameter type="integer" name="PaperMediaSize">10</parameter>
+ </MediaSize>
+ <MediaSize type="sheet" name="w360h576">
+  <parameter type="integer" name="PaperMediaSize">11</parameter>
+ </MediaSize>
+ <MediaSize type="sheet" name="c8x10">
+  <parameter type="integer" name="PaperMediaSize">12</parameter>
+ </MediaSize>
+ <MediaSize type="sheet" name="w283h425">
+  <parameter type="integer" name="PaperMediaSize">13</parameter>
+ </MediaSize>
+ <MediaSize type="sheet" name="w566h850">
+  <parameter type="integer" name="PaperMediaSize">14</parameter>
+ </MediaSize>
+ <MediaSize type="sheet" name="w252h360">
+  <parameter type="integer" name="PaperMediaSize">15</parameter>
+ </MediaSize>
+ <MediaSize type="sheet" name="COM10_l">
+  <parameter type="integer" name="PaperMediaSize">18</parameter>
+ </MediaSize>
+ <MediaSize type="sheet" name="C6_l">
+  <parameter type="integer" name="PaperMediaSize">19</parameter>
+ </MediaSize>
+ <MediaSize type="sheet" name="DL_l">
+  <parameter type="integer" name="PaperMediaSize">20</parameter>
+ </MediaSize>
+ <MediaSize type="sheet" name="w360h504">
+  <parameter type="integer" name="PaperMediaSize">28</parameter>
+ </MediaSize>
+ <MediaSize type="sheet" name="COM10">
+  <parameter type="integer" name="PaperMediaSize">29</parameter>
+ </MediaSize>
+ <MediaSize type="sheet" name="C6">
+  <parameter type="integer" name="PaperMediaSize">30</parameter>
+ </MediaSize>
+ <MediaSize type="sheet" name="DL">
+  <parameter type="integer" name="PaperMediaSize">31</parameter>
+ </MediaSize>
+ <MediaSize type="sheet" name="SuperB">
+  <parameter type="integer" name="PaperMediaSize">61</parameter>
+ </MediaSize>
+ <MediaSize type="sheet" name="A3">
+  <parameter type="integer" name="PaperMediaSize">62</parameter>
+ </MediaSize>
+ <MediaSize type="sheet" name="B4">
+  <parameter type="integer" name="PaperMediaSize">63</parameter>
+ </MediaSize>
+ <MediaSize type="sheet" name="Tabloid">
+  <parameter type="integer" name="PaperMediaSize">64</parameter>
+ </MediaSize>
+ <MediaSize type="sheet" name="w792h1008">
+  <parameter type="integer" name="PaperMediaSize">65</parameter>
+ </MediaSize>
+ <MediaSize type="sheet" name="B3">
+  <parameter type="integer" name="PaperMediaSize">66</parameter>
+ </MediaSize>
+ <MediaSize type="sheet" name="A2">
+  <parameter type="integer" name="PaperMediaSize">67</parameter>
+ </MediaSize>
+ <MediaSize type="sheet" name="EngineeringC">
+  <parameter type="integer" name="PaperMediaSize">68</parameter>
+ </MediaSize>
+ <MediaSize type="default">
+  <parameter type="integer" name="PaperMediaSize">99</parameter>
+ </MediaSize>
+</escp2:MediaSizes>
+</gutenprint>
diff --git a/src/xml/escp2/model/Makefile.am b/src/xml/escp2/model/Makefile.am
new file mode 100644
index 0000000..9a2c2d0
--- /dev/null
+++ b/src/xml/escp2/model/Makefile.am
@@ -0,0 +1,134 @@
+## $Id: Makefile.am,v 1.9 2008/10/19 13:57:27 rlk Exp $
+## Copyright (C) 2008 Robert Krawitz
+##
+## 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, 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.
+
+## Process this file with automake to produce Makefile.in.
+
+@SET_MAKE@
+
+include $(top_srcdir)/scripts/global.mk
+
+## Variables
+
+pkgxmldatadir = $(pkgdatadir)/@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@/xml/escp2/model
+
+pkgxmldata_DATA =				\
+	model_0.xml				\
+	model_1.xml				\
+	model_2.xml				\
+	model_3.xml				\
+	model_4.xml				\
+	model_5.xml				\
+	model_6.xml				\
+	model_7.xml				\
+	model_8.xml				\
+	model_9.xml				\
+	model_10.xml				\
+	model_11.xml				\
+	model_12.xml				\
+	model_13.xml				\
+	model_14.xml				\
+	model_15.xml				\
+	model_16.xml				\
+	model_17.xml				\
+	model_18.xml				\
+	model_19.xml				\
+	model_20.xml				\
+	model_21.xml				\
+	model_22.xml				\
+	model_23.xml				\
+	model_24.xml				\
+	model_25.xml				\
+	model_26.xml				\
+	model_27.xml				\
+	model_28.xml				\
+	model_29.xml				\
+	model_30.xml				\
+	model_31.xml				\
+	model_32.xml				\
+	model_33.xml				\
+	model_34.xml				\
+	model_35.xml				\
+	model_36.xml				\
+	model_37.xml				\
+	model_38.xml				\
+	model_39.xml				\
+	model_40.xml				\
+	model_41.xml				\
+	model_42.xml				\
+	model_43.xml				\
+	model_44.xml				\
+	model_45.xml				\
+	model_46.xml				\
+	model_47.xml				\
+	model_48.xml				\
+	model_49.xml				\
+	model_50.xml				\
+	model_51.xml				\
+	model_52.xml				\
+	model_53.xml				\
+	model_54.xml				\
+	model_55.xml				\
+	model_56.xml				\
+	model_57.xml				\
+	model_58.xml				\
+	model_59.xml				\
+	model_60.xml				\
+	model_61.xml				\
+	model_62.xml				\
+	model_63.xml				\
+	model_64.xml				\
+	model_65.xml				\
+	model_66.xml				\
+	model_67.xml				\
+	model_68.xml				\
+	model_69.xml				\
+	model_70.xml				\
+	model_71.xml				\
+	model_72.xml				\
+	model_73.xml				\
+	model_74.xml				\
+	model_75.xml				\
+	model_76.xml				\
+	model_77.xml				\
+	model_78.xml				\
+	model_79.xml				\
+	model_80.xml				\
+	model_81.xml				\
+	model_82.xml				\
+	model_83.xml				\
+	model_84.xml				\
+	model_85.xml				\
+	model_86.xml				\
+	model_87.xml				\
+	model_88.xml				\
+	model_89.xml				\
+	model_90.xml				\
+	model_91.xml				\
+	model_92.xml				\
+	model_93.xml				\
+	model_94.xml
+
+xml-stamp: $(pkgxmldata_DATA) Makefile.am
+	-rm -f xml-stamp
+	touch xml-stamp
+	for f in $(pkgxmldata_DATA) ; do echo $$f >> xml-stamp; done
+
+all-local: xml-stamp
+
+CLEANFILES = xmli18n-tmp.h xml-stamp
+
+EXTRA_DIST = $(pkgxmldata_DATA)
diff --git a/src/xml/escp2/model/Makefile.in b/src/xml/escp2/model/Makefile.in
new file mode 100644
index 0000000..2dc9783
--- /dev/null
+++ b/src/xml/escp2/model/Makefile.in
@@ -0,0 +1,588 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# Variables
+
+#export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
+#export STP_DATA_PATH = $(top_srcdir)/src/xml
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(top_srcdir)/scripts/global.mk
+subdir = src/xml/escp2/model
+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
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(pkgxmldatadir)"
+pkgxmldataDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(pkgxmldata_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_CUPS_PPDS = @BUILD_CUPS_PPDS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CONVERT = @CONVERT@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+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@
+DB2PS = @DB2PS@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DIALOG = @DIALOG@
+DOXYGEN = @DOXYGEN@
+DSYMUTIL = @DSYMUTIL@
+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@
+FIND = @FIND@
+FOOMATIC_CONFIGURE = @FOOMATIC_CONFIGURE@
+FOOMATIC_KITLOAD = @FOOMATIC_KITLOAD@
+FOOMATIC_PPDFILE = @FOOMATIC_PPDFILE@
+GENPPD_LIBS = @GENPPD_LIBS@
+GIMP2_CFLAGS = @GIMP2_CFLAGS@
+GIMP2_LIBS = @GIMP2_LIBS@
+GIMPTOOL2_CHECK = @GIMPTOOL2_CHECK@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GNUCFLAGS = @GNUCFLAGS@
+GREP = @GREP@
+GTK2_CFLAGS = @GTK2_CFLAGS@
+GTK2_LIBS = @GTK2_LIBS@
+GUTENPRINTUI2_BINARY_AGE = @GUTENPRINTUI2_BINARY_AGE@
+GUTENPRINTUI2_CFLAGS = @GUTENPRINTUI2_CFLAGS@
+GUTENPRINTUI2_CURRENT_INTERFACE = @GUTENPRINTUI2_CURRENT_INTERFACE@
+GUTENPRINTUI2_INTERFACE_AGE = @GUTENPRINTUI2_INTERFACE_AGE@
+GUTENPRINTUI2_LIBDEPS = @GUTENPRINTUI2_LIBDEPS@
+GUTENPRINTUI2_LIBS = $(top_builddir)/src/gutenprintui2/libgutenprintui2.la
+GUTENPRINTUI2_VERSION = @GUTENPRINTUI2_VERSION@
+GUTENPRINT_BINARY_AGE = @GUTENPRINT_BINARY_AGE@
+GUTENPRINT_CFLAGS = @GUTENPRINT_CFLAGS@
+GUTENPRINT_CURRENT_INTERFACE = @GUTENPRINT_CURRENT_INTERFACE@
+GUTENPRINT_INTERFACE_AGE = @GUTENPRINT_INTERFACE_AGE@
+GUTENPRINT_LIBDEPS = @GUTENPRINT_LIBDEPS@
+
+# Libraries
+GUTENPRINT_LIBS = $(top_builddir)/src/main/libgutenprint.la
+GUTENPRINT_MAJOR_VERSION = @GUTENPRINT_MAJOR_VERSION@
+GUTENPRINT_MICRO_VERSION = @GUTENPRINT_MICRO_VERSION@
+GUTENPRINT_MINOR_VERSION = @GUTENPRINT_MINOR_VERSION@
+GUTENPRINT_VERSION = @GUTENPRINT_VERSION@
+IJS_CFLAGS = @IJS_CFLAGS@
+IJS_CONFIG = @IJS_CONFIG@
+IJS_LIBS = @IJS_LIBS@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBREADLINE_DEPS = @LIBREADLINE_DEPS@
+LIBS = $(INTLLIBS) @LIBS@
+LIBTOOL = @LIBTOOL@
+LIBTOOL_DEPS = @LIBTOOL_DEPS@
+LN_S = @LN_S@
+LTALLOCA = @LTALLOCA@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PKG_CONFIG = @PKG_CONFIG@
+PLUG_IN_PATH = @PLUG_IN_PATH@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+RELEASE_DATE = @RELEASE_DATE@
+RM = @RM@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TEST = @TEST@
+TEXI2HTML = @TEXI2HTML@
+TRUE = @TRUE@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WHICH_PPDS = @WHICH_PPDS@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+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@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+cups_bindir = @cups_bindir@
+cups_conf_datadir = @cups_conf_datadir@
+cups_conf_serverbin = @cups_conf_serverbin@
+cups_conf_serverroot = @cups_conf_serverroot@
+cups_exec_prefix = @cups_exec_prefix@
+cups_prefix = @cups_prefix@
+cups_sbindir = @cups_sbindir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+gimp2_plug_indir = @gimp2_plug_indir@
+gutenprint_cflags = @gutenprint_cflags@
+gutenprint_libdeps = @gutenprint_libdeps@
+gutenprint_libs = @gutenprint_libs@
+gutenprintui2_cflags = @gutenprintui2_cflags@
+gutenprintui2_libdeps = @gutenprintui2_libdeps@
+gutenprintui2_libs = @gutenprintui2_libs@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+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/model
+pkgxmldata_DATA = \
+	model_0.xml				\
+	model_1.xml				\
+	model_2.xml				\
+	model_3.xml				\
+	model_4.xml				\
+	model_5.xml				\
+	model_6.xml				\
+	model_7.xml				\
+	model_8.xml				\
+	model_9.xml				\
+	model_10.xml				\
+	model_11.xml				\
+	model_12.xml				\
+	model_13.xml				\
+	model_14.xml				\
+	model_15.xml				\
+	model_16.xml				\
+	model_17.xml				\
+	model_18.xml				\
+	model_19.xml				\
+	model_20.xml				\
+	model_21.xml				\
+	model_22.xml				\
+	model_23.xml				\
+	model_24.xml				\
+	model_25.xml				\
+	model_26.xml				\
+	model_27.xml				\
+	model_28.xml				\
+	model_29.xml				\
+	model_30.xml				\
+	model_31.xml				\
+	model_32.xml				\
+	model_33.xml				\
+	model_34.xml				\
+	model_35.xml				\
+	model_36.xml				\
+	model_37.xml				\
+	model_38.xml				\
+	model_39.xml				\
+	model_40.xml				\
+	model_41.xml				\
+	model_42.xml				\
+	model_43.xml				\
+	model_44.xml				\
+	model_45.xml				\
+	model_46.xml				\
+	model_47.xml				\
+	model_48.xml				\
+	model_49.xml				\
+	model_50.xml				\
+	model_51.xml				\
+	model_52.xml				\
+	model_53.xml				\
+	model_54.xml				\
+	model_55.xml				\
+	model_56.xml				\
+	model_57.xml				\
+	model_58.xml				\
+	model_59.xml				\
+	model_60.xml				\
+	model_61.xml				\
+	model_62.xml				\
+	model_63.xml				\
+	model_64.xml				\
+	model_65.xml				\
+	model_66.xml				\
+	model_67.xml				\
+	model_68.xml				\
+	model_69.xml				\
+	model_70.xml				\
+	model_71.xml				\
+	model_72.xml				\
+	model_73.xml				\
+	model_74.xml				\
+	model_75.xml				\
+	model_76.xml				\
+	model_77.xml				\
+	model_78.xml				\
+	model_79.xml				\
+	model_80.xml				\
+	model_81.xml				\
+	model_82.xml				\
+	model_83.xml				\
+	model_84.xml				\
+	model_85.xml				\
+	model_86.xml				\
+	model_87.xml				\
+	model_88.xml				\
+	model_89.xml				\
+	model_90.xml				\
+	model_91.xml				\
+	model_92.xml				\
+	model_93.xml				\
+	model_94.xml
+
+CLEANFILES = xmli18n-tmp.h xml-stamp
+EXTRA_DIST = $(pkgxmldata_DATA)
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/scripts/global.mk $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/xml/escp2/model/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  src/xml/escp2/model/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-pkgxmldataDATA: $(pkgxmldata_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(pkgxmldatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgxmldatadir)"
+	@list='$(pkgxmldata_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(pkgxmldataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgxmldatadir)/$$f'"; \
+	  $(pkgxmldataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgxmldatadir)/$$f"; \
+	done
+
+uninstall-pkgxmldataDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(pkgxmldata_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(pkgxmldatadir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(pkgxmldatadir)/$$f"; \
+	done
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA) all-local
+installdirs:
+	for dir in "$(DESTDIR)$(pkgxmldatadir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-pkgxmldataDATA
+
+install-dvi: install-dvi-am
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-info: install-info-am
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+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 \
+	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 \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am uninstall uninstall-am uninstall-pkgxmldataDATA
+
+
+@SET_MAKE@
+
+# Rules
+
+$(top_builddir)/src/main/libgutenprint.la:
+	cd $(top_builddir)/src/main; \
+	$(MAKE)
+
+$(top_builddir)/src/gutenprintui/libgutenprintui.la:
+	cd $(top_builddir)/src/gutenprintui; \
+	$(MAKE)
+
+$(top_builddir)/src/gutenprintui2/libgutenprintui2.la:
+	cd $(top_builddir)/src/gutenprintui2; \
+	$(MAKE)
+
+xml-stamp: $(pkgxmldata_DATA) Makefile.am
+	-rm -f xml-stamp
+	touch xml-stamp
+	for f in $(pkgxmldata_DATA) ; do echo $$f >> xml-stamp; done
+
+all-local: 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_0.xml b/src/xml/escp2/model/model_0.xml
new file mode 100644
index 0000000..4cc765e
--- /dev/null
+++ b/src/xml/escp2/model/model_0.xml
@@ -0,0 +1,126 @@
+<?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="0">
+ <media src="escp2/media/standard_gen0.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/standard_gen0.xml"/>
+ <commandSet>1998</commandSet>
+ <borderless>No</borderless>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>15</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>4</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>720 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>684 3168</maximumMediaSize>
+ <maximumImageableArea>612 3168</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 9 40</margins>
+ <margins interleave="printer" media="sheet">9 9 9 40</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <AlignmentChoices>1 7 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x90dpi" text="360 x 90 DPI Fast Economy">
+   <physicalResolution>360 90</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">-2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="180dpi" text="180 DPI Economy">
+   <physicalResolution>180 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">-2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x180dpi" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">-2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360mw" text="360 DPI High Quality">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">-2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">-2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</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">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">-2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720mw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.568000</parameter>
+   <parameter type="integer" name="escp2_ink_type">-2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_1.xml b/src/xml/escp2/model/model_1.xml
new file mode 100644
index 0000000..a1dc62b
--- /dev/null
+++ b/src/xml/escp2/model/model_1.xml
@@ -0,0 +1,144 @@
+<?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="1">
+ <media src="escp2/media/standard_gen0.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/standard_gen0.xml"/>
+ <commandSet>1998</commandSet>
+ <borderless>No</borderless>
+ <sendZeroAdvance/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>1</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>720 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>684 3168</maximumMediaSize>
+ <maximumImageableArea>612 3168</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 9 40</margins>
+ <margins interleave="printer" media="sheet">9 9 9 40</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <AlignmentChoices>1 7 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x90dpi" text="360 x 90 DPI Fast Economy">
+   <physicalResolution>360 90</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">-2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x120dpi" text="360 x 120 DPI Economy">
+   <physicalResolution>360 120</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">-2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="180dpi" text="180 DPI Economy">
+   <physicalResolution>180 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">-2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x240dpi" text="360 x 240 DPI Draft">
+   <physicalResolution>360 240</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">-2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x180dpi" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">-2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360mw" text="360 DPI High Quality">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">-2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">-2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360mw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">-2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720mw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.568000</parameter>
+   <parameter type="integer" name="escp2_ink_type">-2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_10.xml b/src/xml/escp2/model/model_10.xml
new file mode 100644
index 0000000..a1a2630
--- /dev/null
+++ b/src/xml/escp2/model/model_10.xml
@@ -0,0 +1,146 @@
+<?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="10">
+ <media src="escp2/media/standard.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/standard.xml"/>
+ <preinitRemoteSequence>PM\002\000\000\000</preinitRemoteSequence>
+ <commandSet>1999</commandSet>
+ <borderless>No</borderless>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>21</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>4</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>720 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <extra720DPISeparation>8</extra720DPISeparation>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>684 3168</maximumMediaSize>
+ <maximumImageableArea>612 3168</maximumImageableArea>
+ <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>
+ <AlignmentChoices>1 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"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x90dpi" text="360 x 90 DPI Fast Economy">
+   <physicalResolution>360 90</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">4.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="180dpi" text="180 DPI Economy">
+   <physicalResolution>180 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">4.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x180dpi" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">4.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360mw" text="360 DPI High Quality">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">2.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</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">1.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.900000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720hq" text="720 DPI High Quality">
+   <physicalResolution>720 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.900000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720hq2" text="720 DPI Highest Quality">
+   <physicalResolution>720 720</physicalResolution>
+   <verticalPasses>4</verticalPasses>
+   <parameter type="float" name="escp2_density">0.900000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_11.xml b/src/xml/escp2/model/model_11.xml
new file mode 100644
index 0000000..0241387
--- /dev/null
+++ b/src/xml/escp2/model/model_11.xml
@@ -0,0 +1,145 @@
+<?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="11">
+ <media src="escp2/media/standard.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/standard.xml"/>
+ <preinitRemoteSequence>PM\002\000\000\000</preinitRemoteSequence>
+ <commandSet>1999</commandSet>
+ <borderless>No</borderless>
+ <sendZeroAdvance/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>32</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>4</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>1440 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <extra720DPISeparation>8</extra720DPISeparation>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>684 3168</maximumMediaSize>
+ <maximumImageableArea>612 3168</maximumImageableArea>
+ <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>
+ <AlignmentChoices>1 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"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x90dpi" text="360 x 90 DPI Fast Economy">
+   <physicalResolution>360 90</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">4.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="180dpi" text="180 DPI Economy">
+   <physicalResolution>180 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">4.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x180dpi" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">4.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360mw" text="360 DPI High Quality">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">2.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</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">1.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720mw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.900000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">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.450000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720hq2" text="1440 x 720 DPI Highest Quality">
+   <physicalResolution>1440 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.450000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_12.xml b/src/xml/escp2/model/model_12.xml
new file mode 100644
index 0000000..52491fe
--- /dev/null
+++ b/src/xml/escp2/model/model_12.xml
@@ -0,0 +1,159 @@
+<?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="12">
+ <media src="escp2/media/standard.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/standard.xml"/>
+ <preinitRemoteSequence>PM\002\000\000\000</preinitRemoteSequence>
+ <commandSet>1999</commandSet>
+ <borderless>No</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>48</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="black">
+  <Nozzles>144</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="fast">
+  <Nozzles>144</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>1440 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>684 3168</maximumMediaSize>
+ <maximumImageableArea>612 3168</maximumImageableArea>
+ <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>
+ <AlignmentChoices>3 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"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x120sw" text="360 x 120 DPI Economy">
+   <physicalResolution>360 120</physicalResolution>
+   <parameter type="float" name="escp2_density">4.000000</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">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x240sw" text="360 x 240 DPI Draft">
+   <physicalResolution>360 240</physicalResolution>
+   <parameter type="float" name="escp2_density">4.000000</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">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">2.000000</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">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.000000</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">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</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">0.568000</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">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720hq" text="720 DPI High Quality">
+   <physicalResolution>720 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.568000</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">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</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.568000</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">0.500000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720hq2" text="1440 x 720 DPI Highest Quality">
+   <physicalResolution>1440 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.568000</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">0.500000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_13.xml b/src/xml/escp2/model/model_13.xml
new file mode 100644
index 0000000..18f1b60
--- /dev/null
+++ b/src/xml/escp2/model/model_13.xml
@@ -0,0 +1,162 @@
+<?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="13">
+ <media src="escp2/media/standard.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/standard.xml"/>
+ <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>1999</commandSet>
+ <borderless>No</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>96</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>2</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="black">
+  <Nozzles>192</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="fast">
+  <Nozzles>192</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>180 180</minimumResolution>
+ <maximumResolution>1440 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>684 3168</maximumMediaSize>
+ <maximumImageableArea>612 3168</maximumImageableArea>
+ <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>
+ <AlignmentChoices>3 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"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="180sw" text="180 DPI Economy">
+   <physicalResolution>180 180</physicalResolution>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.580000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x180sw" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.580000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.580000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.400000</parameter>
+   <parameter type="float" name="DropSize2">0.675000</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">0.730000</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">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.610000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720hq" text="720 DPI High Quality">
+   <physicalResolution>720 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.730000</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">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.610000</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.700000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">180</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.390000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720hq2" text="1440 x 720 DPI Highest Quality">
+   <physicalResolution>1440 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.700000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">180</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.390000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_14.xml b/src/xml/escp2/model/model_14.xml
new file mode 100644
index 0000000..f4db1ed
--- /dev/null
+++ b/src/xml/escp2/model/model_14.xml
@@ -0,0 +1,151 @@
+<?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="14">
+ <media src="escp2/media/photo_gen1.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/photo_gen1.xml"/>
+ <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>1999</commandSet>
+ <borderless>No</borderless>
+ <supportsVariableDropsizes/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>48</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>6</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>1440 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>684 3168</maximumMediaSize>
+ <maximumImageableArea>612 3168</maximumImageableArea>
+ <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>
+ <AlignmentChoices>3 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">
+   <physicalResolution>360 120</physicalResolution>
+   <parameter type="float" name="escp2_density">4.000000</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">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x240sw" text="360 x 240 DPI Draft">
+   <physicalResolution>360 240</physicalResolution>
+   <parameter type="float" name="escp2_density">4.000000</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">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">2.000000</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">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.000000</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">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</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">0.568000</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">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720hq" text="720 DPI High Quality">
+   <physicalResolution>720 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.568000</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">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</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.568000</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">0.500000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720hq2" text="1440 x 720 DPI Highest Quality">
+   <physicalResolution>1440 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.568000</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">0.500000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_15.xml b/src/xml/escp2/model/model_15.xml
new file mode 100644
index 0000000..b905452
--- /dev/null
+++ b/src/xml/escp2/model/model_15.xml
@@ -0,0 +1,151 @@
+<?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="15">
+ <media src="escp2/media/photo_gen1.xml"/>
+ <inputSlots src="escp2/inputslots/standard_roll_feed.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/photo_gen1.xml"/>
+ <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>1999</commandSet>
+ <borderless>No</borderless>
+ <supportsVariableDropsizes/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>48</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>6</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>1440 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>936 3168</maximumMediaSize>
+ <maximumImageableArea>936 3168</maximumImageableArea>
+ <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>
+ <AlignmentChoices>3 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">
+   <physicalResolution>360 120</physicalResolution>
+   <parameter type="float" name="escp2_density">4.000000</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">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x240sw" text="360 x 240 DPI Draft">
+   <physicalResolution>360 240</physicalResolution>
+   <parameter type="float" name="escp2_density">4.000000</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">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">2.000000</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">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.000000</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">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</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">0.568000</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">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720hq" text="720 DPI High Quality">
+   <physicalResolution>720 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.568000</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">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</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.568000</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">0.500000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720hq2" text="1440 x 720 DPI Highest Quality">
+   <physicalResolution>1440 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.568000</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">0.500000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_16.xml b/src/xml/escp2/model/model_16.xml
new file mode 100644
index 0000000..ba8a29e
--- /dev/null
+++ b/src/xml/escp2/model/model_16.xml
@@ -0,0 +1,164 @@
+<?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="16">
+ <media src="escp2/media/standard.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/standard.xml"/>
+ <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>1999</commandSet>
+ <borderless>No</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>48</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="black">
+  <Nozzles>144</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="fast">
+  <Nozzles>144</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>1440 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>684 3168</maximumMediaSize>
+ <maximumImageableArea>612 3168</maximumImageableArea>
+ <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>
+ <AlignmentChoices>3 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"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x120sw" text="360 x 120 DPI Economy">
+   <physicalResolution>360 120</physicalResolution>
+   <parameter type="float" name="escp2_density">2.600000</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">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.580000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x240sw" text="360 x 240 DPI Draft">
+   <physicalResolution>360 240</physicalResolution>
+   <parameter type="float" name="escp2_density">2.600000</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">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.580000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.300000</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">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.580000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</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">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.580000</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">0.568000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720hq" text="720 DPI High Quality">
+   <physicalResolution>720 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.568000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</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.523000</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">0.330000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720hq2" text="1440 x 720 DPI Highest Quality">
+   <physicalResolution>1440 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.523000</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">0.330000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_17.xml b/src/xml/escp2/model/model_17.xml
new file mode 100644
index 0000000..44b347f
--- /dev/null
+++ b/src/xml/escp2/model/model_17.xml
@@ -0,0 +1,164 @@
+<?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="17">
+ <media src="escp2/media/standard.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/standard.xml"/>
+ <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>1999</commandSet>
+ <borderless>No</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>48</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="black">
+  <Nozzles>144</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="fast">
+  <Nozzles>144</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>1440 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>936 3168</maximumMediaSize>
+ <maximumImageableArea>936 3168</maximumImageableArea>
+ <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>
+ <AlignmentChoices>3 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"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x120sw" text="360 x 120 DPI Economy">
+   <physicalResolution>360 120</physicalResolution>
+   <parameter type="float" name="escp2_density">2.600000</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">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.580000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x240sw" text="360 x 240 DPI Draft">
+   <physicalResolution>360 240</physicalResolution>
+   <parameter type="float" name="escp2_density">2.600000</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">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.580000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.300000</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">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.580000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</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">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.580000</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">0.568000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720hq" text="720 DPI High Quality">
+   <physicalResolution>720 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.568000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</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.523000</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">0.330000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720hq2" text="1440 x 720 DPI Highest Quality">
+   <physicalResolution>1440 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.523000</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">0.330000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_18.xml b/src/xml/escp2/model/model_18.xml
new file mode 100644
index 0000000..4e8619f
--- /dev/null
+++ b/src/xml/escp2/model/model_18.xml
@@ -0,0 +1,148 @@
+<?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="18">
+ <media src="escp2/media/standard.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/standard.xml"/>
+ <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>1999</commandSet>
+ <borderless>No</borderless>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>32</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>4</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>1440 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <extra720DPISeparation>8</extra720DPISeparation>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>684 3168</maximumMediaSize>
+ <maximumImageableArea>612 3168</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 9 9</margins>
+ <margins interleave="printer" media="sheet">9 9 9 26</margins>
+ <margins interleave="soft" media="roll">9 9 9 0</margins>
+ <margins interleave="printer" media="roll">9 9 9 0</margins>
+ <AlignmentChoices>1 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"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x90dpi" text="360 x 90 DPI Fast Economy">
+   <physicalResolution>360 90</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">4.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="180dpi" text="180 DPI Economy">
+   <physicalResolution>180 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">4.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x180dpi" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">4.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360mw" text="360 DPI High Quality">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">2.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</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">1.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">0</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720mw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.646000</parameter>
+   <parameter type="integer" name="escp2_ink_type">0</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">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.323000</parameter>
+   <parameter type="integer" name="escp2_ink_type">0</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720hq2" text="1440 x 720 DPI Highest Quality">
+   <physicalResolution>1440 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.323000</parameter>
+   <parameter type="integer" name="escp2_ink_type">0</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_19.xml b/src/xml/escp2/model/model_19.xml
new file mode 100644
index 0000000..a6d6f3d
--- /dev/null
+++ b/src/xml/escp2/model/model_19.xml
@@ -0,0 +1,164 @@
+<?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="19">
+ <media src="escp2/media/standard.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/standard.xml"/>
+ <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>1999</commandSet>
+ <borderless>No</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>48</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="black">
+  <Nozzles>144</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="fast">
+  <Nozzles>144</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>1440 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>684 3168</maximumMediaSize>
+ <maximumImageableArea>612 3168</maximumImageableArea>
+ <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>
+ <AlignmentChoices>3 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"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x120sw" text="360 x 120 DPI Economy">
+   <physicalResolution>360 120</physicalResolution>
+   <parameter type="float" name="escp2_density">2.600000</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">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.580000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x240sw" text="360 x 240 DPI Draft">
+   <physicalResolution>360 240</physicalResolution>
+   <parameter type="float" name="escp2_density">2.600000</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">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.580000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.300000</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">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.580000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</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">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.580000</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">0.568000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720hq" text="720 DPI High Quality">
+   <physicalResolution>720 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.568000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</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.523000</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">0.330000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720hq2" text="1440 x 720 DPI Highest Quality">
+   <physicalResolution>1440 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.523000</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">0.330000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_2.xml b/src/xml/escp2/model/model_2.xml
new file mode 100644
index 0000000..c7502c6
--- /dev/null
+++ b/src/xml/escp2/model/model_2.xml
@@ -0,0 +1,144 @@
+<?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="2">
+ <media src="escp2/media/cmy.xml"/>
+ <inputSlots src="escp2/inputslots/standard_roll_feed.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/cmy.xml"/>
+ <commandSet>1998</commandSet>
+ <borderless>No</borderless>
+ <sendZeroAdvance/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>1</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>720 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>1224 3168</maximumMediaSize>
+ <maximumImageableArea>1224 3168</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 9 40</margins>
+ <margins interleave="printer" media="sheet">9 9 9 40</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <AlignmentChoices>1 7 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x90dpi" text="360 x 90 DPI Fast Economy">
+   <physicalResolution>360 90</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">-2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x120dpi" text="360 x 120 DPI Economy">
+   <physicalResolution>360 120</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">-2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="180dpi" text="180 DPI Economy">
+   <physicalResolution>180 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">-2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x240dpi" text="360 x 240 DPI Draft">
+   <physicalResolution>360 240</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">-2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x180dpi" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">-2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360mw" text="360 DPI High Quality">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">-2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">-2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360mw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">-2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720mw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.631000</parameter>
+   <parameter type="integer" name="escp2_ink_type">-2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_20.xml b/src/xml/escp2/model/model_20.xml
new file mode 100644
index 0000000..681c1a7
--- /dev/null
+++ b/src/xml/escp2/model/model_20.xml
@@ -0,0 +1,161 @@
+<?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="20">
+ <media src="escp2/media/photo_gen1.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/photo_gen1.xml"/>
+ <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>1999</commandSet>
+ <borderless>No</borderless>
+ <supportsVariableDropsizes/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>32</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>4</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>6</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>1440 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>684 3168</maximumMediaSize>
+ <maximumImageableArea>612 3168</maximumImageableArea>
+ <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>
+ <AlignmentChoices>3 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="360x90sw" text="360 x 90 DPI Fast Economy">
+   <physicalResolution>360 90</physicalResolution>
+   <parameter type="float" name="escp2_density">4.000000</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">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="180sw" text="180 DPI Economy">
+   <physicalResolution>180 180</physicalResolution>
+   <parameter type="float" name="escp2_density">4.000000</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">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x180sw" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <parameter type="float" name="escp2_density">4.000000</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">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">2.000000</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">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</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">0.568000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720hq" text="720 DPI High Quality">
+   <physicalResolution>720 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.568000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</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.568000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.500000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720hq2" text="1440 x 720 DPI Highest Quality">
+   <physicalResolution>1440 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.568000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.500000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_21.xml b/src/xml/escp2/model/model_21.xml
new file mode 100644
index 0000000..a3146df
--- /dev/null
+++ b/src/xml/escp2/model/model_21.xml
@@ -0,0 +1,157 @@
+<?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="21">
+ <media src="escp2/media/x80.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/x80.xml"/>
+ <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>No</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsInkChange/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>15</Nozzles>
+  <MinNozzles>15</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="black">
+  <Nozzles>48</Nozzles>
+  <MinNozzles>48</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="fast">
+  <Nozzles>48</Nozzles>
+  <MinNozzles>48</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <maxBlackResolution>360</maxBlackResolution>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>720 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <initialVerticalOffset>-99</initialVerticalOffset>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>684 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <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>
+ <AlignmentChoices>3 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"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x120sw" text="360 x 120 DPI Economy">
+   <physicalResolution>360 120</physicalResolution>
+   <parameter type="float" name="escp2_density">2.800000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.325000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x240sw" text="360 x 240 DPI Draft">
+   <physicalResolution>360 240</physicalResolution>
+   <parameter type="float" name="escp2_density">2.800000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.325000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.400000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.325000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.700000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.325000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</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">0.710000</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">0.325000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720hq" text="720 DPI High Quality">
+   <physicalResolution>720 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.710000</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">0.325000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720hq2" text="720 DPI Highest Quality">
+   <physicalResolution>720 720</physicalResolution>
+   <verticalPasses>4</verticalPasses>
+   <parameter type="float" name="escp2_density">0.710000</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">0.325000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_22.xml b/src/xml/escp2/model/model_22.xml
new file mode 100644
index 0000000..387ad1f
--- /dev/null
+++ b/src/xml/escp2/model/model_22.xml
@@ -0,0 +1,155 @@
+<?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="22">
+ <media src="escp2/media/photo_gen2.xml"/>
+ <inputSlots src="escp2/inputslots/standard_roll_feed.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/photo_gen2.xml"/>
+ <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>
+ <supportsVariableDropsizes/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>48</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>6</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>1440 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>684 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <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>
+ <AlignmentChoices>3 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">
+   <physicalResolution>360 120</physicalResolution>
+   <parameter type="float" name="escp2_density">2.600000</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">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.580000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x240sw" text="360 x 240 DPI Draft">
+   <physicalResolution>360 240</physicalResolution>
+   <parameter type="float" name="escp2_density">2.600000</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">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.580000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.300000</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">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.580000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</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">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.580000</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">0.568000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720hq" text="720 DPI High Quality">
+   <physicalResolution>720 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.568000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</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.523000</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">0.330000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720hq2" text="1440 x 720 DPI Highest Quality">
+   <physicalResolution>1440 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.523000</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">0.330000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_23.xml b/src/xml/escp2/model/model_23.xml
new file mode 100644
index 0000000..d0d93bc
--- /dev/null
+++ b/src/xml/escp2/model/model_23.xml
@@ -0,0 +1,155 @@
+<?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="23">
+ <media src="escp2/media/photo_gen2.xml"/>
+ <inputSlots src="escp2/inputslots/standard_roll_feed.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/photo_gen2.xml"/>
+ <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>
+ <supportsVariableDropsizes/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>48</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>6</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>1440 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>936 86400</maximumMediaSize>
+ <maximumImageableArea>936 86400</maximumImageableArea>
+ <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>
+ <AlignmentChoices>3 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">
+   <physicalResolution>360 120</physicalResolution>
+   <parameter type="float" name="escp2_density">2.600000</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">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.580000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x240sw" text="360 x 240 DPI Draft">
+   <physicalResolution>360 240</physicalResolution>
+   <parameter type="float" name="escp2_density">2.600000</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">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.580000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.300000</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">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.580000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</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">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.580000</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">0.568000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720hq" text="720 DPI High Quality">
+   <physicalResolution>720 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.568000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</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.523000</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">0.330000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720hq2" text="1440 x 720 DPI Highest Quality">
+   <physicalResolution>1440 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.523000</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">0.330000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_24.xml b/src/xml/escp2/model/model_24.xml
new file mode 100644
index 0000000..a2722b1
--- /dev/null
+++ b/src/xml/escp2/model/model_24.xml
@@ -0,0 +1,143 @@
+<?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="24">
+ <media src="escp2/media/standard_gen0.xml"/>
+ <inputSlots src="escp2/inputslots/standard_roll_feed.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/standard_gen0.xml"/>
+ <commandSet>1998</commandSet>
+ <borderless>No</borderless>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>64</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>2</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <minimumResolution>180 180</minimumResolution>
+ <maximumResolution>1440 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <pseudoSeparationRows>4</pseudoSeparationRows>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>1224 3168</maximumMediaSize>
+ <maximumImageableArea>1224 3168</maximumImageableArea>
+ <margins interleave="soft" media="sheet">8 9 9 40</margins>
+ <margins interleave="printer" media="sheet">8 9 9 40</margins>
+ <margins interleave="soft" media="roll">8 9 0 0</margins>
+ <margins interleave="printer" media="roll">8 9 0 0</margins>
+ <AlignmentChoices>1 7 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="180dpi" text="180 DPI Economy">
+   <physicalResolution>180 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x180dpi" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360mw" text="360 DPI High Quality">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</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">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.775000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720hq" text="720 DPI High Quality">
+   <physicalResolution>720 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.775000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">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.388000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720hq2" text="1440 x 720 DPI Highest Quality">
+   <physicalResolution>1440 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.388000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_25.xml b/src/xml/escp2/model/model_25.xml
new file mode 100644
index 0000000..101c713
--- /dev/null
+++ b/src/xml/escp2/model/model_25.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="25">
+ <media src="escp2/media/standard.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/standard.xml"/>
+ <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>No</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>32</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>4</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="black">
+  <Nozzles>64</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>2</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="fast">
+  <Nozzles>64</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>2</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>1440 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>684 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <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>
+ <AlignmentChoices>3 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"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x90sw" text="360 x 90 DPI Fast Economy">
+   <physicalResolution>360 90</physicalResolution>
+   <parameter type="float" name="escp2_density">4.000000</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">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="180sw" text="180 DPI Economy">
+   <physicalResolution>180 180</physicalResolution>
+   <parameter type="float" name="escp2_density">4.000000</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">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x180sw" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <parameter type="float" name="escp2_density">4.000000</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">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">2.000000</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">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.000000</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">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</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">0.568000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720hq" text="720 DPI High Quality">
+   <physicalResolution>720 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.568000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</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.568000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.500000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720hq2" text="1440 x 720 DPI Highest Quality">
+   <physicalResolution>1440 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.568000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.500000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_26.xml b/src/xml/escp2/model/model_26.xml
new file mode 100644
index 0000000..28ca114
--- /dev/null
+++ b/src/xml/escp2/model/model_26.xml
@@ -0,0 +1,157 @@
+<?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="26">
+ <media src="escp2/media/photo_pigment.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/photo_pigment.xml"/>
+ <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>No</borderless>
+ <supportsVariableDropsizes/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>48</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="black">
+  <Nozzles>144</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="fast">
+  <Nozzles>144</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>6</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>1440 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>936 86400</maximumMediaSize>
+ <maximumImageableArea>936 86400</maximumImageableArea>
+ <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>
+ <AlignmentChoices>2 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">
+   <physicalResolution>360 120</physicalResolution>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.550000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x240sw" text="360 x 240 DPI Draft">
+   <physicalResolution>360 240</physicalResolution>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.550000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.550000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.550000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.852000</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">0.550000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720hq" text="720 DPI High Quality">
+   <physicalResolution>720 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.852000</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">0.550000</parameter>
+   <parameter type="float" name="DropSize2">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.438000</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">0.550000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720hq2" text="1440 x 720 DPI Highest Quality">
+   <physicalResolution>1440 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.438000</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">0.550000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_27.xml b/src/xml/escp2/model/model_27.xml
new file mode 100644
index 0000000..ee67a94
--- /dev/null
+++ b/src/xml/escp2/model/model_27.xml
@@ -0,0 +1,132 @@
+<?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="27">
+ <media src="escp2/media/photo_gen0.xml"/>
+ <inputSlots src="escp2/inputslots/spro5000.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/photo_gen0.xml"/>
+ <commandSet>1998</commandSet>
+ <borderless>No</borderless>
+ <sendZeroAdvance/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>64</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>2</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>6</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <minimumResolution>180 180</minimumResolution>
+ <maximumResolution>1440 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <extra720DPISeparation>4</extra720DPISeparation>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>936 3168</maximumMediaSize>
+ <maximumImageableArea>936 3168</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 30</margins>
+ <margins interleave="printer" media="sheet">9 9 0 30</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <AlignmentChoices>1 7 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="180sw" text="180 DPI Economy">
+   <physicalResolution>180 180</physicalResolution>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x180sw" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</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.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</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">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.775000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720hq" text="720 DPI High Quality">
+   <physicalResolution>720 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.775000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">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.550000</parameter>
+   <parameter type="integer" name="escp2_ink_type">4</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720hq2" text="1440 x 720 DPI Highest Quality">
+   <physicalResolution>1440 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.550000</parameter>
+   <parameter type="integer" name="escp2_ink_type">4</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_28.xml b/src/xml/escp2/model/model_28.xml
new file mode 100644
index 0000000..51d2496
--- /dev/null
+++ b/src/xml/escp2/model/model_28.xml
@@ -0,0 +1,130 @@
+<?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="28">
+ <media src="escp2/media/pro_gen1.xml"/>
+ <inputSlots src="escp2/inputslots/pro_roll_feed.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/pro_gen1.xml"/>
+ <printerWeaves src="escp2/weaves/pro7000.xml"/>
+ <commandSet>Pro</commandSet>
+ <borderless>No</borderless>
+ <sendZeroAdvance/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>1</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>6</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>1440 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>504 504</minimumMediaSize>
+ <maximumMediaSize>1728 86400</maximumMediaSize>
+ <maximumImageableArea>1728 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 9 40</margins>
+ <margins interleave="printer" media="sheet">9 9 9 40</margins>
+ <margins interleave="soft" media="roll">9 9 9 9</margins>
+ <margins interleave="printer" media="roll">9 9 9 9</margins>
+ <AlignmentChoices>1 7 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="360x90dpi" text="360 x 90 DPI Fast Economy">
+   <physicalResolution>360 90</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="180dpi" text="180 DPI Economy">
+   <physicalResolution>180 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x180dpi" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360pro" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360mw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720mw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.775000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720mw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.388000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_29.xml b/src/xml/escp2/model/model_29.xml
new file mode 100644
index 0000000..767d65d
--- /dev/null
+++ b/src/xml/escp2/model/model_29.xml
@@ -0,0 +1,130 @@
+<?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="29">
+ <media src="escp2/media/pro_pigment.xml"/>
+ <inputSlots src="escp2/inputslots/pro_roll_feed.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/pro_pigment.xml"/>
+ <printerWeaves src="escp2/weaves/pro7500.xml"/>
+ <commandSet>Pro</commandSet>
+ <borderless>No</borderless>
+ <sendZeroAdvance/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>1</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>6</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>1440 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>504 504</minimumMediaSize>
+ <maximumMediaSize>1728 86400</maximumMediaSize>
+ <maximumImageableArea>1728 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 9 40</margins>
+ <margins interleave="printer" media="sheet">9 9 9 40</margins>
+ <margins interleave="soft" media="roll">9 9 9 9</margins>
+ <margins interleave="printer" media="roll">9 9 9 9</margins>
+ <AlignmentChoices>1 7 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="360x90dpi" text="360 x 90 DPI Fast Economy">
+   <physicalResolution>360 90</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">3.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="180dpi" text="180 DPI Economy">
+   <physicalResolution>180 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">3.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x180dpi" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">3.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360pro" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">1.500000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360mw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.780000</parameter>
+   <parameter type="integer" name="escp2_ink_type">2</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720mw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.775000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720mw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.388000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_3.xml b/src/xml/escp2/model/model_3.xml
new file mode 100644
index 0000000..aa6198c
--- /dev/null
+++ b/src/xml/escp2/model/model_3.xml
@@ -0,0 +1,151 @@
+<?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="3">
+ <media src="escp2/media/standard_gen0.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/standard_gen0.xml"/>
+ <commandSet>1998</commandSet>
+ <borderless>No</borderless>
+ <sendZeroAdvance/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>32</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>4</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>1440 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <extra720DPISeparation>8</extra720DPISeparation>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>684 3168</maximumMediaSize>
+ <maximumImageableArea>612 3168</maximumImageableArea>
+ <margins interleave="soft" media="sheet">8 9 0 30</margins>
+ <margins interleave="printer" media="sheet">8 9 0 30</margins>
+ <margins interleave="soft" media="roll">8 9 0 0</margins>
+ <margins interleave="printer" media="roll">8 9 0 0</margins>
+ <AlignmentChoices>1 7 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x90dpi" text="360 x 90 DPI Fast Economy">
+   <physicalResolution>360 90</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">4</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="180dpi" text="180 DPI Economy">
+   <physicalResolution>180 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">4</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x180dpi" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">4</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360mw" text="360 DPI High Quality">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">4</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">4</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</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">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.775000</parameter>
+   <parameter type="integer" name="escp2_ink_type">2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720hq" text="720 DPI High Quality">
+   <physicalResolution>720 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.775000</parameter>
+   <parameter type="integer" name="escp2_ink_type">2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">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.388000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720hq2" text="1440 x 720 DPI Highest Quality">
+   <physicalResolution>1440 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.388000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_30.xml b/src/xml/escp2/model/model_30.xml
new file mode 100644
index 0000000..a9a3b5e
--- /dev/null
+++ b/src/xml/escp2/model/model_30.xml
@@ -0,0 +1,130 @@
+<?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="30">
+ <media src="escp2/media/pro_gen1.xml"/>
+ <inputSlots src="escp2/inputslots/pro_roll_feed.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/pro_gen1.xml"/>
+ <printerWeaves src="escp2/weaves/pro7000.xml"/>
+ <commandSet>Pro</commandSet>
+ <borderless>No</borderless>
+ <sendZeroAdvance/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>1</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>6</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>1440 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>504 504</minimumMediaSize>
+ <maximumMediaSize>3168 86400</maximumMediaSize>
+ <maximumImageableArea>3168 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 9 40</margins>
+ <margins interleave="printer" media="sheet">9 9 9 40</margins>
+ <margins interleave="soft" media="roll">9 9 9 9</margins>
+ <margins interleave="printer" media="roll">9 9 9 9</margins>
+ <AlignmentChoices>1 7 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="360x90dpi" text="360 x 90 DPI Fast Economy">
+   <physicalResolution>360 90</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="180dpi" text="180 DPI Economy">
+   <physicalResolution>180 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x180dpi" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360pro" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360mw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720mw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.775000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720mw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.388000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_31.xml b/src/xml/escp2/model/model_31.xml
new file mode 100644
index 0000000..c512354
--- /dev/null
+++ b/src/xml/escp2/model/model_31.xml
@@ -0,0 +1,130 @@
+<?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="31">
+ <media src="escp2/media/pro_pigment.xml"/>
+ <inputSlots src="escp2/inputslots/pro_roll_feed.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/pro_pigment.xml"/>
+ <printerWeaves src="escp2/weaves/pro7500.xml"/>
+ <commandSet>Pro</commandSet>
+ <borderless>No</borderless>
+ <sendZeroAdvance/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>1</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>6</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>1440 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>504 504</minimumMediaSize>
+ <maximumMediaSize>3168 86400</maximumMediaSize>
+ <maximumImageableArea>3168 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 9 40</margins>
+ <margins interleave="printer" media="sheet">9 9 9 40</margins>
+ <margins interleave="soft" media="roll">9 9 9 9</margins>
+ <margins interleave="printer" media="roll">9 9 9 9</margins>
+ <AlignmentChoices>1 7 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="360x90dpi" text="360 x 90 DPI Fast Economy">
+   <physicalResolution>360 90</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">3.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="180dpi" text="180 DPI Economy">
+   <physicalResolution>180 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">3.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x180dpi" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">3.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360pro" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">1.500000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360mw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.780000</parameter>
+   <parameter type="integer" name="escp2_ink_type">2</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720mw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.775000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720mw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.388000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_32.xml b/src/xml/escp2/model/model_32.xml
new file mode 100644
index 0000000..1e27a53
--- /dev/null
+++ b/src/xml/escp2/model/model_32.xml
@@ -0,0 +1,170 @@
+<?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="32">
+ <media src="escp2/media/standard.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/standard.xml"/>
+ <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>No</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>48</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="black">
+  <Nozzles>144</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="fast">
+  <Nozzles>144</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>2880 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>684 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 9</margins>
+ <margins interleave="printer" media="sheet">9 9 9 9</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <AlignmentChoices>3 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"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x120sw" text="360 x 120 DPI Economy">
+   <physicalResolution>360 120</physicalResolution>
+   <parameter type="float" name="escp2_density">2.600000</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">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x240sw" text="360 x 240 DPI Draft">
+   <physicalResolution>360 240</physicalResolution>
+   <parameter type="float" name="escp2_density">2.600000</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">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.300000</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">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</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">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</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">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</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.650000</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">0.500000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720hq2" text="1440 x 720 DPI Highest Quality">
+   <physicalResolution>1440 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.650000</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">0.500000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x720sw" text="2880 x 720 DPI">
+   <physicalResolution>2880 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</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="2880x720hq2" text="2880 x 720 DPI Highest Quality">
+   <physicalResolution>2880 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.650000</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>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_33.xml b/src/xml/escp2/model/model_33.xml
new file mode 100644
index 0000000..ec3bdfc
--- /dev/null
+++ b/src/xml/escp2/model/model_33.xml
@@ -0,0 +1,170 @@
+<?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="33">
+ <media src="escp2/media/standard.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/standard.xml"/>
+ <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>No</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>48</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="black">
+  <Nozzles>144</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="fast">
+  <Nozzles>144</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>2880 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>684 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 9</margins>
+ <margins interleave="printer" media="sheet">9 9 9 9</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <AlignmentChoices>3 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"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x120sw" text="360 x 120 DPI Economy">
+   <physicalResolution>360 120</physicalResolution>
+   <parameter type="float" name="escp2_density">2.600000</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">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x240sw" text="360 x 240 DPI Draft">
+   <physicalResolution>360 240</physicalResolution>
+   <parameter type="float" name="escp2_density">2.600000</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">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.300000</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">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</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">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</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">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</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.650000</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">0.500000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720hq2" text="1440 x 720 DPI Highest Quality">
+   <physicalResolution>1440 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.650000</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">0.500000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x720sw" text="2880 x 720 DPI">
+   <physicalResolution>2880 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</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="2880x720hq2" text="2880 x 720 DPI Highest Quality">
+   <physicalResolution>2880 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.650000</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>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_34.xml b/src/xml/escp2/model/model_34.xml
new file mode 100644
index 0000000..5ed9669
--- /dev/null
+++ b/src/xml/escp2/model/model_34.xml
@@ -0,0 +1,169 @@
+<?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="34">
+ <media src="escp2/media/standard.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/standard.xml"/>
+ <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>No</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>96</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>2</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="black">
+  <Nozzles>192</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="fast">
+  <Nozzles>192</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>180 180</minimumResolution>
+ <maximumResolution>2880 720</maximumResolution>
+ <extraVerticalFeed>38</extraVerticalFeed>
+ <separationRows>1</separationRows>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>612 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 9</margins>
+ <margins interleave="printer" media="sheet">9 9 9 9</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <AlignmentChoices>3 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"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="180sw" text="180 DPI Economy">
+   <physicalResolution>180 180</physicalResolution>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.580000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x180sw" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.580000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.580000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.400000</parameter>
+   <parameter type="float" name="DropSize2">0.675000</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">0.511000</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">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.610000</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.490000</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">0.390000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720hq2" text="1440 x 720 DPI Highest Quality">
+   <physicalResolution>1440 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.490000</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">0.390000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x720sw" text="2880 x 720 DPI">
+   <physicalResolution>2880 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.637000</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="2880x720hq2" text="2880 x 720 DPI Highest Quality">
+   <physicalResolution>2880 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.637000</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>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_35.xml b/src/xml/escp2/model/model_35.xml
new file mode 100644
index 0000000..d31cd5e
--- /dev/null
+++ b/src/xml/escp2/model/model_35.xml
@@ -0,0 +1,164 @@
+<?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="35">
+ <media src="escp2/media/photo_gen2.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/photo_gen2.xml"/>
+ <verticalBorderlessSequence>SN\003\000\000\000\002SN\003\000\000\001\001SN\003\000\000\011\001</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>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>48</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>6</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>2880 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>684 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <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>
+ <extraBottom>24</extraBottom>
+ <AlignmentChoices>3 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">
+   <physicalResolution>360 120</physicalResolution>
+   <parameter type="float" name="escp2_density">2.600000</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">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x240sw" text="360 x 240 DPI Draft">
+   <physicalResolution>360 240</physicalResolution>
+   <parameter type="float" name="escp2_density">2.600000</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">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.300000</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">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</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">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</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">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</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.650000</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">0.500000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720hq2" text="1440 x 720 DPI Highest Quality">
+   <physicalResolution>1440 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.650000</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">0.500000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x720sw" text="2880 x 720 DPI">
+   <physicalResolution>2880 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</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="2880x720hq2" text="2880 x 720 DPI Highest Quality">
+   <physicalResolution>2880 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.650000</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>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_36.xml b/src/xml/escp2/model/model_36.xml
new file mode 100644
index 0000000..54053d8
--- /dev/null
+++ b/src/xml/escp2/model/model_36.xml
@@ -0,0 +1,164 @@
+<?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="36">
+ <media src="escp2/media/photo_gen2.xml"/>
+ <inputSlots src="escp2/inputslots/standard_roll_feed.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/photo_gen2.xml"/>
+ <verticalBorderlessSequence>SN\003\000\000\000\010SN\003\000\000\001\001SN\003\000\000\002\000SN\003\000\000\007\000SN\003\000\000\011\001</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>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>48</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>6</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>2880 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>684 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <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>
+ <extraBottom>24</extraBottom>
+ <AlignmentChoices>3 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">
+   <physicalResolution>360 120</physicalResolution>
+   <parameter type="float" name="escp2_density">2.600000</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">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x240sw" text="360 x 240 DPI Draft">
+   <physicalResolution>360 240</physicalResolution>
+   <parameter type="float" name="escp2_density">2.600000</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">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.300000</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">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</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">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</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">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</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.650000</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">0.500000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720hq2" text="1440 x 720 DPI Highest Quality">
+   <physicalResolution>1440 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.650000</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">0.500000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x720sw" text="2880 x 720 DPI">
+   <physicalResolution>2880 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</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="2880x720hq2" text="2880 x 720 DPI Highest Quality">
+   <physicalResolution>2880 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.650000</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>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_37.xml b/src/xml/escp2/model/model_37.xml
new file mode 100644
index 0000000..21f5bb3
--- /dev/null
+++ b/src/xml/escp2/model/model_37.xml
@@ -0,0 +1,164 @@
+<?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="37">
+ <media src="escp2/media/photo_gen2.xml"/>
+ <inputSlots src="escp2/inputslots/standard_roll_feed.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/photo_gen2.xml"/>
+ <verticalBorderlessSequence>SN\003\000\000\011\001</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>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>48</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>6</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>2880 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>936 86400</maximumMediaSize>
+ <maximumImageableArea>936 86400</maximumImageableArea>
+ <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>
+ <extraBottom>24</extraBottom>
+ <AlignmentChoices>3 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">
+   <physicalResolution>360 120</physicalResolution>
+   <parameter type="float" name="escp2_density">2.600000</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">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x240sw" text="360 x 240 DPI Draft">
+   <physicalResolution>360 240</physicalResolution>
+   <parameter type="float" name="escp2_density">2.600000</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">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.300000</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">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</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">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</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">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</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.650000</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">0.500000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720hq2" text="1440 x 720 DPI Highest Quality">
+   <physicalResolution>1440 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.650000</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">0.500000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x720sw" text="2880 x 720 DPI">
+   <physicalResolution>2880 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</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="2880x720hq2" text="2880 x 720 DPI Highest Quality">
+   <physicalResolution>2880 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.650000</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>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_38.xml b/src/xml/escp2/model/model_38.xml
new file mode 100644
index 0000000..b76194a
--- /dev/null
+++ b/src/xml/escp2/model/model_38.xml
@@ -0,0 +1,165 @@
+<?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="38">
+ <media src="escp2/media/x80.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/x80.xml"/>
+ <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>No</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsInkChange/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>15</Nozzles>
+  <MinNozzles>15</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="black">
+  <Nozzles>48</Nozzles>
+  <MinNozzles>48</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="fast">
+  <Nozzles>48</Nozzles>
+  <MinNozzles>48</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <maxBlackResolution>360</maxBlackResolution>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>1440 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <initialVerticalOffset>-99</initialVerticalOffset>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>684 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 9</margins>
+ <margins interleave="printer" media="sheet">9 9 9 9</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <AlignmentChoices>3 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"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x120sw" text="360 x 120 DPI Economy">
+   <physicalResolution>360 120</physicalResolution>
+   <parameter type="float" name="escp2_density">2.800000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.325000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x240sw" text="360 x 240 DPI Draft">
+   <physicalResolution>360 240</physicalResolution>
+   <parameter type="float" name="escp2_density">2.800000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.325000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.400000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.325000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.700000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.325000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</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">0.710000</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">0.325000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720hq" text="720 DPI High Quality">
+   <physicalResolution>720 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.710000</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">0.325000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</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.710000</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">0.650000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720hq2" text="1440 x 720 DPI Highest Quality">
+   <physicalResolution>1440 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.710000</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">0.650000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_39.xml b/src/xml/escp2/model/model_39.xml
new file mode 100644
index 0000000..83e2400
--- /dev/null
+++ b/src/xml/escp2/model/model_39.xml
@@ -0,0 +1,125 @@
+<?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="39">
+ <media src="escp2/media/standard_gen0.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/standard_gen0.xml"/>
+ <commandSet>1998</commandSet>
+ <borderless>No</borderless>
+ <sendZeroAdvance/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>16</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>4</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>720 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>936 86400</maximumMediaSize>
+ <maximumImageableArea>936 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 9 40</margins>
+ <margins interleave="printer" media="sheet">9 9 9 40</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <AlignmentChoices>1 7 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x90dpi" text="360 x 90 DPI Fast Economy">
+   <physicalResolution>360 90</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">-2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="180dpi" text="180 DPI Economy">
+   <physicalResolution>180 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">-2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x180dpi" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">-2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360mw" text="360 DPI High Quality">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">-2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">-2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</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">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">-2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720mw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.568000</parameter>
+   <parameter type="integer" name="escp2_ink_type">-2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_4.xml b/src/xml/escp2/model/model_4.xml
new file mode 100644
index 0000000..b683fc8
--- /dev/null
+++ b/src/xml/escp2/model/model_4.xml
@@ -0,0 +1,142 @@
+<?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="4">
+ <media src="escp2/media/standard_gen0.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/standard_gen0.xml"/>
+ <commandSet>1998</commandSet>
+ <borderless>No</borderless>
+ <sendZeroAdvance/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>64</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>2</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <minimumResolution>180 180</minimumResolution>
+ <maximumResolution>1440 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <pseudoSeparationRows>4</pseudoSeparationRows>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>684 3168</maximumMediaSize>
+ <maximumImageableArea>612 3168</maximumImageableArea>
+ <margins interleave="soft" media="sheet">8 9 9 40</margins>
+ <margins interleave="printer" media="sheet">8 9 9 40</margins>
+ <margins interleave="soft" media="roll">8 9 0 0</margins>
+ <margins interleave="printer" media="roll">8 9 0 0</margins>
+ <AlignmentChoices>1 7 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="180dpi" text="180 DPI Economy">
+   <physicalResolution>180 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x180dpi" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360mw" text="360 DPI High Quality">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</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">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.775000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720hq" text="720 DPI High Quality">
+   <physicalResolution>720 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.775000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">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.388000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720hq2" text="1440 x 720 DPI Highest Quality">
+   <physicalResolution>1440 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.388000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_40.xml b/src/xml/escp2/model/model_40.xml
new file mode 100644
index 0000000..f714b0a
--- /dev/null
+++ b/src/xml/escp2/model/model_40.xml
@@ -0,0 +1,130 @@
+<?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="40">
+ <media src="escp2/media/pro_pigment.xml"/>
+ <inputSlots src="escp2/inputslots/spro5000.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/pro_pigment.xml"/>
+ <printerWeaves src="escp2/weaves/pro7500.xml"/>
+ <commandSet>Pro</commandSet>
+ <borderless>No</borderless>
+ <sendZeroAdvance/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>1</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>6</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>1440 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>936 86400</maximumMediaSize>
+ <maximumImageableArea>936 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 9 40</margins>
+ <margins interleave="printer" media="sheet">9 9 9 40</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <AlignmentChoices>1 7 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="360x90dpi" text="360 x 90 DPI Fast Economy">
+   <physicalResolution>360 90</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">3.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="180dpi" text="180 DPI Economy">
+   <physicalResolution>180 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">3.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x180dpi" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">3.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360pro" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">1.500000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360mw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.780000</parameter>
+   <parameter type="integer" name="escp2_ink_type">2</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720mw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.775000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720mw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.388000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_41.xml b/src/xml/escp2/model/model_41.xml
new file mode 100644
index 0000000..459c7c1
--- /dev/null
+++ b/src/xml/escp2/model/model_41.xml
@@ -0,0 +1,137 @@
+<?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="41">
+ <media src="escp2/media/pro_gen2.xml"/>
+ <inputSlots src="escp2/inputslots/pro_roll_feed.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/pro_gen2.xml"/>
+ <printerWeaves src="escp2/weaves/pro7000.xml"/>
+ <commandSet>Pro</commandSet>
+ <borderless>No</borderless>
+ <sendZeroAdvance/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>1</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>6</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>1440 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>504 504</minimumMediaSize>
+ <maximumMediaSize>3168 86400</maximumMediaSize>
+ <maximumImageableArea>3168 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 9 40</margins>
+ <margins interleave="printer" media="sheet">9 9 9 40</margins>
+ <margins interleave="soft" media="roll">9 9 9 9</margins>
+ <margins interleave="printer" media="roll">9 9 9 9</margins>
+ <AlignmentChoices>1 7 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="360x90dpi" text="360 x 90 DPI Fast Economy">
+   <physicalResolution>360 90</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">4</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.661000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="180dpi" text="180 DPI Economy">
+   <physicalResolution>180 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">4</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.661000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x180dpi" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">4</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.661000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360pro" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.661000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360mw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.661000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720mw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.431000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.661000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720mw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.216000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.661000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_42.xml b/src/xml/escp2/model/model_42.xml
new file mode 100644
index 0000000..d975822
--- /dev/null
+++ b/src/xml/escp2/model/model_42.xml
@@ -0,0 +1,156 @@
+<?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="42">
+ <media src="escp2/media/x80.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/x80.xml"/>
+ <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>No</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsInkChange/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>15</Nozzles>
+  <MinNozzles>15</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="black">
+  <Nozzles>48</Nozzles>
+  <MinNozzles>48</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="fast">
+  <Nozzles>48</Nozzles>
+  <MinNozzles>48</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>720 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <initialVerticalOffset>-99</initialVerticalOffset>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>684 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 9</margins>
+ <margins interleave="printer" media="sheet">9 9 9 9</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <AlignmentChoices>3 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"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x120sw" text="360 x 120 DPI Economy">
+   <physicalResolution>360 120</physicalResolution>
+   <parameter type="float" name="escp2_density">2.800000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.325000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x240sw" text="360 x 240 DPI Draft">
+   <physicalResolution>360 240</physicalResolution>
+   <parameter type="float" name="escp2_density">2.800000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.325000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.400000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.325000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.700000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.325000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</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">0.710000</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">0.325000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720hq" text="720 DPI High Quality">
+   <physicalResolution>720 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.710000</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">0.325000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720hq2" text="720 DPI Highest Quality">
+   <physicalResolution>720 720</physicalResolution>
+   <verticalPasses>4</verticalPasses>
+   <parameter type="float" name="escp2_density">0.710000</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">0.325000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_43.xml b/src/xml/escp2/model/model_43.xml
new file mode 100644
index 0000000..a09c4be
--- /dev/null
+++ b/src/xml/escp2/model/model_43.xml
@@ -0,0 +1,164 @@
+<?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="43">
+ <media src="escp2/media/x80.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/x80.xml"/>
+ <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>No</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsInkChange/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>15</Nozzles>
+  <MinNozzles>15</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="black">
+  <Nozzles>48</Nozzles>
+  <MinNozzles>48</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="fast">
+  <Nozzles>48</Nozzles>
+  <MinNozzles>48</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>1440 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <initialVerticalOffset>-99</initialVerticalOffset>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>684 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 9</margins>
+ <margins interleave="printer" media="sheet">9 9 9 9</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <AlignmentChoices>3 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"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x120sw" text="360 x 120 DPI Economy">
+   <physicalResolution>360 120</physicalResolution>
+   <parameter type="float" name="escp2_density">2.800000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.325000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x240sw" text="360 x 240 DPI Draft">
+   <physicalResolution>360 240</physicalResolution>
+   <parameter type="float" name="escp2_density">2.800000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.325000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.400000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.325000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.700000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.325000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</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">0.710000</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">0.325000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720hq" text="720 DPI High Quality">
+   <physicalResolution>720 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.710000</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">0.325000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</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.710000</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">0.650000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720hq2" text="1440 x 720 DPI Highest Quality">
+   <physicalResolution>1440 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.710000</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">0.650000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_44.xml b/src/xml/escp2/model/model_44.xml
new file mode 100644
index 0000000..94a230f
--- /dev/null
+++ b/src/xml/escp2/model/model_44.xml
@@ -0,0 +1,159 @@
+<?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="44">
+ <media src="escp2/media/c80.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/c80.xml"/>
+ <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>No</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Portrait</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>60</Nozzles>
+  <MinNozzles>60</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>2</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="black">
+  <Nozzles>180</Nozzles>
+  <MinNozzles>180</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>2</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="fast">
+  <Nozzles>180</Nozzles>
+  <MinNozzles>180</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>2</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>360 180</minimumResolution>
+ <maximumResolution>2880 1440</maximumResolution>
+ <separationRows>1</separationRows>
+ <initialVerticalOffset>-240</initialVerticalOffset>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <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="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <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"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x180sw" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <parameter type="float" name="escp2_density">2.400000</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">0.000000</parameter>
+   <parameter type="float" name="DropSize2">0.000000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.200000</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">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.000000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.600000</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">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.000000</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">0.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.000000</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.512000</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">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x720sw" text="2880 x 720 DPI">
+   <physicalResolution>2880 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.512000</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">0.500000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x1440sw" text="1440 x 1440 DPI">
+   <physicalResolution>1440 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.512000</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">0.500000</parameter>
+   <parameter type="float" name="DropSize2">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.512000</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_45.xml b/src/xml/escp2/model/model_45.xml
new file mode 100644
index 0000000..fe2c304
--- /dev/null
+++ b/src/xml/escp2/model/model_45.xml
@@ -0,0 +1,125 @@
+<?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="45">
+ <media src="escp2/media/standard_gen0.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/standard_gen0.xml"/>
+ <commandSet>1998</commandSet>
+ <borderless>No</borderless>
+ <sendZeroAdvance/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>16</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>4</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>720 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>684 3168</maximumMediaSize>
+ <maximumImageableArea>612 3168</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 9 40</margins>
+ <margins interleave="printer" media="sheet">9 9 9 40</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <AlignmentChoices>1 7 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x90dpi" text="360 x 90 DPI Fast Economy">
+   <physicalResolution>360 90</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">-2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="180dpi" text="180 DPI Economy">
+   <physicalResolution>180 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">-2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x180dpi" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">-2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360mw" text="360 DPI High Quality">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">-2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">-2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</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">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">-2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720mw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.568000</parameter>
+   <parameter type="integer" name="escp2_ink_type">-2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_46.xml b/src/xml/escp2/model/model_46.xml
new file mode 100644
index 0000000..5c04d80
--- /dev/null
+++ b/src/xml/escp2/model/model_46.xml
@@ -0,0 +1,142 @@
+<?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="46">
+ <media src="escp2/media/f360_photo.xml"/>
+ <inputSlots src="escp2/inputslots/cd_cutter_roll_feed.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/f360_photo.xml"/>
+ <verticalBorderlessSequence>SN4\000\000\002\027\000\000\000\000\000\000\001\003\000\204\003\252\000\204\006\270\004\364\006v\005\230\011\226\000\304\004\226\000\206\002\270\012\031\030\031\031\031\031\004444\004\001\000\000\040\011</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>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <hasFast360DPI/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>96</Nozzles>
+  <MinNozzles>96</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>2</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="fast">
+  <Nozzles>24</Nozzles>
+  <MinNozzles>24</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>6</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>360 180</minimumResolution>
+ <maximumResolution>2880 1440</maximumResolution>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>2073600</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>684 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <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>
+ <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"/>
+  <ChannelName translate="name" name="Black"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x180sw" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <parameter type="float" name="escp2_density">2.000000</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">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.000000</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">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.500000</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">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</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">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</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.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.500000</parameter>
+   <parameter type="float" name="DropSize2">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.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_47.xml b/src/xml/escp2/model/model_47.xml
new file mode 100644
index 0000000..6957236
--- /dev/null
+++ b/src/xml/escp2/model/model_47.xml
@@ -0,0 +1,151 @@
+<?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="47">
+ <media src="escp2/media/f360_ultrachrome.xml"/>
+ <inputSlots src="escp2/inputslots/cd_cutter_roll_feed.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/f360_ultrachrome.xml"/>
+ <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>HorizontalOnly</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <hasFast360DPI/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <hasInterchangeableInkCartridges/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>96</Nozzles>
+  <MinNozzles>96</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>2</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="fast">
+  <Nozzles>192</Nozzles>
+  <MinNozzles>192</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>7</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>360 180</minimumResolution>
+ <maximumResolution>2880 1440</maximumResolution>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>2073600</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>936 86400</maximumMediaSize>
+ <maximumImageableArea>936 86400</maximumImageableArea>
+ <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>
+ <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"/>
+  <ChannelName translate="name" name="Light Black"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x180sw" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <parameter type="float" name="escp2_density">2.300000</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">0.160000</parameter>
+   <parameter type="float" name="DropSize2">0.400000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.150000</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">0.160000</parameter>
+   <parameter type="float" name="DropSize2">0.400000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.580000</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">0.160000</parameter>
+   <parameter type="float" name="DropSize2">0.400000</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">0.766000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.200000</parameter>
+   <parameter type="float" name="DropSize2">0.450000</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.388000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.200000</parameter>
+   <parameter type="float" name="DropSize2">0.450000</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.958000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">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.479000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_48.xml b/src/xml/escp2/model/model_48.xml
new file mode 100644
index 0000000..7ae84d7
--- /dev/null
+++ b/src/xml/escp2/model/model_48.xml
@@ -0,0 +1,139 @@
+<?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="48">
+ <media src="escp2/media/pro_ultrachrome.xml"/>
+ <inputSlots src="escp2/inputslots/pro_roll_feed.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/pro_ultrachrome.xml"/>
+ <printerWeaves src="escp2/weaves/pro7600.xml"/>
+ <verticalBorderlessSequence>SN\003\000\000\011\001</verticalBorderlessSequence>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>Pro</commandSet>
+ <borderless>Yes</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>1</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>7</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>360 180</minimumResolution>
+ <maximumResolution>2880 1440</maximumResolution>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>2073600</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>504 504</minimumMediaSize>
+ <maximumMediaSize>1728 86400</maximumMediaSize>
+ <maximumImageableArea>1728 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 9 40</margins>
+ <margins interleave="printer" media="sheet">9 9 9 40</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <AlignmentChoices>3 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="360x180dpi" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.160000</parameter>
+   <parameter type="float" name="DropSize2">0.400000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360pro" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">1.150000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.160000</parameter>
+   <parameter type="float" name="DropSize2">0.400000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360mw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.580000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.160000</parameter>
+   <parameter type="float" name="DropSize2">0.400000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720mw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.766000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.200000</parameter>
+   <parameter type="float" name="DropSize2">0.450000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720mw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.388000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.200000</parameter>
+   <parameter type="float" name="DropSize2">0.450000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x1440mw" text="2880 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.479000</parameter>
+   <parameter type="integer" name="escp2_ink_type">5</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_49.xml b/src/xml/escp2/model/model_49.xml
new file mode 100644
index 0000000..41ebb87
--- /dev/null
+++ b/src/xml/escp2/model/model_49.xml
@@ -0,0 +1,139 @@
+<?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="49">
+ <media src="escp2/media/pro_ultrachrome.xml"/>
+ <inputSlots src="escp2/inputslots/pro_roll_feed.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/pro_ultrachrome.xml"/>
+ <printerWeaves src="escp2/weaves/pro7600.xml"/>
+ <verticalBorderlessSequence>SN\003\000\000\011\001</verticalBorderlessSequence>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>Pro</commandSet>
+ <borderless>Yes</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>1</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>7</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>360 180</minimumResolution>
+ <maximumResolution>2880 1440</maximumResolution>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>2073600</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>504 504</minimumMediaSize>
+ <maximumMediaSize>3168 86400</maximumMediaSize>
+ <maximumImageableArea>3168 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 9 40</margins>
+ <margins interleave="printer" media="sheet">9 9 9 40</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <AlignmentChoices>3 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="360x180dpi" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.160000</parameter>
+   <parameter type="float" name="DropSize2">0.400000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360pro" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">1.150000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.160000</parameter>
+   <parameter type="float" name="DropSize2">0.400000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360mw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.580000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.160000</parameter>
+   <parameter type="float" name="DropSize2">0.400000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720mw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.766000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.200000</parameter>
+   <parameter type="float" name="DropSize2">0.450000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720mw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.388000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.200000</parameter>
+   <parameter type="float" name="DropSize2">0.450000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x1440mw" text="2880 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.479000</parameter>
+   <parameter type="integer" name="escp2_ink_type">5</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_5.xml b/src/xml/escp2/model/model_5.xml
new file mode 100644
index 0000000..e49ebab
--- /dev/null
+++ b/src/xml/escp2/model/model_5.xml
@@ -0,0 +1,142 @@
+<?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="5">
+ <media src="escp2/media/standard_gen0.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/standard_gen0.xml"/>
+ <commandSet>1998</commandSet>
+ <borderless>No</borderless>
+ <sendZeroAdvance/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>64</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>2</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <minimumResolution>180 180</minimumResolution>
+ <maximumResolution>1440 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <pseudoSeparationRows>4</pseudoSeparationRows>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>684 3168</maximumMediaSize>
+ <maximumImageableArea>612 3168</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 9 40</margins>
+ <margins interleave="printer" media="sheet">9 9 9 40</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <AlignmentChoices>1 7 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="180dpi" text="180 DPI Economy">
+   <physicalResolution>180 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x180dpi" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360mw" text="360 DPI High Quality">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</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">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.775000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720hq" text="720 DPI High Quality">
+   <physicalResolution>720 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.775000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">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.388000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720hq2" text="1440 x 720 DPI Highest Quality">
+   <physicalResolution>1440 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.388000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_50.xml b/src/xml/escp2/model/model_50.xml
new file mode 100644
index 0000000..01e4e35
--- /dev/null
+++ b/src/xml/escp2/model/model_50.xml
@@ -0,0 +1,160 @@
+<?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="50">
+ <media src="escp2/media/photo_gen2.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/photo_gen2.xml"/>
+ <verticalBorderlessSequence>SN\003\000\000\011\001</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>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>48</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>6</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>2880 1440</maximumResolution>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>684 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <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>
+ <extraBottom>24</extraBottom>
+ <AlignmentChoices>3 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">
+   <physicalResolution>360 120</physicalResolution>
+   <parameter type="float" name="escp2_density">2.600000</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">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x240sw" text="360 x 240 DPI Draft">
+   <physicalResolution>360 240</physicalResolution>
+   <parameter type="float" name="escp2_density">2.600000</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">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.300000</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">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</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">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</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">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</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.650000</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">0.500000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x720sw" text="2880 x 720 DPI">
+   <physicalResolution>2880 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</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="1440x1440sw" text="1440 x 1440 DPI">
+   <physicalResolution>1440 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</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="2880x1440sw" text="2880 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.320000</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>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_51.xml b/src/xml/escp2/model/model_51.xml
new file mode 100644
index 0000000..2c0c87e
--- /dev/null
+++ b/src/xml/escp2/model/model_51.xml
@@ -0,0 +1,160 @@
+<?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="51">
+ <media src="escp2/media/photo_gen2.xml"/>
+ <inputSlots src="escp2/inputslots/cutter_roll_feed.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/photo_gen2.xml"/>
+ <verticalBorderlessSequence>SN,\000\000\001\027\000\000\000\000\000\000\001\003\000\243n\000\223x\2205\002\000\000\005\277\001\270\006d\000\024\036\032\004&quot;\005\310\031\000@\000\022c\362\006</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>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>48</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>6</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>2880 1440</maximumResolution>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>684 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <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>
+ <extraBottom>24</extraBottom>
+ <AlignmentChoices>3 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">
+   <physicalResolution>360 120</physicalResolution>
+   <parameter type="float" name="escp2_density">2.600000</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">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x240sw" text="360 x 240 DPI Draft">
+   <physicalResolution>360 240</physicalResolution>
+   <parameter type="float" name="escp2_density">2.600000</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">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.300000</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">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</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">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</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">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</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.650000</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">0.500000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x720sw" text="2880 x 720 DPI">
+   <physicalResolution>2880 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</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="1440x1440sw" text="1440 x 1440 DPI">
+   <physicalResolution>1440 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</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="2880x1440sw" text="2880 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.320000</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>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_52.xml b/src/xml/escp2/model/model_52.xml
new file mode 100644
index 0000000..30f3abe
--- /dev/null
+++ b/src/xml/escp2/model/model_52.xml
@@ -0,0 +1,166 @@
+<?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="52">
+ <media src="escp2/media/standard.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/standard.xml"/>
+ <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>No</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Portrait</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>48</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="black">
+  <Nozzles>144</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="fast">
+  <Nozzles>144</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>2880 1440</maximumResolution>
+ <separationRows>1</separationRows>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>612 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 9</margins>
+ <margins interleave="printer" media="sheet">9 9 9 9</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <AlignmentChoices>3 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"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x120sw" text="360 x 120 DPI Economy">
+   <physicalResolution>360 120</physicalResolution>
+   <parameter type="float" name="escp2_density">2.600000</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">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x240sw" text="360 x 240 DPI Draft">
+   <physicalResolution>360 240</physicalResolution>
+   <parameter type="float" name="escp2_density">2.600000</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">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.300000</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">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</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">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</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">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</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.650000</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">0.500000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x720sw" text="2880 x 720 DPI">
+   <physicalResolution>2880 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</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="1440x1440sw" text="1440 x 1440 DPI">
+   <physicalResolution>1440 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</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="2880x1440sw" text="2880 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.320000</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>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_53.xml b/src/xml/escp2/model/model_53.xml
new file mode 100644
index 0000000..c197e67
--- /dev/null
+++ b/src/xml/escp2/model/model_53.xml
@@ -0,0 +1,141 @@
+<?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="53">
+ <media src="escp2/media/f360_photo7_japan.xml"/>
+ <inputSlots src="escp2/inputslots/cd_cutter_roll_feed.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/f360_photo7_japan.xml"/>
+ <verticalBorderlessSequence>SN4\000\000\002\027\000\000\000\000\000\000\001\003\000\204\003\252\000\204\006\270\004\364\006v\005\230\011\226\000\304\004\226\000\206\002\270\012\031\030\031\031\031\031\004444\004\001\000\000\040\011</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>
+ <supportsVariableDropsizes/>
+ <hasFast360DPI/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>96</Nozzles>
+  <MinNozzles>96</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>2</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="fast">
+  <Nozzles>24</Nozzles>
+  <MinNozzles>24</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>6</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>360 180</minimumResolution>
+ <maximumResolution>2880 1440</maximumResolution>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>2073600</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>684 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <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>
+ <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"/>
+  <ChannelName translate="name" name="Dark Yellow"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x180sw" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <parameter type="float" name="escp2_density">2.000000</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">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.000000</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">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.500000</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">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</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">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</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.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.500000</parameter>
+   <parameter type="float" name="DropSize2">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.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_54.xml b/src/xml/escp2/model/model_54.xml
new file mode 100644
index 0000000..ccd116a
--- /dev/null
+++ b/src/xml/escp2/model/model_54.xml
@@ -0,0 +1,161 @@
+<?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="54">
+ <media src="escp2/media/photo_gen1.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/photo_gen1.xml"/>
+ <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>1999</commandSet>
+ <borderless>No</borderless>
+ <supportsVariableDropsizes/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>32</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>4</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>6</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>1440 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>936 3168</maximumMediaSize>
+ <maximumImageableArea>936 3168</maximumImageableArea>
+ <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>
+ <AlignmentChoices>3 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="360x90sw" text="360 x 90 DPI Fast Economy">
+   <physicalResolution>360 90</physicalResolution>
+   <parameter type="float" name="escp2_density">4.000000</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">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="180sw" text="180 DPI Economy">
+   <physicalResolution>180 180</physicalResolution>
+   <parameter type="float" name="escp2_density">4.000000</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">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x180sw" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <parameter type="float" name="escp2_density">4.000000</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">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">2.000000</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">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</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">0.568000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720hq" text="720 DPI High Quality">
+   <physicalResolution>720 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.568000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</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.568000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.500000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720hq2" text="1440 x 720 DPI Highest Quality">
+   <physicalResolution>1440 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.568000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.500000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_55.xml b/src/xml/escp2/model/model_55.xml
new file mode 100644
index 0000000..d690c08
--- /dev/null
+++ b/src/xml/escp2/model/model_55.xml
@@ -0,0 +1,159 @@
+<?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="55">
+ <media src="escp2/media/c82.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/c82.xml"/>
+ <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>No</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Portrait</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>59</Nozzles>
+  <MinNozzles>60</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>2</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="black">
+  <Nozzles>180</Nozzles>
+  <MinNozzles>180</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>2</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="fast">
+  <Nozzles>180</Nozzles>
+  <MinNozzles>180</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>2</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>360 180</minimumResolution>
+ <maximumResolution>2880 1440</maximumResolution>
+ <separationRows>1</separationRows>
+ <initialVerticalOffset>-240</initialVerticalOffset>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <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="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <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"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x180sw" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <parameter type="float" name="escp2_density">2.400000</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">0.000000</parameter>
+   <parameter type="float" name="DropSize2">0.000000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.200000</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">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.000000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.600000</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">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.000000</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">0.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.000000</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.512000</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">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x720sw" text="2880 x 720 DPI">
+   <physicalResolution>2880 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.512000</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">0.500000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x1440sw" text="1440 x 1440 DPI">
+   <physicalResolution>1440 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.512000</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">0.500000</parameter>
+   <parameter type="float" name="DropSize2">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.512000</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_56.xml b/src/xml/escp2/model/model_56.xml
new file mode 100644
index 0000000..44e7936
--- /dev/null
+++ b/src/xml/escp2/model/model_56.xml
@@ -0,0 +1,163 @@
+<?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="56">
+ <media src="escp2/media/x80.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/x80.xml"/>
+ <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>No</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>15</Nozzles>
+  <MinNozzles>15</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="black">
+  <Nozzles>48</Nozzles>
+  <MinNozzles>48</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="fast">
+  <Nozzles>48</Nozzles>
+  <MinNozzles>48</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>1440 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <initialVerticalOffset>-99</initialVerticalOffset>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>684 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 9</margins>
+ <margins interleave="printer" media="sheet">9 9 9 9</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <AlignmentChoices>3 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"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x120sw" text="360 x 120 DPI Economy">
+   <physicalResolution>360 120</physicalResolution>
+   <parameter type="float" name="escp2_density">2.600000</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">0.325000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x240sw" text="360 x 240 DPI Draft">
+   <physicalResolution>360 240</physicalResolution>
+   <parameter type="float" name="escp2_density">2.600000</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">0.325000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.300000</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">0.325000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</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">0.325000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</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">0.568000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.325000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720hq" text="720 DPI High Quality">
+   <physicalResolution>720 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.568000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.325000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</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.523000</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">0.650000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720hq2" text="1440 x 720 DPI Highest Quality">
+   <physicalResolution>1440 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.523000</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">0.650000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_57.xml b/src/xml/escp2/model/model_57.xml
new file mode 100644
index 0000000..da6ef78
--- /dev/null
+++ b/src/xml/escp2/model/model_57.xml
@@ -0,0 +1,143 @@
+<?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="57">
+ <media src="escp2/media/f360_photo7_japan.xml"/>
+ <inputSlots src="escp2/inputslots/cutter_roll_feed.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/f360_photo7_japan.xml"/>
+ <verticalBorderlessSequence>SN8\000\000\007\033\000\000\000\000\000\000\001\003\000\330\006T\001\264\015,\013H\0070\011\316\022,\001\251\013,\001\002\003\363\027\031\030\031\031\031\031\004\031\031\031\001\004C\000\000\001\001\001\364\006</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>
+ <supportsVariableDropsizes/>
+ <hasFast360DPI/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Portrait</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>180</Nozzles>
+  <MinNozzles>180</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>2</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="black">
+  <Nozzles>360</Nozzles>
+  <MinNozzles>360</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="fast">
+  <Nozzles>360</Nozzles>
+  <MinNozzles>360</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>7</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>720 360</minimumResolution>
+ <maximumResolution>2880 2880</maximumResolution>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>2073600</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>612 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <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>
+ <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"/>
+  <ChannelName translate="name" name="Dark Yellow"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.570000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</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">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</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.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.500000</parameter>
+   <parameter type="float" name="DropSize2">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.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">1440</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">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.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">1440</parameter>
+   <parameter type="integer" name="escp2_bits">1</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.360000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">1440</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_58.xml b/src/xml/escp2/model/model_58.xml
new file mode 100644
index 0000000..d5abbb4
--- /dev/null
+++ b/src/xml/escp2/model/model_58.xml
@@ -0,0 +1,129 @@
+<?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="58">
+ <media src="escp2/media/photo_gen2.xml"/>
+ <inputSlots src="escp2/inputslots/cutter_roll_feed.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/photo_gen2.xml"/>
+ <verticalBorderlessSequence>SN8\000\000\007\027\000\000\000\000\000\000\001\003\000\330\006T\001\264\015&quot;\013H\0070\011\316\022,\001\251\013,\001\002\003\363\027\031\030\031\031\031\031\004\031\031\031\001\004C\000\000\001\001\001\360\006</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>
+ <supportsVariableDropsizes/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Portrait</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>90</Nozzles>
+  <MinNozzles>90</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>2</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>6</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>720 360</minimumResolution>
+ <maximumResolution>2880 2880</maximumResolution>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>2073600</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>612 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <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>
+ <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="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.570000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</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">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</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.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.500000</parameter>
+   <parameter type="float" name="DropSize2">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.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">1440</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">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.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">1440</parameter>
+   <parameter type="integer" name="escp2_bits">1</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.360000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">1440</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_59.xml b/src/xml/escp2/model/model_59.xml
new file mode 100644
index 0000000..a56aaf4
--- /dev/null
+++ b/src/xml/escp2/model/model_59.xml
@@ -0,0 +1,164 @@
+<?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="59">
+ <media src="escp2/media/x80.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/x80.xml"/>
+ <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>No</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsInkChange/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>15</Nozzles>
+  <MinNozzles>15</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="black">
+  <Nozzles>48</Nozzles>
+  <MinNozzles>48</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="fast">
+  <Nozzles>48</Nozzles>
+  <MinNozzles>48</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>2880 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <initialVerticalOffset>-99</initialVerticalOffset>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>684 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 9</margins>
+ <margins interleave="printer" media="sheet">9 9 9 9</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <AlignmentChoices>3 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"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x120sw" text="360 x 120 DPI Economy">
+   <physicalResolution>360 120</physicalResolution>
+   <parameter type="float" name="escp2_density">2.600000</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">0.325000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x240sw" text="360 x 240 DPI Draft">
+   <physicalResolution>360 240</physicalResolution>
+   <parameter type="float" name="escp2_density">2.600000</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">0.325000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.300000</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">0.325000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</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">0.325000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</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">0.568000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.325000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720hq" text="720 DPI High Quality">
+   <physicalResolution>720 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.568000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.325000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</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.523000</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">0.650000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720hq2" text="1440 x 720 DPI Highest Quality">
+   <physicalResolution>1440 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.523000</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">0.650000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_6.xml b/src/xml/escp2/model/model_6.xml
new file mode 100644
index 0000000..a83389f
--- /dev/null
+++ b/src/xml/escp2/model/model_6.xml
@@ -0,0 +1,142 @@
+<?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="6">
+ <media src="escp2/media/standard_gen0.xml"/>
+ <inputSlots src="escp2/inputslots/standard_roll_feed.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/standard_gen0.xml"/>
+ <commandSet>1998</commandSet>
+ <borderless>No</borderless>
+ <sendZeroAdvance/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>64</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>2</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <minimumResolution>180 180</minimumResolution>
+ <maximumResolution>1440 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <pseudoSeparationRows>4</pseudoSeparationRows>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>1224 3168</maximumMediaSize>
+ <maximumImageableArea>979 3168</maximumImageableArea>
+ <margins interleave="soft" media="sheet">8 9 9 40</margins>
+ <margins interleave="printer" media="sheet">8 9 9 40</margins>
+ <margins interleave="soft" media="roll">8 9 0 0</margins>
+ <margins interleave="printer" media="roll">8 9 0 0</margins>
+ <AlignmentChoices>1 7 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="180dpi" text="180 DPI Economy">
+   <physicalResolution>180 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x180dpi" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360mw" text="360 DPI High Quality">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</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">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.775000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720hq" text="720 DPI High Quality">
+   <physicalResolution>720 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.775000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">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.388000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720hq2" text="1440 x 720 DPI Highest Quality">
+   <physicalResolution>1440 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.388000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_60.xml b/src/xml/escp2/model/model_60.xml
new file mode 100644
index 0000000..8e13707
--- /dev/null
+++ b/src/xml/escp2/model/model_60.xml
@@ -0,0 +1,163 @@
+<?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="60">
+ <media src="escp2/media/c82.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/c82.xml"/>
+ <verticalBorderlessSequence>SNL\000\000\011\027\000\000\000\000\000\000\000\003\000\000\001\260\004\336\0044\001\000\002\000\000\000\0004\010h\020\030\025\310\031\340=\314\020\214\012\024\005\214\000\012\001,\001\000\000\017\017\017\017\017\017\017\017\004\012\004\017\017\017\017\017\006\004\000\001\001\001\000\000\370\007</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>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Portrait</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>59</Nozzles>
+  <MinNozzles>60</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>2</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="black">
+  <Nozzles>180</Nozzles>
+  <MinNozzles>180</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>2</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="fast">
+  <Nozzles>180</Nozzles>
+  <MinNozzles>180</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>2</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>360 180</minimumResolution>
+ <maximumResolution>2880 1440</maximumResolution>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <initialVerticalOffset>-240</initialVerticalOffset>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>612 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <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>
+ <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"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x180sw" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <parameter type="float" name="escp2_density">2.400000</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">0.000000</parameter>
+   <parameter type="float" name="DropSize2">0.000000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.200000</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">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.000000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.600000</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">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.000000</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">0.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.000000</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.512000</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">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x720sw" text="2880 x 720 DPI">
+   <physicalResolution>2880 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.512000</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">0.500000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x1440sw" text="1440 x 1440 DPI">
+   <physicalResolution>1440 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.512000</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">0.500000</parameter>
+   <parameter type="float" name="DropSize2">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.512000</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_61.xml b/src/xml/escp2/model/model_61.xml
new file mode 100644
index 0000000..32c7f04
--- /dev/null
+++ b/src/xml/escp2/model/model_61.xml
@@ -0,0 +1,173 @@
+<?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="61">
+ <media src="escp2/media/c64.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/c64.xml"/>
+ <verticalBorderlessSequence>SNL\000\000\011\026\000\000\000\000\000\000\000\003\000\000\000\260\004\352\0044\001\016\002\000\000\000\0004\010h\020\030\025\310\031\340=\314\020\214\012\024\005\214\000\012\001,\001\000\000\017\017\017\017\017\017\017\017\004\012\004\017\017\017\017\017\006\004\000\001\001\001\000\000\020\010</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>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Portrait</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>29</Nozzles>
+  <MinNozzles>30</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="black">
+  <Nozzles>90</Nozzles>
+  <MinNozzles>90</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="fast">
+  <Nozzles>90</Nozzles>
+  <MinNozzles>90</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>360 120</minimumResolution>
+ <maximumResolution>2880 1440</maximumResolution>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <initialVerticalOffset>-180</initialVerticalOffset>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>1036800</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>612 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <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>
+ <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"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x120sw" text="360 x 120 DPI Economy">
+   <physicalResolution>360 120</physicalResolution>
+   <parameter type="float" name="escp2_density">2.400000</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">0.000000</parameter>
+   <parameter type="float" name="DropSize2">0.000000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x240sw" text="360 x 240 DPI Draft">
+   <physicalResolution>360 240</physicalResolution>
+   <parameter type="float" name="escp2_density">2.400000</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">0.000000</parameter>
+   <parameter type="float" name="DropSize2">0.000000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.200000</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">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.000000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.600000</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">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.000000</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">0.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.000000</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.512000</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">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x720sw" text="2880 x 720 DPI">
+   <physicalResolution>2880 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.512000</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">0.500000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x1440sw" text="1440 x 1440 DPI">
+   <physicalResolution>1440 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.512000</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">0.500000</parameter>
+   <parameter type="float" name="DropSize2">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.512000</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_62.xml b/src/xml/escp2/model/model_62.xml
new file mode 100644
index 0000000..4a6afe7
--- /dev/null
+++ b/src/xml/escp2/model/model_62.xml
@@ -0,0 +1,166 @@
+<?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="62">
+ <media src="escp2/media/photo_gen2.xml"/>
+ <inputSlots src="escp2/inputslots/cd_roll_feed.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/photo_gen2.xml"/>
+ <verticalBorderlessSequence>SN4\000\000\003\026\000\000\000\000\000\000\001\003\000\007d(\002j\215\0003\344\000\040P\000\207h\020\212\0038\002\360\001\324@\000\001\010\001baa`a\024\002\025\0271Z\011</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>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Portrait</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>48</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>6</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>2880 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>612 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <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>399 394</CDOffset>
+ <CDMediaSize>595 842</CDMediaSize>
+ <extraBottom>24</extraBottom>
+ <AlignmentChoices>3 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">
+   <physicalResolution>360 120</physicalResolution>
+   <parameter type="float" name="escp2_density">2.600000</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">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x240sw" text="360 x 240 DPI Draft">
+   <physicalResolution>360 240</physicalResolution>
+   <parameter type="float" name="escp2_density">2.600000</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">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.300000</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">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</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">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</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">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</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.650000</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">0.500000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720hq2" text="1440 x 720 DPI Highest Quality">
+   <physicalResolution>1440 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.650000</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">0.500000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x720sw" text="2880 x 720 DPI">
+   <physicalResolution>2880 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</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="2880x720hq2" text="2880 x 720 DPI Highest Quality">
+   <physicalResolution>2880 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.650000</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>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_63.xml b/src/xml/escp2/model/model_63.xml
new file mode 100644
index 0000000..3b57e61
--- /dev/null
+++ b/src/xml/escp2/model/model_63.xml
@@ -0,0 +1,156 @@
+<?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="63">
+ <media src="escp2/media/photo_gen3.xml"/>
+ <inputSlots src="escp2/inputslots/cd_roll_feed.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/photo_gen3.xml"/>
+ <verticalBorderlessSequence>SNP\000\000\014\027\000\000\000\000\000\000\000\003\000\001\001X\002\320\004G\001G\002\000\000\000\000P\010\204\020\030\025\310\031\340=\240\017\214\0120\005\214\000\012\001,\001\000\000\000\000\017\017\017\017\017\017\017\017\004\012\004\017\017\017\017\017\006\004\017\017\000\000\001\001\000\0010\010</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>Full</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Portrait</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>90</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>6</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>360 120</minimumResolution>
+ <maximumResolution>2880 1440</maximumResolution>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>2073600</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>612 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <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">
+   <physicalResolution>360 120</physicalResolution>
+   <parameter type="float" name="escp2_density">4.000000</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">0.150000</parameter>
+   <parameter type="float" name="DropSize2">0.300000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x240sw" text="360 x 240 DPI Draft">
+   <physicalResolution>360 240</physicalResolution>
+   <parameter type="float" name="escp2_density">4.000000</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">0.150000</parameter>
+   <parameter type="float" name="DropSize2">0.300000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">2.000000</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">0.150000</parameter>
+   <parameter type="float" name="DropSize2">0.300000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.000000</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">0.150000</parameter>
+   <parameter type="float" name="DropSize2">0.300000</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">0.679000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.150000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</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.657000</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">0.290000</parameter>
+   <parameter type="float" name="DropSize2">0.480000</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.684000</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">0.604000</parameter>
+   <parameter type="float" name="DropSize2">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.566000</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_64.xml b/src/xml/escp2/model/model_64.xml
new file mode 100644
index 0000000..3fe8624
--- /dev/null
+++ b/src/xml/escp2/model/model_64.xml
@@ -0,0 +1,174 @@
+<?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="64">
+ <media src="escp2/media/r800.xml"/>
+ <inputSlots src="escp2/inputslots/r1800.xml"/>
+ <qualityPresets src="escp2/qualitypresets/v2880.xml"/>
+ <inkGroup src="escp2/inks/cmykrb.xml"/>
+ <mediaSizes src="escp2/mediasizes/standard.xml"/>
+ <verticalBorderlessSequence>SNT\000\000\012\033\000\000\000\000\000\000\001\003\000\001\001\235\007T\001P\012\252\000\363\006?\002P\012\277\007(\002%\013,\001\253\000\037\001!\000\040\001\322\000\241\000\000\000\017\000\036\000\030\031\031\031\031\031\031\031\003\033\033ccccccccccc\002\000\001\000\001\001\362\014</verticalBorderlessSequence>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>2000</commandSet>
+ <borderless>Yes</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <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>28800</resolutionScale>
+ <minimumResolution>360 180</minimumResolution>
+ <maximumResolution>5760 2880</maximumResolution>
+ <extraVerticalFeed>10</extraVerticalFeed>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>180</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>16588800</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>612 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 11</margins>
+ <margins interleave="printer" media="sheet">9 9 0 11</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="Yellow"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Matte Black"/>
+  <ChannelName translate="name" name="Photo Black"/>
+  <ChannelName translate="name" name="Red"/>
+  <ChannelName translate="name" name="Blue"/>
+  <ChannelName translate="name" name="Gloss Optimizer"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x180sw" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <parameter type="float" name="escp2_density">2.800000</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.400000</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">1.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.350000</parameter>
+   <parameter type="float" name="DropSize2">0.700000</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.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.350000</parameter>
+   <parameter type="float" name="DropSize2">0.700000</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.869000</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.200000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</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.942000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.470000</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.471000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.470000</parameter>
+   <parameter type="float" name="DropSize3">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.500000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.530000</parameter>
+   <parameter type="float" name="DropSize2">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.500000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.530000</parameter>
+   <parameter type="float" name="DropSize2">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.530000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</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/model/model_65.xml b/src/xml/escp2/model/model_65.xml
new file mode 100644
index 0000000..fd373be
--- /dev/null
+++ b/src/xml/escp2/model/model_65.xml
@@ -0,0 +1,152 @@
+<?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="65">
+ <media src="escp2/media/cx3650.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/cx3650.xml"/>
+ <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>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Portrait</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>90</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>360 120</minimumResolution>
+ <maximumResolution>5760 1440</maximumResolution>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>180</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>2073600</bidirectionalAutoUpperLimit>
+ <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="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <CDOffset>204 191</CDOffset>
+ <CDMediaSize>595 842</CDMediaSize>
+ <AlignmentChoices>4 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+  <ChannelName translate="name" name="Black"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x120sw" text="360 x 120 DPI Economy">
+   <physicalResolution>360 120</physicalResolution>
+   <parameter type="float" name="escp2_density">4.000000</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="360x240sw" text="360 x 240 DPI Draft">
+   <physicalResolution>360 240</physicalResolution>
+   <parameter type="float" name="escp2_density">4.000000</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">2.000000</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">1.000000</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="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.679000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.150000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</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.657000</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">0.290000</parameter>
+   <parameter type="float" name="DropSize2">0.480000</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.684000</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">0.604000</parameter>
+   <parameter type="float" name="DropSize2">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.566000</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>
+  <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_66.xml b/src/xml/escp2/model/model_66.xml
new file mode 100644
index 0000000..776d5b5
--- /dev/null
+++ b/src/xml/escp2/model/model_66.xml
@@ -0,0 +1,173 @@
+<?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="66">
+ <media src="escp2/media/c64.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/c64.xml"/>
+ <verticalBorderlessSequence>SNL\000\000\011\026\000\000\000\000\000\000\000\003\000\000\000\260\004\352\0044\001\016\002\000\000\000\0004\010h\020\030\025\310\031\340=\314\020\214\012\024\005\214\000\012\001,\001\000\000\017\017\017\017\017\017\017\017\004\012\004\017\017\017\017\017\006\004\000\001\001\001\000\000\020\010</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>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Portrait</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>29</Nozzles>
+  <MinNozzles>30</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="black">
+  <Nozzles>90</Nozzles>
+  <MinNozzles>90</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="fast">
+  <Nozzles>90</Nozzles>
+  <MinNozzles>90</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>360 120</minimumResolution>
+ <maximumResolution>2880 1440</maximumResolution>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <initialVerticalOffset>-180</initialVerticalOffset>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>1036800</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>612 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <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>
+ <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"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x120sw" text="360 x 120 DPI Economy">
+   <physicalResolution>360 120</physicalResolution>
+   <parameter type="float" name="escp2_density">2.800000</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">0.000000</parameter>
+   <parameter type="float" name="DropSize2">0.000000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x240sw" text="360 x 240 DPI Draft">
+   <physicalResolution>360 240</physicalResolution>
+   <parameter type="float" name="escp2_density">2.800000</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">0.000000</parameter>
+   <parameter type="float" name="DropSize2">0.000000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.400000</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">0.125000</parameter>
+   <parameter type="float" name="DropSize2">0.250000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.700000</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">0.125000</parameter>
+   <parameter type="float" name="DropSize2">0.250000</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">0.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.000000</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.512000</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">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x720sw" text="2880 x 720 DPI">
+   <physicalResolution>2880 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.512000</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">0.500000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x1440sw" text="1440 x 1440 DPI">
+   <physicalResolution>1440 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.512000</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">0.500000</parameter>
+   <parameter type="float" name="DropSize2">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.512000</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_67.xml b/src/xml/escp2/model/model_67.xml
new file mode 100644
index 0000000..0ee888b
--- /dev/null
+++ b/src/xml/escp2/model/model_67.xml
@@ -0,0 +1,175 @@
+<?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="67">
+ <media src="escp2/media/cmykrb.xml"/>
+ <inputSlots src="escp2/inputslots/r1800.xml"/>
+ <qualityPresets src="escp2/qualitypresets/v2880.xml"/>
+ <inkGroup src="escp2/inks/cmykrb.xml"/>
+ <mediaSizes src="escp2/mediasizes/standard.xml"/>
+ <verticalBorderlessSequence>SNT\000\000\012\033\000\000\000\000\000\000\001\003\000\001\001\235\007T\001P\012\252\000\363\006?\002P\012\277\007(\002%\013,\001\253\000\037\001!\000\040\001\322\000\241\000\000\000\017\000\036\000\030\031\031\031\031\031\031\031\003\033\033ccccccccccc\002\000\001\000\001\001\362\014</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>Yes</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <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>28800</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>16588800</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>936 86400</maximumMediaSize>
+ <maximumImageableArea>936 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 11</margins>
+ <margins interleave="printer" media="sheet">9 9 0 11</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="Yellow"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Matte Black"/>
+  <ChannelName translate="name" name="Photo Black"/>
+  <ChannelName translate="name" name="Red"/>
+  <ChannelName translate="name" name="Blue"/>
+  <ChannelName translate="name" name="Gloss Optimizer"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x180sw" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <parameter type="float" name="escp2_density">2.800000</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.400000</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">1.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.350000</parameter>
+   <parameter type="float" name="DropSize2">0.700000</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.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.350000</parameter>
+   <parameter type="float" name="DropSize2">0.700000</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.869000</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.200000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</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.942000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.470000</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.471000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.470000</parameter>
+   <parameter type="float" name="DropSize3">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.500000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.530000</parameter>
+   <parameter type="float" name="DropSize2">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.500000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.530000</parameter>
+   <parameter type="float" name="DropSize2">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.530000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</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/model/model_68.xml b/src/xml/escp2/model/model_68.xml
new file mode 100644
index 0000000..0788063
--- /dev/null
+++ b/src/xml/escp2/model/model_68.xml
@@ -0,0 +1,174 @@
+<?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="68">
+ <media src="escp2/media/cmykrb.xml"/>
+ <inputSlots src="escp2/inputslots/cd_roll_feed.xml"/>
+ <qualityPresets src="escp2/qualitypresets/v2880.xml"/>
+ <inkGroup src="escp2/inks/cmykrb.xml"/>
+ <verticalBorderlessSequence>SNT\000\000\012\033\000\000\000\000\000\000\001\003\000\001\001\235\007T\001P\012\252\000\363\006?\002P\012\277\007(\002%\013,\001\253\000\037\001!\000\040\001\322\000\241\000\000\000\017\000\036\000\030\031\031\031\031\031\031\031\003\033\033ccccccccccc\002\000\001\000\001\001\362\014</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>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <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>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>180</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>16588800</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>612 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 11</margins>
+ <margins interleave="printer" media="sheet">9 9 0 11</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="Yellow"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Matte Black"/>
+  <ChannelName translate="name" name="Photo Black"/>
+  <ChannelName translate="name" name="Red"/>
+  <ChannelName translate="name" name="Blue"/>
+  <ChannelName translate="name" name="Gloss Optimizer"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x180sw" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <parameter type="float" name="escp2_density">2.800000</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.400000</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">1.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.350000</parameter>
+   <parameter type="float" name="DropSize2">0.700000</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.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.350000</parameter>
+   <parameter type="float" name="DropSize2">0.700000</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.869000</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.200000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</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.942000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.470000</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.471000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.470000</parameter>
+   <parameter type="float" name="DropSize3">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.500000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.530000</parameter>
+   <parameter type="float" name="DropSize2">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.500000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.530000</parameter>
+   <parameter type="float" name="DropSize2">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.530000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</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/model/model_69.xml b/src/xml/escp2/model/model_69.xml
new file mode 100644
index 0000000..1351e9d
--- /dev/null
+++ b/src/xml/escp2/model/model_69.xml
@@ -0,0 +1,171 @@
+<?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="69">
+ <media src="escp2/media/c82.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/c82.xml"/>
+ <verticalBorderlessSequence>SNL\000\000\011\027\000\000\000\000\000\000\000\003\000\000\001\260\004\336\0044\001\000\002\000\000\000\0004\010h\020\030\025\310\031\340=\314\020\214\012\024\005\214\000\012\001,\001\000\000\017\017\017\017\017\017\017\017\004\012\004\017\017\017\017\017\006\004\000\001\001\001\000\000\370\007</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>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Portrait</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>59</Nozzles>
+  <MinNozzles>60</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>2</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="black">
+  <Nozzles>180</Nozzles>
+  <MinNozzles>180</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>2</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="fast">
+  <Nozzles>180</Nozzles>
+  <MinNozzles>180</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>2</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>360 180</minimumResolution>
+ <maximumResolution>2880 2880</maximumResolution>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <initialVerticalOffset>-240</initialVerticalOffset>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>1036800</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>612 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <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>
+ <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"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x180sw" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <parameter type="float" name="escp2_density">2.400000</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">0.000000</parameter>
+   <parameter type="float" name="DropSize2">0.000000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.200000</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">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.000000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.600000</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">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.000000</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">0.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.000000</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.512000</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">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x720sw" text="2880 x 720 DPI">
+   <physicalResolution>2880 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.512000</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">0.500000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x1440sw" text="1440 x 1440 DPI">
+   <physicalResolution>1440 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.512000</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">0.500000</parameter>
+   <parameter type="float" name="DropSize2">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.512000</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>
+  <resolution translate="text" name="2880x2880sw" text="2880 x 2880 DPI">
+   <physicalResolution>2880 2880</physicalResolution>
+   <parameter type="float" name="escp2_density">0.000000</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_7.xml b/src/xml/escp2/model/model_7.xml
new file mode 100644
index 0000000..7e6b0fa
--- /dev/null
+++ b/src/xml/escp2/model/model_7.xml
@@ -0,0 +1,153 @@
+<?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="7">
+ <media src="escp2/media/photo_gen0.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/photo_gen0.xml"/>
+ <commandSet>1998</commandSet>
+ <borderless>No</borderless>
+ <sendZeroAdvance/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>32</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>4</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>6</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>1440 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <extra720DPISeparation>8</extra720DPISeparation>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>684 3168</maximumMediaSize>
+ <maximumImageableArea>612 3168</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 30</margins>
+ <margins interleave="printer" media="sheet">9 9 0 30</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <AlignmentChoices>1 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="360x90dpi" text="360 x 90 DPI Fast Economy">
+   <physicalResolution>360 90</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="180dpi" text="180 DPI Economy">
+   <physicalResolution>180 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x180dpi" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360mw" text="360 DPI High Quality">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</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">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.775000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720hq" text="720 DPI High Quality">
+   <physicalResolution>720 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.775000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">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.550000</parameter>
+   <parameter type="integer" name="escp2_ink_type">4</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720hq2" text="1440 x 720 DPI Highest Quality">
+   <physicalResolution>1440 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.550000</parameter>
+   <parameter type="integer" name="escp2_ink_type">4</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_70.xml b/src/xml/escp2/model/model_70.xml
new file mode 100644
index 0000000..148a564
--- /dev/null
+++ b/src/xml/escp2/model/model_70.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="70">
+ <media src="escp2/media/photo_gen4.xml"/>
+ <inputSlots src="escp2/inputslots/rx700.xml"/>
+ <qualityPresets src="escp2/qualitypresets/p1_5.xml"/>
+ <inkGroup src="escp2/inks/photo_gen4.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>Yes</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Portrait</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>180</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>2</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>6</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>28800</resolutionScale>
+ <minimumResolution>360 180</minimumResolution>
+ <maximumResolution>5760 2880</maximumResolution>
+ <extraVerticalFeed>10</extraVerticalFeed>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>2073600</bidirectionalAutoUpperLimit>
+ <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="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <CDOffset>204 263</CDOffset>
+ <CDMediaSize>595 842</CDMediaSize>
+ <AlignmentChoices>4 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Light Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Light 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">2.800000</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.400000</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">1.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.350000</parameter>
+   <parameter type="float" name="DropSize2">0.700000</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.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.350000</parameter>
+   <parameter type="float" name="DropSize2">0.700000</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.869000</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.200000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</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.942000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.470000</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.471000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.470000</parameter>
+   <parameter type="float" name="DropSize3">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.500000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.530000</parameter>
+   <parameter type="float" name="DropSize2">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.500000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.530000</parameter>
+   <parameter type="float" name="DropSize2">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.530000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</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/model/model_71.xml b/src/xml/escp2/model/model_71.xml
new file mode 100644
index 0000000..898d744
--- /dev/null
+++ b/src/xml/escp2/model/model_71.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="71">
+ <media src="escp2/media/f360_ultrachrome_k3.xml"/>
+ <inputSlots src="escp2/inputslots/r2400.xml"/>
+ <qualityPresets src="escp2/qualitypresets/v2880.xml"/>
+ <inkGroup src="escp2/inks/f360_ultrachrome_k3.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>Yes</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>80</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>204 191</CDOffset>
+ <CDMediaSize>595 842</CDMediaSize>
+ <AlignmentChoices>4 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Light Light Black"/>
+  <ChannelName translate="name" name="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="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">2.800000</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.400000</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">1.770000</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">0.886000</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.443000</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.221000</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.240000</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.293000</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.293000</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.146000</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/model/model_72.xml b/src/xml/escp2/model/model_72.xml
new file mode 100644
index 0000000..5587717
--- /dev/null
+++ b/src/xml/escp2/model/model_72.xml
@@ -0,0 +1,171 @@
+<?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="72">
+ <media src="escp2/media/c64.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/c64.xml"/>
+ <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>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Portrait</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>29</Nozzles>
+  <MinNozzles>30</MinNozzles>
+  <FirstNozzle>1</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="black">
+  <Nozzles>90</Nozzles>
+  <MinNozzles>90</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="fast">
+  <Nozzles>90</Nozzles>
+  <MinNozzles>90</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>360 120</minimumResolution>
+ <maximumResolution>2880 1440</maximumResolution>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <initialVerticalOffset>-180</initialVerticalOffset>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>1036800</bidirectionalAutoUpperLimit>
+ <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="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <AlignmentChoices>4 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Yellow"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Black"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x120sw" text="360 x 120 DPI Economy">
+   <physicalResolution>360 120</physicalResolution>
+   <parameter type="float" name="escp2_density">2.800000</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">0.000000</parameter>
+   <parameter type="float" name="DropSize2">0.000000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x240sw" text="360 x 240 DPI Draft">
+   <physicalResolution>360 240</physicalResolution>
+   <parameter type="float" name="escp2_density">2.800000</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">0.000000</parameter>
+   <parameter type="float" name="DropSize2">0.000000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.400000</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">0.125000</parameter>
+   <parameter type="float" name="DropSize2">0.250000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.700000</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">0.125000</parameter>
+   <parameter type="float" name="DropSize2">0.250000</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">0.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.000000</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.512000</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">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x720sw" text="2880 x 720 DPI">
+   <physicalResolution>2880 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.512000</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">0.500000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x1440sw" text="1440 x 1440 DPI">
+   <physicalResolution>1440 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.512000</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">0.500000</parameter>
+   <parameter type="float" name="DropSize2">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.512000</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_73.xml b/src/xml/escp2/model/model_73.xml
new file mode 100644
index 0000000..9daba8b
--- /dev/null
+++ b/src/xml/escp2/model/model_73.xml
@@ -0,0 +1,124 @@
+<?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="73">
+ <media src="escp2/media/picturemate_6.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/picturemate.xml"/>
+ <inkGroup src="escp2/inks/picturemate_6.xml"/>
+ <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>Full</borderless>
+ <supportsVariableDropsizes/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Portrait</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>90</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>6</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>28800</resolutionScale>
+ <minimumResolution>1440 720</minimumResolution>
+ <maximumResolution>5760 1440</maximumResolution>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>2073600</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>288 86400</maximumMediaSize>
+ <maximumImageableArea>288 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>204 191</CDOffset>
+ <CDMediaSize>595 842</CDMediaSize>
+ <AlignmentChoices>4 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Yellow"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Red"/>
+  <ChannelName translate="name" name="Blue"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="1440x720ov" text="1440 x 720 DPI">
+   <physicalResolution>2880 720</physicalResolution>
+   <printedResolution>1440 720</printedResolution>
+   <parameter type="float" name="escp2_density">1.596000</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.400000</parameter>
+   <parameter type="float" name="DropSize2">0.650000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x1440ov" text="1440 x 720 DPI Transposed">
+   <physicalResolution>1440 1440</physicalResolution>
+   <printedResolution>720 1440</printedResolution>
+   <parameter type="float" name="escp2_density">1.596000</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.400000</parameter>
+   <parameter type="float" name="DropSize2">0.650000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x1440sw" text="1440 x 1440 DPI">
+   <physicalResolution>1440 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.798000</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.400000</parameter>
+   <parameter type="float" name="DropSize2">0.650000</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.650000</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.615000</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.530000</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/model/model_74.xml b/src/xml/escp2/model/model_74.xml
new file mode 100644
index 0000000..55cbbfe
--- /dev/null
+++ b/src/xml/escp2/model/model_74.xml
@@ -0,0 +1,159 @@
+<?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="74">
+ <media src="escp2/media/c64.xml"/>
+ <inputSlots src="escp2/inputslots/cd_roll_feed.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/c64.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>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Portrait</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>90</Nozzles>
+  <MinNozzles>90</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>360 120</minimumResolution>
+ <maximumResolution>5760 1440</maximumResolution>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>2073600</bidirectionalAutoUpperLimit>
+ <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="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <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"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x120sw" text="360 x 120 DPI Economy">
+   <physicalResolution>360 120</physicalResolution>
+   <parameter type="float" name="escp2_density">2.800000</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">0.000000</parameter>
+   <parameter type="float" name="DropSize2">0.000000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x240sw" text="360 x 240 DPI Draft">
+   <physicalResolution>360 240</physicalResolution>
+   <parameter type="float" name="escp2_density">2.800000</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">0.000000</parameter>
+   <parameter type="float" name="DropSize2">0.000000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.400000</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">0.125000</parameter>
+   <parameter type="float" name="DropSize2">0.250000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.700000</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">0.125000</parameter>
+   <parameter type="float" name="DropSize2">0.250000</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">0.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.000000</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.512000</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">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</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.512000</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">0.500000</parameter>
+   <parameter type="float" name="DropSize2">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.512000</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>
+  <resolution translate="text" name="5760x1440sw" text="5760 x 1440 DPI">
+   <physicalResolution>5760 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.000000</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_75.xml b/src/xml/escp2/model/model_75.xml
new file mode 100644
index 0000000..4565e95
--- /dev/null
+++ b/src/xml/escp2/model/model_75.xml
@@ -0,0 +1,148 @@
+<?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="75">
+ <media src="escp2/media/c64.xml"/>
+ <inputSlots src="escp2/inputslots/cd_roll_feed.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/c64.xml"/>
+ <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>
+ <supportsVariableDropsizes/>
+ <hasFast360DPI/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Portrait</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>90</Nozzles>
+  <MinNozzles>90</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>360 120</minimumResolution>
+ <maximumResolution>5760 1440</maximumResolution>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>2073600</bidirectionalAutoUpperLimit>
+ <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="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <CDOffset>204 191</CDOffset>
+ <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"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x120sw" text="360 x 120 DPI Economy">
+   <physicalResolution>360 120</physicalResolution>
+   <parameter type="float" name="escp2_density">2.000000</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">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x240sw" text="360 x 240 DPI Draft">
+   <physicalResolution>360 240</physicalResolution>
+   <parameter type="float" name="escp2_density">2.000000</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">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.000000</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">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.500000</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">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</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">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</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.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.500000</parameter>
+   <parameter type="float" name="DropSize2">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.650000</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="5760x1440sw" text="5760 x 1440 DPI">
+   <physicalResolution>5760 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.325000</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>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_76.xml b/src/xml/escp2/model/model_76.xml
new file mode 100644
index 0000000..cf18be9
--- /dev/null
+++ b/src/xml/escp2/model/model_76.xml
@@ -0,0 +1,150 @@
+<?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="76">
+ <media src="escp2/media/photo_gen4.xml"/>
+ <inputSlots src="escp2/inputslots/cd_roll_feed.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/photo_gen4.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>Yes</borderless>
+ <supportsVariableDropsizes/>
+ <hasFast360DPI/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Portrait</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>90</Nozzles>
+  <MinNozzles>90</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>6</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>360 120</minimumResolution>
+ <maximumResolution>5760 1440</maximumResolution>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>2073600</bidirectionalAutoUpperLimit>
+ <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="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <CDOffset>204 191</CDOffset>
+ <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"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x120sw" text="360 x 120 DPI Economy">
+   <physicalResolution>360 120</physicalResolution>
+   <parameter type="float" name="escp2_density">2.000000</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">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x240sw" text="360 x 240 DPI Draft">
+   <physicalResolution>360 240</physicalResolution>
+   <parameter type="float" name="escp2_density">2.000000</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">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.000000</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">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.500000</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">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</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">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</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.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.500000</parameter>
+   <parameter type="float" name="DropSize2">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.650000</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="5760x1440sw" text="5760 x 1440 DPI">
+   <physicalResolution>5760 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.325000</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>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_77.xml b/src/xml/escp2/model/model_77.xml
new file mode 100644
index 0000000..1083c9f
--- /dev/null
+++ b/src/xml/escp2/model/model_77.xml
@@ -0,0 +1,155 @@
+<?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="77">
+ <media src="escp2/media/c64.xml"/>
+ <inputSlots src="escp2/inputslots/cd_roll_feed.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/c64.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>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Portrait</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>90</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>360 120</minimumResolution>
+ <maximumResolution>2880 1440</maximumResolution>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>2073600</bidirectionalAutoUpperLimit>
+ <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="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <CDOffset>204 191</CDOffset>
+ <CDMediaSize>595 842</CDMediaSize>
+ <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">
+   <physicalResolution>360 120</physicalResolution>
+   <parameter type="float" name="escp2_density">4.000000</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">0.150000</parameter>
+   <parameter type="float" name="DropSize2">0.300000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x240sw" text="360 x 240 DPI Draft">
+   <physicalResolution>360 240</physicalResolution>
+   <parameter type="float" name="escp2_density">4.000000</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">0.150000</parameter>
+   <parameter type="float" name="DropSize2">0.300000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">2.000000</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">0.150000</parameter>
+   <parameter type="float" name="DropSize2">0.300000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.000000</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">0.150000</parameter>
+   <parameter type="float" name="DropSize2">0.300000</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">0.679000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.150000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</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.657000</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">0.290000</parameter>
+   <parameter type="float" name="DropSize2">0.480000</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.684000</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">0.604000</parameter>
+   <parameter type="float" name="DropSize2">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.566000</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_78.xml b/src/xml/escp2/model/model_78.xml
new file mode 100644
index 0000000..90a5689
--- /dev/null
+++ b/src/xml/escp2/model/model_78.xml
@@ -0,0 +1,164 @@
+<?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="78">
+ <media src="escp2/media/photo_gen2.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/photo_gen2.xml"/>
+ <verticalBorderlessSequence>SN\003\000\000\011\001</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>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>48</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>6</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>2880 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>684 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <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>
+ <extraBottom>24</extraBottom>
+ <AlignmentChoices>3 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">
+   <physicalResolution>360 120</physicalResolution>
+   <parameter type="float" name="escp2_density">2.600000</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">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x240sw" text="360 x 240 DPI Draft">
+   <physicalResolution>360 240</physicalResolution>
+   <parameter type="float" name="escp2_density">2.600000</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">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.300000</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">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</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">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</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">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</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.650000</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">0.500000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720hq2" text="1440 x 720 DPI Highest Quality">
+   <physicalResolution>1440 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.650000</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">0.500000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x720sw" text="2880 x 720 DPI">
+   <physicalResolution>2880 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</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="2880x720hq2" text="2880 x 720 DPI Highest Quality">
+   <physicalResolution>2880 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.650000</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>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_79.xml b/src/xml/escp2/model/model_79.xml
new file mode 100644
index 0000000..dc9782a
--- /dev/null
+++ b/src/xml/escp2/model/model_79.xml
@@ -0,0 +1,163 @@
+<?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="79">
+ <media src="escp2/media/c82.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/c82.xml"/>
+ <verticalBorderlessSequence>SN2\000\000\006\026\000\000\000\000\000\000\001\000\000\027\003\276\000?\007\000\000\334\005\366\011\366\011\226\000\000\000\226\000?\007\031\030\031\031\004\031\004\031\031\031\004\004\000\000]\006</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>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Portrait</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>59</Nozzles>
+  <MinNozzles>60</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>2</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="black">
+  <Nozzles>180</Nozzles>
+  <MinNozzles>180</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>2</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="fast">
+  <Nozzles>180</Nozzles>
+  <MinNozzles>180</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>2</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>360 180</minimumResolution>
+ <maximumResolution>2880 1440</maximumResolution>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <initialVerticalOffset>-240</initialVerticalOffset>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>612 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <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>
+ <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"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x180sw" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <parameter type="float" name="escp2_density">2.400000</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">0.000000</parameter>
+   <parameter type="float" name="DropSize2">0.000000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.200000</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">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.000000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.600000</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">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.000000</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">0.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.000000</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.512000</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">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x720sw" text="2880 x 720 DPI">
+   <physicalResolution>2880 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.512000</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">0.500000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x1440sw" text="1440 x 1440 DPI">
+   <physicalResolution>1440 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.512000</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">0.500000</parameter>
+   <parameter type="float" name="DropSize2">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.512000</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_8.xml b/src/xml/escp2/model/model_8.xml
new file mode 100644
index 0000000..5c6ac5b
--- /dev/null
+++ b/src/xml/escp2/model/model_8.xml
@@ -0,0 +1,152 @@
+<?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="8">
+ <media src="escp2/media/photo_gen0.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/photo_gen0.xml"/>
+ <commandSet>1998</commandSet>
+ <borderless>No</borderless>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>32</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>4</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>6</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>1440 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <extra720DPISeparation>8</extra720DPISeparation>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>849 3168</maximumMediaSize>
+ <maximumImageableArea>849 3168</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 30</margins>
+ <margins interleave="printer" media="sheet">9 9 0 30</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <AlignmentChoices>1 7 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="360x90dpi" text="360 x 90 DPI Fast Economy">
+   <physicalResolution>360 90</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="180dpi" text="180 DPI Economy">
+   <physicalResolution>180 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x180dpi" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360mw" text="360 DPI High Quality">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</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">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.775000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720hq" text="720 DPI High Quality">
+   <physicalResolution>720 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.775000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">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.550000</parameter>
+   <parameter type="integer" name="escp2_ink_type">4</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720hq2" text="1440 x 720 DPI Highest Quality">
+   <physicalResolution>1440 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.550000</parameter>
+   <parameter type="integer" name="escp2_ink_type">4</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_80.xml b/src/xml/escp2/model/model_80.xml
new file mode 100644
index 0000000..7e0ab82
--- /dev/null
+++ b/src/xml/escp2/model/model_80.xml
@@ -0,0 +1,171 @@
+<?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="80">
+ <media src="escp2/media/c82.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/c82.xml"/>
+ <verticalBorderlessSequence>SN2\000\000\006\026\000\000\000\000\000\000\001\000\000\027\003\276\000?\007\000\000\334\005\366\011\366\011\226\000\000\000\226\000?\007\031\030\031\031\004\031\004\031\031\031\004\004\000\000]\006</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>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Portrait</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>59</Nozzles>
+  <MinNozzles>60</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>2</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="black">
+  <Nozzles>180</Nozzles>
+  <MinNozzles>180</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>2</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="fast">
+  <Nozzles>180</Nozzles>
+  <MinNozzles>180</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>2</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>360 180</minimumResolution>
+ <maximumResolution>2880 2880</maximumResolution>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <initialVerticalOffset>-240</initialVerticalOffset>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>1036800</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>612 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <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>
+ <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"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x180sw" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <parameter type="float" name="escp2_density">2.400000</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">0.000000</parameter>
+   <parameter type="float" name="DropSize2">0.000000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.200000</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">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.000000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.600000</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">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.000000</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">0.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.000000</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.512000</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">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x720sw" text="2880 x 720 DPI">
+   <physicalResolution>2880 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.512000</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">0.500000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x1440sw" text="1440 x 1440 DPI">
+   <physicalResolution>1440 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.512000</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">0.500000</parameter>
+   <parameter type="float" name="DropSize2">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.512000</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>
+  <resolution translate="text" name="2880x2880sw" text="2880 x 2880 DPI">
+   <physicalResolution>2880 2880</physicalResolution>
+   <parameter type="float" name="escp2_density">0.000000</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_81.xml b/src/xml/escp2/model/model_81.xml
new file mode 100644
index 0000000..cbadcdd
--- /dev/null
+++ b/src/xml/escp2/model/model_81.xml
@@ -0,0 +1,187 @@
+<?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="81">
+ <media src="escp2/media/claria.xml"/>
+ <inputSlots src="escp2/inputslots/cd_roll_feed.xml"/>
+ <qualityPresets src="escp2/qualitypresets/v2880.xml"/>
+ <inkGroup src="escp2/inks/claria.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>Yes</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Portrait</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>90</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>4</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>6</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>360 90</minimumResolution>
+ <maximumResolution>5760 2880</maximumResolution>
+ <extraVerticalFeed>10</extraVerticalFeed>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>16588800</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>612 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <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 189</CDOffset>
+ <CDMediaSize>595 842</CDMediaSize>
+ <extraBottom>24</extraBottom>
+ <AlignmentChoices>4 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Yellow"/>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Light Cyan"/>
+  <ChannelName translate="name" name="Light Magenta"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Cyan"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x90sw" text="360 x 90 DPI Fast Economy">
+   <physicalResolution>360 90</physicalResolution>
+   <parameter type="float" name="escp2_density">4.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">51</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.125000</parameter>
+   <parameter type="float" name="DropSize2">0.420000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x180sw" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <parameter type="float" name="escp2_density">4.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">51</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.125000</parameter>
+   <parameter type="float" name="DropSize2">0.420000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">4.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">51</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.125000</parameter>
+   <parameter type="float" name="DropSize2">0.420000</parameter>
+   <parameter type="float" name="DropSize3">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.520000</parameter>
+   <parameter type="integer" name="escp2_ink_type">36</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.125000</parameter>
+   <parameter type="float" name="DropSize2">0.420000</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.760000</parameter>
+   <parameter type="integer" name="escp2_ink_type">36</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.125000</parameter>
+   <parameter type="float" name="DropSize2">0.420000</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.880000</parameter>
+   <parameter type="integer" name="escp2_ink_type">36</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.125000</parameter>
+   <parameter type="float" name="DropSize2">0.420000</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.440000</parameter>
+   <parameter type="integer" name="escp2_ink_type">36</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.125000</parameter>
+   <parameter type="float" name="DropSize2">0.420000</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.586000</parameter>
+   <parameter type="integer" name="escp2_ink_type">37</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.338000</parameter>
+   <parameter type="float" name="DropSize2">0.400000</parameter>
+   <parameter type="float" name="DropSize3">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.733000</parameter>
+   <parameter type="integer" name="escp2_ink_type">37</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.833000</parameter>
+   <parameter type="float" name="DropSize2">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.733000</parameter>
+   <parameter type="integer" name="escp2_ink_type">37</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.833000</parameter>
+   <parameter type="float" name="DropSize2">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.440000</parameter>
+   <parameter type="integer" name="escp2_ink_type">37</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/model/model_82.xml b/src/xml/escp2/model/model_82.xml
new file mode 100644
index 0000000..7cee45e
--- /dev/null
+++ b/src/xml/escp2/model/model_82.xml
@@ -0,0 +1,207 @@
+<?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="82">
+ <media src="escp2/media/claria1400.xml"/>
+ <inputSlots src="escp2/inputslots/cd_roll_feed.xml"/>
+ <qualityPresets src="escp2/qualitypresets/v2880.xml"/>
+ <inkGroup src="escp2/inks/claria.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>Yes</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Portrait</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>90</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>4</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>6</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>360 90</minimumResolution>
+ <maximumResolution>5760 2880</maximumResolution>
+ <extraVerticalFeed>10</extraVerticalFeed>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>16588800</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>936 86400</maximumMediaSize>
+ <maximumImageableArea>936 86400</maximumImageableArea>
+ <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 263</CDOffset>
+ <CDMediaSize>595 842</CDMediaSize>
+ <extraBottom>24</extraBottom>
+ <AlignmentChoices>4 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Yellow"/>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Light Cyan"/>
+  <ChannelName translate="name" name="Light Magenta"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Cyan"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x90sw" text="360 x 90 DPI Fast Economy">
+   <physicalResolution>360 90</physicalResolution>
+   <parameter type="float" name="escp2_density">4.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">51</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.125000</parameter>
+   <parameter type="float" name="DropSize2">0.420000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x180sw" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <parameter type="float" name="escp2_density">4.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">51</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.125000</parameter>
+   <parameter type="float" name="DropSize2">0.420000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">4.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">51</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.125000</parameter>
+   <parameter type="float" name="DropSize2">0.420000</parameter>
+   <parameter type="float" name="DropSize3">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.520000</parameter>
+   <parameter type="integer" name="escp2_ink_type">33</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.420000</parameter>
+   <parameter type="float" name="DropSize2">0.670000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360un" text="720 x 360 DPI Enhanced">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.880000</parameter>
+   <parameter type="integer" name="escp2_ink_type">51</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.125000</parameter>
+   <parameter type="float" name="DropSize2">0.420000</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.760000</parameter>
+   <parameter type="integer" name="escp2_ink_type">33</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.420000</parameter>
+   <parameter type="float" name="DropSize2">0.670000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720un" text="720 DPI High Quality">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.880000</parameter>
+   <parameter type="integer" name="escp2_ink_type">51</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.125000</parameter>
+   <parameter type="float" name="DropSize2">0.420000</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.880000</parameter>
+   <parameter type="integer" name="escp2_ink_type">51</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.125000</parameter>
+   <parameter type="float" name="DropSize2">0.420000</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.440000</parameter>
+   <parameter type="integer" name="escp2_ink_type">51</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.125000</parameter>
+   <parameter type="float" name="DropSize2">0.420000</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.586000</parameter>
+   <parameter type="integer" name="escp2_ink_type">37</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.338000</parameter>
+   <parameter type="float" name="DropSize2">0.400000</parameter>
+   <parameter type="float" name="DropSize3">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.733000</parameter>
+   <parameter type="integer" name="escp2_ink_type">37</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.833000</parameter>
+   <parameter type="float" name="DropSize2">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.733000</parameter>
+   <parameter type="integer" name="escp2_ink_type">37</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.833000</parameter>
+   <parameter type="float" name="DropSize2">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.440000</parameter>
+   <parameter type="integer" name="escp2_ink_type">37</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/model/model_83.xml b/src/xml/escp2/model/model_83.xml
new file mode 100644
index 0000000..3a8b6e5
--- /dev/null
+++ b/src/xml/escp2/model/model_83.xml
@@ -0,0 +1,162 @@
+<?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="83">
+ <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/photo_gen3_4.xml"/>
+ <verticalBorderlessSequence>SNP\000\000\014\027\000\000\000\000\000\000\000\003\000\001\001X\002\320\004G\001G\002\000\000\000\000P\010\204\020\030\025\310\031\340=\240\017\214\0120\005\214\000\012\001,\001\000\000\000\000\017\017\017\017\017\017\017\017\004\012\004\017\017\017\017\017\006\004\017\017\000\000\001\001\000\0010\010</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>Full</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Portrait</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>90</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>360 120</minimumResolution>
+ <maximumResolution>5760 1440</maximumResolution>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>2073600</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>612 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <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"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x120sw" text="360 x 120 DPI Economy">
+   <physicalResolution>360 120</physicalResolution>
+   <parameter type="float" name="escp2_density">4.000000</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">0.150000</parameter>
+   <parameter type="float" name="DropSize2">0.300000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x240sw" text="360 x 240 DPI Draft">
+   <physicalResolution>360 240</physicalResolution>
+   <parameter type="float" name="escp2_density">4.000000</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">0.150000</parameter>
+   <parameter type="float" name="DropSize2">0.300000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">2.000000</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">0.150000</parameter>
+   <parameter type="float" name="DropSize2">0.300000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.000000</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">0.150000</parameter>
+   <parameter type="float" name="DropSize2">0.300000</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">0.679000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.150000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</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.657000</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">0.290000</parameter>
+   <parameter type="float" name="DropSize2">0.480000</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.684000</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">0.604000</parameter>
+   <parameter type="float" name="DropSize2">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.566000</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>
+  <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_84.xml b/src/xml/escp2/model/model_84.xml
new file mode 100644
index 0000000..50eaf90
--- /dev/null
+++ b/src/xml/escp2/model/model_84.xml
@@ -0,0 +1,156 @@
+<?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="84">
+ <media src="escp2/media/photo_gen3.xml"/>
+ <inputSlots src="escp2/inputslots/cd_roll_feed.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/photo_gen3.xml"/>
+ <verticalBorderlessSequence>SNL\000\000\011\026\000\000\000\000\000\000\000\003\000\000\001\260\004\336\0044\001\000\002\000\000\000\0004\010h\020\030\025\310\031\340=\314\020\214\012\024\005\214\000\012\001,\001\000\000\017\017\017\017\017\017\017\017\004\012\004\017\017\017\017\017\006\004\000\001\001\001\000\000\367\007</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>Full</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Portrait</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>90</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>6</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>360 120</minimumResolution>
+ <maximumResolution>2880 1440</maximumResolution>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>2073600</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>612 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <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">
+   <physicalResolution>360 120</physicalResolution>
+   <parameter type="float" name="escp2_density">4.000000</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">0.150000</parameter>
+   <parameter type="float" name="DropSize2">0.300000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x240sw" text="360 x 240 DPI Draft">
+   <physicalResolution>360 240</physicalResolution>
+   <parameter type="float" name="escp2_density">4.000000</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">0.150000</parameter>
+   <parameter type="float" name="DropSize2">0.300000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">2.000000</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">0.150000</parameter>
+   <parameter type="float" name="DropSize2">0.300000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.000000</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">0.150000</parameter>
+   <parameter type="float" name="DropSize2">0.300000</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">0.679000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.150000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</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.657000</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">0.290000</parameter>
+   <parameter type="float" name="DropSize2">0.480000</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.684000</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">0.604000</parameter>
+   <parameter type="float" name="DropSize2">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.566000</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_85.xml b/src/xml/escp2/model/model_85.xml
new file mode 100644
index 0000000..2cdc01c
--- /dev/null
+++ b/src/xml/escp2/model/model_85.xml
@@ -0,0 +1,215 @@
+<?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="85">
+ <media src="escp2/media/c120.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/c120.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>Yes</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Portrait</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>59</Nozzles>
+  <MinNozzles>60</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>2</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="black">
+  <Nozzles>358</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>1</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="fast">
+  <Nozzles>358</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>1</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>360 180</minimumResolution>
+ <maximumResolution>5760 2880</maximumResolution>
+ <extraVerticalFeed>10</extraVerticalFeed>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <initialVerticalOffset>-240</initialVerticalOffset>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>16588800</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>612 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <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>
+ <extraBottom>24</extraBottom>
+ <AlignmentChoices>4 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black 1"/>
+  <ChannelName translate="name" name="Black 2"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <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">4.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">2.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360hq" text="360 DPI Enhanced">
+   <physicalResolution>360 360</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">2.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.560000</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">0.120000</parameter>
+   <parameter type="float" name="DropSize2">0.300000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360hq" text="720 x 360 DPI Enhanced">
+   <physicalResolution>720 360</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">1.560000</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">0.120000</parameter>
+   <parameter type="float" name="DropSize2">0.300000</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">0.780000</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">0.120000</parameter>
+   <parameter type="float" name="DropSize2">0.300000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720hq" text="720 DPI High Quality">
+   <physicalResolution>720 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.780000</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">0.120000</parameter>
+   <parameter type="float" name="DropSize2">0.300000</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.512000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</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.512000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.500000</parameter>
+   <parameter type="float" name="DropSize2">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.512000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</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="5760x1440sw" text="5760 x 1440 DPI">
+   <physicalResolution>5760 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.256000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</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="2880x2880sw" text="2880 x 2880 DPI">
+   <physicalResolution>2880 2880</physicalResolution>
+   <parameter type="float" name="escp2_density">0.256000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</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="5760x2880sw" text="5760 x 2880 DPI">
+   <physicalResolution>5760 2880</physicalResolution>
+   <parameter type="float" name="escp2_density">0.128000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</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_86.xml b/src/xml/escp2/model/model_86.xml
new file mode 100644
index 0000000..9d04ab5
--- /dev/null
+++ b/src/xml/escp2/model/model_86.xml
@@ -0,0 +1,122 @@
+<?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="86">
+ <media src="escp2/media/picturemate_4.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/picturemate.xml"/>
+ <inkGroup src="escp2/inks/picturemate_4.xml"/>
+ <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>Full</borderless>
+ <supportsVariableDropsizes/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Portrait</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>90</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>28800</resolutionScale>
+ <minimumResolution>1440 720</minimumResolution>
+ <maximumResolution>5760 1440</maximumResolution>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>2073600</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>288 86400</maximumMediaSize>
+ <maximumImageableArea>288 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>204 191</CDOffset>
+ <CDMediaSize>595 842</CDMediaSize>
+ <AlignmentChoices>4 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Yellow"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Black"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="1440x720ov" text="1440 x 720 DPI">
+   <physicalResolution>2880 720</physicalResolution>
+   <printedResolution>1440 720</printedResolution>
+   <parameter type="float" name="escp2_density">1.596000</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.400000</parameter>
+   <parameter type="float" name="DropSize2">0.650000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x1440ov" text="1440 x 720 DPI Transposed">
+   <physicalResolution>1440 1440</physicalResolution>
+   <printedResolution>720 1440</printedResolution>
+   <parameter type="float" name="escp2_density">1.596000</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.400000</parameter>
+   <parameter type="float" name="DropSize2">0.650000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x1440sw" text="1440 x 1440 DPI">
+   <physicalResolution>1440 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.798000</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.400000</parameter>
+   <parameter type="float" name="DropSize2">0.650000</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.650000</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.615000</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.530000</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/model/model_87.xml b/src/xml/escp2/model/model_87.xml
new file mode 100644
index 0000000..ef7b36b
--- /dev/null
+++ b/src/xml/escp2/model/model_87.xml
@@ -0,0 +1,192 @@
+<?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="87">
+ <media src="escp2/media/b500.xml"/>
+ <inputSlots src="escp2/inputslots/b500.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/b500.xml"/>
+ <mediaSizes src="escp2/mediasizes/standard.xml"/>
+ <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>No</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Portrait</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>358</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>1</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <minimumResolution>360 360</minimumResolution>
+ <maximumResolution>5760 2880</maximumResolution>
+ <extraVerticalFeed>360</extraVerticalFeed>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <initialVerticalOffset>-7</initialVerticalOffset>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>1036800</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>612 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 27 27</margins>
+ <margins interleave="printer" media="sheet">9 9 27 27</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <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"/>
+ </ChannelNames>
+ <resolutionScale>14400</resolutionScale>
+ <resolutions>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">3.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.300000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.630000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.227000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360hq" text="720 x 360 DPI Enhanced">
+   <physicalResolution>720 360</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">1.630000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.227000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</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">0.817000</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.227000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720hq" text="720 DPI High Quality">
+   <physicalResolution>720 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.817000</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.227000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</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">1.250000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.550000</parameter>
+   <parameter type="float" name="DropSize2">0.680000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720hq" text="1440 x 720 DPI High Quality">
+   <physicalResolution>1440 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">1.250000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.550000</parameter>
+   <parameter type="float" name="DropSize2">0.680000</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.625000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.550000</parameter>
+   <parameter type="float" name="DropSize2">0.680000</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.460000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.810000</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.284000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</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.284000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</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.142000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</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/model/model_88.xml b/src/xml/escp2/model/model_88.xml
new file mode 100644
index 0000000..ec35f1b
--- /dev/null
+++ b/src/xml/escp2/model/model_88.xml
@@ -0,0 +1,141 @@
+<?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="88">
+ <media src="escp2/media/pro_ultrachrome_k3.xml"/>
+ <inputSlots src="escp2/inputslots/pro_roll_feed.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/pro_ultrachrome_k3.xml"/>
+ <printerWeaves src="escp2/weaves/pro7600.xml"/>
+ <verticalBorderlessSequence>SN\003\000\000\011\001</verticalBorderlessSequence>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>Pro</commandSet>
+ <borderless>Yes</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>1</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>7</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>360 180</minimumResolution>
+ <maximumResolution>2880 1440</maximumResolution>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>2073600</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>504 504</minimumMediaSize>
+ <maximumMediaSize>4608 86400</maximumMediaSize>
+ <maximumImageableArea>4608 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 9 40</margins>
+ <margins interleave="printer" media="sheet">9 9 9 40</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <AlignmentChoices>3 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Light Light Black"/>
+  <ChannelName translate="name" name="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="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x180dpi" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.160000</parameter>
+   <parameter type="float" name="DropSize2">0.400000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360pro" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">1.150000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.160000</parameter>
+   <parameter type="float" name="DropSize2">0.400000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360mw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.580000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.160000</parameter>
+   <parameter type="float" name="DropSize2">0.400000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720mw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.766000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.200000</parameter>
+   <parameter type="float" name="DropSize2">0.450000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720mw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.388000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.200000</parameter>
+   <parameter type="float" name="DropSize2">0.450000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x1440mw" text="2880 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.479000</parameter>
+   <parameter type="integer" name="escp2_ink_type">5</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_89.xml b/src/xml/escp2/model/model_89.xml
new file mode 100644
index 0000000..3365c9a
--- /dev/null
+++ b/src/xml/escp2/model/model_89.xml
@@ -0,0 +1,141 @@
+<?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="89">
+ <media src="escp2/media/pro_ultrachrome_k3.xml"/>
+ <inputSlots src="escp2/inputslots/pro_roll_feed.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/pro_ultrachrome_k3.xml"/>
+ <printerWeaves src="escp2/weaves/pro7600.xml"/>
+ <verticalBorderlessSequence>SN\003\000\000\011\001</verticalBorderlessSequence>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>Pro</commandSet>
+ <borderless>Yes</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>1</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>7</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>360 180</minimumResolution>
+ <maximumResolution>2880 1440</maximumResolution>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>2073600</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>504 504</minimumMediaSize>
+ <maximumMediaSize>1728 86400</maximumMediaSize>
+ <maximumImageableArea>1728 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 9 40</margins>
+ <margins interleave="printer" media="sheet">9 9 9 40</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <AlignmentChoices>3 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Light Light Black"/>
+  <ChannelName translate="name" name="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="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x180dpi" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.160000</parameter>
+   <parameter type="float" name="DropSize2">0.400000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360pro" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">1.150000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.160000</parameter>
+   <parameter type="float" name="DropSize2">0.400000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360mw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.580000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.160000</parameter>
+   <parameter type="float" name="DropSize2">0.400000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720mw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.766000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.200000</parameter>
+   <parameter type="float" name="DropSize2">0.450000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720mw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.388000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.200000</parameter>
+   <parameter type="float" name="DropSize2">0.450000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x1440mw" text="2880 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.479000</parameter>
+   <parameter type="integer" name="escp2_ink_type">5</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_9.xml b/src/xml/escp2/model/model_9.xml
new file mode 100644
index 0000000..7dccef2
--- /dev/null
+++ b/src/xml/escp2/model/model_9.xml
@@ -0,0 +1,145 @@
+<?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="9">
+ <media src="escp2/media/photo_gen0.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/photo_gen0.xml"/>
+ <commandSet>1998</commandSet>
+ <borderless>No</borderless>
+ <sendZeroAdvance/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>32</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>4</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>6</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>720 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <extra720DPISeparation>8</extra720DPISeparation>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>684 3168</maximumMediaSize>
+ <maximumImageableArea>612 3168</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 30</margins>
+ <margins interleave="printer" media="sheet">9 9 0 30</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <AlignmentChoices>1 7 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="360x90dpi" text="360 x 90 DPI Fast Economy">
+   <physicalResolution>360 90</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="180dpi" text="180 DPI Economy">
+   <physicalResolution>180 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x180dpi" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360mw" text="360 DPI High Quality">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</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">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.775000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720hq" text="720 DPI High Quality">
+   <physicalResolution>720 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.775000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720hq2" text="720 DPI Highest Quality">
+   <physicalResolution>720 720</physicalResolution>
+   <verticalPasses>4</verticalPasses>
+   <parameter type="float" name="escp2_density">0.775000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_90.xml b/src/xml/escp2/model/model_90.xml
new file mode 100644
index 0000000..3a173ad
--- /dev/null
+++ b/src/xml/escp2/model/model_90.xml
@@ -0,0 +1,141 @@
+<?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="90">
+ <media src="escp2/media/pro_ultrachrome_k3.xml"/>
+ <inputSlots src="escp2/inputslots/pro_roll_feed.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/pro_ultrachrome_k3.xml"/>
+ <printerWeaves src="escp2/weaves/pro7600.xml"/>
+ <verticalBorderlessSequence>SN\003\000\000\011\001</verticalBorderlessSequence>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>Pro</commandSet>
+ <borderless>Yes</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>1</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>7</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>360 180</minimumResolution>
+ <maximumResolution>2880 1440</maximumResolution>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>2073600</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>504 504</minimumMediaSize>
+ <maximumMediaSize>3168 86400</maximumMediaSize>
+ <maximumImageableArea>3168 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 9 40</margins>
+ <margins interleave="printer" media="sheet">9 9 9 40</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <AlignmentChoices>3 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Light Light Black"/>
+  <ChannelName translate="name" name="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="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x180dpi" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.160000</parameter>
+   <parameter type="float" name="DropSize2">0.400000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360pro" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">1.150000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.160000</parameter>
+   <parameter type="float" name="DropSize2">0.400000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360mw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.580000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.160000</parameter>
+   <parameter type="float" name="DropSize2">0.400000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720mw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.766000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.200000</parameter>
+   <parameter type="float" name="DropSize2">0.450000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720mw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.388000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.200000</parameter>
+   <parameter type="float" name="DropSize2">0.450000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x1440mw" text="2880 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.479000</parameter>
+   <parameter type="integer" name="escp2_ink_type">5</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_91.xml b/src/xml/escp2/model/model_91.xml
new file mode 100644
index 0000000..7cd7a2e
--- /dev/null
+++ b/src/xml/escp2/model/model_91.xml
@@ -0,0 +1,182 @@
+<?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="91">
+ <media src="escp2/media/cmykro.xml"/>
+ <inputSlots src="escp2/inputslots/r1800.xml"/>
+ <qualityPresets src="escp2/qualitypresets/v2880.xml"/>
+ <inkGroup src="escp2/inks/cmykro.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/>
+ <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>28800</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>16588800</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>936 86400</maximumMediaSize>
+ <maximumImageableArea>936 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 11</margins>
+ <margins interleave="printer" media="sheet">9 9 0 11</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <CDOffset>204 263</CDOffset>
+ <CDMediaSize>595 842</CDMediaSize>
+ <extraBottom>24</extraBottom>
+ <AlignmentChoices>4 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Yellow"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Matte Black"/>
+  <ChannelName translate="name" name="Photo Black"/>
+  <ChannelName translate="name" name="Red"/>
+  <ChannelName translate="name" name="Orange"/>
+  <ChannelName translate="name" name="Gloss Optimizer"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x180sw" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <parameter type="float" name="escp2_density">2.800000</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">0.380000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.400000</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">0.380000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.380000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</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.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.380000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</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.869000</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.235000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</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.942000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.470000</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.471000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.470000</parameter>
+   <parameter type="float" name="DropSize3">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.235000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.470000</parameter>
+   <parameter type="float" name="DropSize3">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.235000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.470000</parameter>
+   <parameter type="float" name="DropSize3">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.250000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.530000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_92.xml b/src/xml/escp2/model/model_92.xml
new file mode 100644
index 0000000..c9935a7
--- /dev/null
+++ b/src/xml/escp2/model/model_92.xml
@@ -0,0 +1,216 @@
+<?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="92">
+ <media src="escp2/media/c120.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/wf40.xml"/>
+ <inkGroup src="escp2/inks/wf40.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>Yes</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Portrait</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>128</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="black">
+  <Nozzles>384</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="fast">
+  <Nozzles>384</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>360 120</minimumResolution>
+ <maximumResolution>5760 2880</maximumResolution>
+ <extraVerticalFeed>10</extraVerticalFeed>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <initialVerticalOffset>0</initialVerticalOffset>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>16588800</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>612 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <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>
+ <extraBottom>24</extraBottom>
+ <AlignmentChoices>4 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+  <ChannelName translate="name" name="Cyan"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x120sw" text="360 x 120 DPI Economy">
+   <physicalResolution>360 120</physicalResolution>
+   <parameter type="float" name="escp2_density">4.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">2.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360hq" text="360 DPI Enhanced">
+   <physicalResolution>360 360</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">2.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.560000</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">0.220000</parameter>
+   <parameter type="float" name="DropSize2">0.320000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360hq" text="720 x 360 DPI Enhanced">
+   <physicalResolution>720 360</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">1.560000</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">0.220000</parameter>
+   <parameter type="float" name="DropSize2">0.320000</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">0.780000</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">0.220000</parameter>
+   <parameter type="float" name="DropSize2">0.320000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720hq" text="720 DPI High Quality">
+   <physicalResolution>720 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.780000</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">0.220000</parameter>
+   <parameter type="float" name="DropSize2">0.320000</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.768000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</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.384000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</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.384</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.500000</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.384000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</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="2880x2880sw" text="2880 x 2880 DPI">
+   <physicalResolution>2880 2880</physicalResolution>
+   <parameter type="float" name="escp2_density">0.384000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</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="5760x2880sw" text="5760 x 2880 DPI">
+   <physicalResolution>5760 2880</physicalResolution>
+   <parameter type="float" name="escp2_density">0.192000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</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_93.xml b/src/xml/escp2/model/model_93.xml
new file mode 100644
index 0000000..49677b3
--- /dev/null
+++ b/src/xml/escp2/model/model_93.xml
@@ -0,0 +1,204 @@
+<?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="93">
+ <media src="escp2/media/wf500.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/wf40.xml"/>
+ <inkGroup src="escp2/inks/wf500.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>Yes</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Portrait</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>90</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>360 120</minimumResolution>
+ <maximumResolution>5760 2880</maximumResolution>
+ <extraVerticalFeed>10</extraVerticalFeed>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <initialVerticalOffset>0</initialVerticalOffset>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>16588800</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>612 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <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>
+ <extraBottom>24</extraBottom>
+ <CDOffset>204 191</CDOffset>
+ <CDMediaSize>595 842</CDMediaSize>
+ <AlignmentChoices>4 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+  <ChannelName translate="name" name="Black"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x120sw" text="360 x 120 DPI Economy">
+   <physicalResolution>360 120</physicalResolution>
+   <parameter type="float" name="escp2_density">4.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">2.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360hq" text="360 DPI Enhanced">
+   <physicalResolution>360 360</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">2.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.560000</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">0.200000</parameter>
+   <parameter type="float" name="DropSize2">0.330000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360hq" text="720 x 360 DPI Enhanced">
+   <physicalResolution>720 360</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">1.560000</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">0.200000</parameter>
+   <parameter type="float" name="DropSize2">0.330000</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">0.780000</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">0.200000</parameter>
+   <parameter type="float" name="DropSize2">0.330000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720hq" text="720 DPI High Quality">
+   <physicalResolution>720 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.780000</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">0.200000</parameter>
+   <parameter type="float" name="DropSize2">0.330000</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.512000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</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.512000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.500000</parameter>
+   <parameter type="float" name="DropSize2">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.512</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</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="5760x1440sw" text="5760 x 1440 DPI">
+   <physicalResolution>5760 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.256000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</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="2880x2880sw" text="2880 x 2880 DPI">
+   <physicalResolution>2880 2880</physicalResolution>
+   <parameter type="float" name="escp2_density">0.256000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</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="5760x2880sw" text="5760 x 2880 DPI">
+   <physicalResolution>5760 2880</physicalResolution>
+   <parameter type="float" name="escp2_density">0.128000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</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_94.xml b/src/xml/escp2/model/model_94.xml
new file mode 100644
index 0000000..7ebaf17
--- /dev/null
+++ b/src/xml/escp2/model/model_94.xml
@@ -0,0 +1,216 @@
+<?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="94">
+ <media src="escp2/media/wf500.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/wf40.xml"/>
+ <inkGroup src="escp2/inks/nx100.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>Yes</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Portrait</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>29</Nozzles>
+  <MinNozzles>30</MinNozzles>
+  <FirstNozzle>1</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="black">
+  <Nozzles>90</Nozzles>
+  <MinNozzles>90</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="fast">
+  <Nozzles>90</Nozzles>
+  <MinNozzles>90</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>360 120</minimumResolution>
+ <maximumResolution>5760 2880</maximumResolution>
+ <extraVerticalFeed>10</extraVerticalFeed>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <initialVerticalOffset>0</initialVerticalOffset>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>16588800</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>612 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <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>
+ <extraBottom>24</extraBottom>
+ <CDOffset>204 191</CDOffset>
+ <CDMediaSize>595 842</CDMediaSize>
+ <AlignmentChoices>4 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+  <ChannelName translate="name" name="Black"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x120sw" text="360 x 120 DPI Economy">
+   <physicalResolution>360 120</physicalResolution>
+   <parameter type="float" name="escp2_density">4.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">2.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360hq" text="360 DPI Enhanced">
+   <physicalResolution>360 360</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">2.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.560000</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">0.200000</parameter>
+   <parameter type="float" name="DropSize2">0.330000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360hq" text="720 x 360 DPI Enhanced">
+   <physicalResolution>720 360</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">1.560000</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">0.200000</parameter>
+   <parameter type="float" name="DropSize2">0.330000</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">0.780000</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">0.200000</parameter>
+   <parameter type="float" name="DropSize2">0.330000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720hq" text="720 DPI High Quality">
+   <physicalResolution>720 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.780000</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">0.200000</parameter>
+   <parameter type="float" name="DropSize2">0.330000</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.512000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</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.512000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.500000</parameter>
+   <parameter type="float" name="DropSize2">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.512</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</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="5760x1440sw" text="5760 x 1440 DPI">
+   <physicalResolution>5760 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.256000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</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="2880x2880sw" text="2880 x 2880 DPI">
+   <physicalResolution>2880 2880</physicalResolution>
+   <parameter type="float" name="escp2_density">0.256000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</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="5760x2880sw" text="5760 x 2880 DPI">
+   <physicalResolution>5760 2880</physicalResolution>
+   <parameter type="float" name="escp2_density">0.128000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</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/qualitypresets/Makefile.am b/src/xml/escp2/qualitypresets/Makefile.am
new file mode 100644
index 0000000..50ba65a
--- /dev/null
+++ b/src/xml/escp2/qualitypresets/Makefile.am
@@ -0,0 +1,44 @@
+## $Id: Makefile.am,v 1.2 2008/10/19 13:57:27 rlk Exp $
+## Copyright (C) 2008 Robert Krawitz
+##
+## 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, 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.
+
+## Process this file with automake to produce Makefile.in.
+
+@SET_MAKE@
+
+include $(top_srcdir)/scripts/global.mk
+
+## Variables
+
+pkgxmldatadir = $(pkgdatadir)/@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@/xml/escp2/qualitypresets
+
+pkgxmldata_DATA =				\
+	p1_5.xml				\
+	picturemate.xml				\
+	standard.xml				\
+	v2880.xml				\
+	wf40.xml
+
+xml-stamp: $(pkgxmldata_DATA) Makefile.am
+	-rm -f xml-stamp
+	touch xml-stamp
+	for f in $(pkgxmldata_DATA) ; do echo $$f >> xml-stamp; done
+
+all-local: xml-stamp
+
+CLEANFILES = xmli18n-tmp.h xml-stamp
+
+EXTRA_DIST = $(pkgxmldata_DATA)
diff --git a/src/xml/escp2/qualitypresets/Makefile.in b/src/xml/escp2/qualitypresets/Makefile.in
new file mode 100644
index 0000000..88ed90f
--- /dev/null
+++ b/src/xml/escp2/qualitypresets/Makefile.in
@@ -0,0 +1,498 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# Variables
+
+#export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
+#export STP_DATA_PATH = $(top_srcdir)/src/xml
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(top_srcdir)/scripts/global.mk
+subdir = src/xml/escp2/qualitypresets
+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
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(pkgxmldatadir)"
+pkgxmldataDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(pkgxmldata_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_CUPS_PPDS = @BUILD_CUPS_PPDS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CONVERT = @CONVERT@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+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@
+DB2PS = @DB2PS@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DIALOG = @DIALOG@
+DOXYGEN = @DOXYGEN@
+DSYMUTIL = @DSYMUTIL@
+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@
+FIND = @FIND@
+FOOMATIC_CONFIGURE = @FOOMATIC_CONFIGURE@
+FOOMATIC_KITLOAD = @FOOMATIC_KITLOAD@
+FOOMATIC_PPDFILE = @FOOMATIC_PPDFILE@
+GENPPD_LIBS = @GENPPD_LIBS@
+GIMP2_CFLAGS = @GIMP2_CFLAGS@
+GIMP2_LIBS = @GIMP2_LIBS@
+GIMPTOOL2_CHECK = @GIMPTOOL2_CHECK@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GNUCFLAGS = @GNUCFLAGS@
+GREP = @GREP@
+GTK2_CFLAGS = @GTK2_CFLAGS@
+GTK2_LIBS = @GTK2_LIBS@
+GUTENPRINTUI2_BINARY_AGE = @GUTENPRINTUI2_BINARY_AGE@
+GUTENPRINTUI2_CFLAGS = @GUTENPRINTUI2_CFLAGS@
+GUTENPRINTUI2_CURRENT_INTERFACE = @GUTENPRINTUI2_CURRENT_INTERFACE@
+GUTENPRINTUI2_INTERFACE_AGE = @GUTENPRINTUI2_INTERFACE_AGE@
+GUTENPRINTUI2_LIBDEPS = @GUTENPRINTUI2_LIBDEPS@
+GUTENPRINTUI2_LIBS = $(top_builddir)/src/gutenprintui2/libgutenprintui2.la
+GUTENPRINTUI2_VERSION = @GUTENPRINTUI2_VERSION@
+GUTENPRINT_BINARY_AGE = @GUTENPRINT_BINARY_AGE@
+GUTENPRINT_CFLAGS = @GUTENPRINT_CFLAGS@
+GUTENPRINT_CURRENT_INTERFACE = @GUTENPRINT_CURRENT_INTERFACE@
+GUTENPRINT_INTERFACE_AGE = @GUTENPRINT_INTERFACE_AGE@
+GUTENPRINT_LIBDEPS = @GUTENPRINT_LIBDEPS@
+
+# Libraries
+GUTENPRINT_LIBS = $(top_builddir)/src/main/libgutenprint.la
+GUTENPRINT_MAJOR_VERSION = @GUTENPRINT_MAJOR_VERSION@
+GUTENPRINT_MICRO_VERSION = @GUTENPRINT_MICRO_VERSION@
+GUTENPRINT_MINOR_VERSION = @GUTENPRINT_MINOR_VERSION@
+GUTENPRINT_VERSION = @GUTENPRINT_VERSION@
+IJS_CFLAGS = @IJS_CFLAGS@
+IJS_CONFIG = @IJS_CONFIG@
+IJS_LIBS = @IJS_LIBS@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBREADLINE_DEPS = @LIBREADLINE_DEPS@
+LIBS = $(INTLLIBS) @LIBS@
+LIBTOOL = @LIBTOOL@
+LIBTOOL_DEPS = @LIBTOOL_DEPS@
+LN_S = @LN_S@
+LTALLOCA = @LTALLOCA@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PKG_CONFIG = @PKG_CONFIG@
+PLUG_IN_PATH = @PLUG_IN_PATH@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+RELEASE_DATE = @RELEASE_DATE@
+RM = @RM@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TEST = @TEST@
+TEXI2HTML = @TEXI2HTML@
+TRUE = @TRUE@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WHICH_PPDS = @WHICH_PPDS@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+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@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+cups_bindir = @cups_bindir@
+cups_conf_datadir = @cups_conf_datadir@
+cups_conf_serverbin = @cups_conf_serverbin@
+cups_conf_serverroot = @cups_conf_serverroot@
+cups_exec_prefix = @cups_exec_prefix@
+cups_prefix = @cups_prefix@
+cups_sbindir = @cups_sbindir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+gimp2_plug_indir = @gimp2_plug_indir@
+gutenprint_cflags = @gutenprint_cflags@
+gutenprint_libdeps = @gutenprint_libdeps@
+gutenprint_libs = @gutenprint_libs@
+gutenprintui2_cflags = @gutenprintui2_cflags@
+gutenprintui2_libdeps = @gutenprintui2_libdeps@
+gutenprintui2_libs = @gutenprintui2_libs@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+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/qualitypresets
+pkgxmldata_DATA = \
+	p1_5.xml				\
+	picturemate.xml				\
+	standard.xml				\
+	v2880.xml				\
+	wf40.xml
+
+CLEANFILES = xmli18n-tmp.h xml-stamp
+EXTRA_DIST = $(pkgxmldata_DATA)
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/scripts/global.mk $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/xml/escp2/qualitypresets/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  src/xml/escp2/qualitypresets/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-pkgxmldataDATA: $(pkgxmldata_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(pkgxmldatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgxmldatadir)"
+	@list='$(pkgxmldata_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(pkgxmldataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgxmldatadir)/$$f'"; \
+	  $(pkgxmldataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgxmldatadir)/$$f"; \
+	done
+
+uninstall-pkgxmldataDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(pkgxmldata_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(pkgxmldatadir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(pkgxmldatadir)/$$f"; \
+	done
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA) all-local
+installdirs:
+	for dir in "$(DESTDIR)$(pkgxmldatadir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-pkgxmldataDATA
+
+install-dvi: install-dvi-am
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-info: install-info-am
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+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 \
+	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 \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am uninstall uninstall-am uninstall-pkgxmldataDATA
+
+
+@SET_MAKE@
+
+# Rules
+
+$(top_builddir)/src/main/libgutenprint.la:
+	cd $(top_builddir)/src/main; \
+	$(MAKE)
+
+$(top_builddir)/src/gutenprintui/libgutenprintui.la:
+	cd $(top_builddir)/src/gutenprintui; \
+	$(MAKE)
+
+$(top_builddir)/src/gutenprintui2/libgutenprintui2.la:
+	cd $(top_builddir)/src/gutenprintui2; \
+	$(MAKE)
+
+xml-stamp: $(pkgxmldata_DATA) Makefile.am
+	-rm -f xml-stamp
+	touch xml-stamp
+	for f in $(pkgxmldata_DATA) ; do echo $$f >> xml-stamp; done
+
+all-local: 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/qualitypresets/p1_5.xml b/src/xml/escp2/qualitypresets/p1_5.xml
new file mode 100644
index 0000000..a25073c
--- /dev/null
+++ b/src/xml/escp2/qualitypresets/p1_5.xml
@@ -0,0 +1,70 @@
+<?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:QualityPresets name="p1_5">
+ <quality translate="text" name="FastEconomy" text="Fast Economy">
+  <minimumResolution>180 90</minimumResolution>
+  <maximumResolution>360 120</maximumResolution>
+  <desiredResolution>360 90</desiredResolution>
+ </quality>
+ <quality translate="text" name="Economy" text="Economy">
+  <minimumResolution>360 180</minimumResolution>
+  <maximumResolution>360 240</maximumResolution>
+  <desiredResolution>360 180</desiredResolution>
+ </quality>
+ <quality translate="text" name="Draft" text="Draft">
+  <minimumResolution>360 360</minimumResolution>
+  <maximumResolution>360 360</maximumResolution>
+  <desiredResolution>360 360</desiredResolution>
+ </quality>
+ <quality translate="text" name="Standard" text="Standard">
+  <minimumResolution>0 0</minimumResolution>
+  <maximumResolution>0 0</maximumResolution>
+  <desiredResolution>720 360</desiredResolution>
+ </quality>
+ <quality translate="text" name="High" text="High">
+  <minimumResolution>0 0</minimumResolution>
+  <maximumResolution>0 0</maximumResolution>
+  <desiredResolution>720 720</desiredResolution>
+ </quality>
+ <quality translate="text" name="Photo" text="Photo">
+  <minimumResolution>1440 720</minimumResolution>
+  <maximumResolution>1440 720</maximumResolution>
+  <desiredResolution>1440 720</desiredResolution>
+ </quality>
+ <quality translate="text" name="HighPhoto" text="Super Photo">
+  <minimumResolution>1440 1440</minimumResolution>
+  <maximumResolution>2880 1440</maximumResolution>
+  <desiredResolution>1440 1440</desiredResolution>
+ </quality>
+ <quality translate="text" name="UltraPhoto" text="Ultra Photo">
+  <minimumResolution>2880 1440</minimumResolution>
+  <maximumResolution>2880 1440</maximumResolution>
+  <desiredResolution>2880 1440</desiredResolution>
+ </quality>
+ <quality translate="text" name="Best" text="Best">
+  <minimumResolution>720 360</minimumResolution>
+  <maximumResolution>0 1440</maximumResolution>
+  <desiredResolution>-1 -1</desiredResolution>
+ </quality>
+</escp2:QualityPresets>
+</gutenprint>
diff --git a/src/xml/escp2/qualitypresets/picturemate.xml b/src/xml/escp2/qualitypresets/picturemate.xml
new file mode 100644
index 0000000..b4b24f8
--- /dev/null
+++ b/src/xml/escp2/qualitypresets/picturemate.xml
@@ -0,0 +1,60 @@
+<?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:QualityPresets name="picturemate">
+ <quality translate="text" name="Draft" text="Draft">
+  <minimumResolution>1440 720</minimumResolution>
+  <maximumResolution>1440 720</maximumResolution>
+  <desiredResolution>1440 720</desiredResolution>
+ </quality>
+ <quality translate="text" name="Standard" text="Standard">
+  <minimumResolution>1440 1440</minimumResolution>
+  <maximumResolution>1440 1440</maximumResolution>
+  <desiredResolution>1440 1440</desiredResolution>
+ </quality>
+ <quality translate="text" name="Photo" text="Photo">
+  <minimumResolution>1440 1440</minimumResolution>
+  <maximumResolution>1440 1440</maximumResolution>
+  <desiredResolution>1440 1440</desiredResolution>
+ </quality>
+ <quality translate="text" name="High" text="High">
+  <minimumResolution>2880 1440</minimumResolution>
+  <maximumResolution>2880 1440</maximumResolution>
+  <desiredResolution>2880 1440</desiredResolution>
+ </quality>
+ <quality translate="text" name="HighPhoto" text="Super Photo">
+  <minimumResolution>2880 1440</minimumResolution>
+  <maximumResolution>2880 1440</maximumResolution>
+  <desiredResolution>2880 1440</desiredResolution>
+ </quality>
+ <quality translate="text" name="UltraPhoto" text="Ultra Photo">
+  <minimumResolution>5760 1440</minimumResolution>
+  <maximumResolution>5760 1440</maximumResolution>
+  <desiredResolution>5760 1440</desiredResolution>
+ </quality>
+ <quality translate="text" name="Best" text="Best">
+  <minimumResolution>5760 1440</minimumResolution>
+  <maximumResolution>5760 1440</maximumResolution>
+  <desiredResolution>5760 1440</desiredResolution>
+ </quality>
+</escp2:QualityPresets>
+</gutenprint>
diff --git a/src/xml/escp2/qualitypresets/standard.xml b/src/xml/escp2/qualitypresets/standard.xml
new file mode 100644
index 0000000..0878aad
--- /dev/null
+++ b/src/xml/escp2/qualitypresets/standard.xml
@@ -0,0 +1,70 @@
+<?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:QualityPresets name="standard">
+ <quality translate="text" name="FastEconomy" text="Fast Economy">
+  <minimumResolution>180 90</minimumResolution>
+  <maximumResolution>360 120</maximumResolution>
+  <desiredResolution>360 90</desiredResolution>
+ </quality>
+ <quality translate="text" name="Economy" text="Economy">
+  <minimumResolution>360 180</minimumResolution>
+  <maximumResolution>360 240</maximumResolution>
+  <desiredResolution>360 180</desiredResolution>
+ </quality>
+ <quality translate="text" name="Draft" text="Draft">
+  <minimumResolution>360 360</minimumResolution>
+  <maximumResolution>360 360</maximumResolution>
+  <desiredResolution>360 360</desiredResolution>
+ </quality>
+ <quality translate="text" name="Standard" text="Standard">
+  <minimumResolution>0 0</minimumResolution>
+  <maximumResolution>0 0</maximumResolution>
+  <desiredResolution>720 360</desiredResolution>
+ </quality>
+ <quality translate="text" name="High" text="High">
+  <minimumResolution>0 0</minimumResolution>
+  <maximumResolution>0 0</maximumResolution>
+  <desiredResolution>720 720</desiredResolution>
+ </quality>
+ <quality translate="text" name="Photo" text="Photo">
+  <minimumResolution>1440 720</minimumResolution>
+  <maximumResolution>2880 720</maximumResolution>
+  <desiredResolution>1440 720</desiredResolution>
+ </quality>
+ <quality translate="text" name="HighPhoto" text="Super Photo">
+  <minimumResolution>1440 1440</minimumResolution>
+  <maximumResolution>2880 1440</maximumResolution>
+  <desiredResolution>1440 1440</desiredResolution>
+ </quality>
+ <quality translate="text" name="UltraPhoto" text="Ultra Photo">
+  <minimumResolution>2880 1440</minimumResolution>
+  <maximumResolution>2880 1440</maximumResolution>
+  <desiredResolution>2880 1440</desiredResolution>
+ </quality>
+ <quality translate="text" name="Best" text="Best">
+  <minimumResolution>720 360</minimumResolution>
+  <maximumResolution>0 1440</maximumResolution>
+  <desiredResolution>-1 -1</desiredResolution>
+ </quality>
+</escp2:QualityPresets>
+</gutenprint>
diff --git a/src/xml/escp2/qualitypresets/v2880.xml b/src/xml/escp2/qualitypresets/v2880.xml
new file mode 100644
index 0000000..82735ce
--- /dev/null
+++ b/src/xml/escp2/qualitypresets/v2880.xml
@@ -0,0 +1,70 @@
+<?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:QualityPresets name="v2880">
+ <quality translate="text" name="FastEconomy" text="Fast Economy">
+  <minimumResolution>180 90</minimumResolution>
+  <maximumResolution>360 120</maximumResolution>
+  <desiredResolution>360 90</desiredResolution>
+ </quality>
+ <quality translate="text" name="Economy" text="Economy">
+  <minimumResolution>360 180</minimumResolution>
+  <maximumResolution>360 240</maximumResolution>
+  <desiredResolution>360 180</desiredResolution>
+ </quality>
+ <quality translate="text" name="Draft" text="Draft">
+  <minimumResolution>360 360</minimumResolution>
+  <maximumResolution>360 360</maximumResolution>
+  <desiredResolution>360 360</desiredResolution>
+ </quality>
+ <quality translate="text" name="Standard" text="Standard">
+  <minimumResolution>0 0</minimumResolution>
+  <maximumResolution>0 0</maximumResolution>
+  <desiredResolution>720 360</desiredResolution>
+ </quality>
+ <quality translate="text" name="High" text="High">
+  <minimumResolution>0 0</minimumResolution>
+  <maximumResolution>0 0</maximumResolution>
+  <desiredResolution>720 720</desiredResolution>
+ </quality>
+ <quality translate="text" name="Photo" text="Photo">
+  <minimumResolution>1440 720</minimumResolution>
+  <maximumResolution>2880 720</maximumResolution>
+  <desiredResolution>1440 720</desiredResolution>
+ </quality>
+ <quality translate="text" name="HighPhoto" text="Super Photo">
+  <minimumResolution>1440 1440</minimumResolution>
+  <maximumResolution>2880 1440</maximumResolution>
+  <desiredResolution>1440 1440</desiredResolution>
+ </quality>
+ <quality translate="text" name="UltraPhoto" text="Ultra Photo">
+  <minimumResolution>2880 2880</minimumResolution>
+  <maximumResolution>2880 2880</maximumResolution>
+  <desiredResolution>2880 2880</desiredResolution>
+ </quality>
+ <quality translate="text" name="Best" text="Best">
+  <minimumResolution>720 360</minimumResolution>
+  <maximumResolution>0 0</maximumResolution>
+  <desiredResolution>-1 -1</desiredResolution>
+ </quality>
+</escp2:QualityPresets>
+</gutenprint>
diff --git a/src/xml/escp2/qualitypresets/wf40.xml b/src/xml/escp2/qualitypresets/wf40.xml
new file mode 100644
index 0000000..2f135a4
--- /dev/null
+++ b/src/xml/escp2/qualitypresets/wf40.xml
@@ -0,0 +1,65 @@
+<?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:QualityPresets name="standard">
+ <quality translate="text" name="Economy" text="Economy">
+  <minimumResolution>180 90</minimumResolution>
+  <maximumResolution>360 120</maximumResolution>
+  <desiredResolution>360 90</desiredResolution>
+ </quality>
+ <quality translate="text" name="Draft" text="Draft">
+  <minimumResolution>360 360</minimumResolution>
+  <maximumResolution>360 360</maximumResolution>
+  <desiredResolution>360 360</desiredResolution>
+ </quality>
+ <quality translate="text" name="Standard" text="Standard">
+  <minimumResolution>0 0</minimumResolution>
+  <maximumResolution>0 0</maximumResolution>
+  <desiredResolution>720 360</desiredResolution>
+ </quality>
+ <quality translate="text" name="High" text="High">
+  <minimumResolution>0 0</minimumResolution>
+  <maximumResolution>0 0</maximumResolution>
+  <desiredResolution>720 720</desiredResolution>
+ </quality>
+ <quality translate="text" name="Photo" text="Photo">
+  <minimumResolution>1440 720</minimumResolution>
+  <maximumResolution>2880 720</maximumResolution>
+  <desiredResolution>1440 720</desiredResolution>
+ </quality>
+ <quality translate="text" name="HighPhoto" text="Super Photo">
+  <minimumResolution>1440 1440</minimumResolution>
+  <maximumResolution>2880 1440</maximumResolution>
+  <desiredResolution>1440 1440</desiredResolution>
+ </quality>
+ <quality translate="text" name="UltraPhoto" text="Ultra Photo">
+  <minimumResolution>2880 1440</minimumResolution>
+  <maximumResolution>2880 1440</maximumResolution>
+  <desiredResolution>2880 1440</desiredResolution>
+ </quality>
+ <quality translate="text" name="Best" text="Best">
+  <minimumResolution>720 360</minimumResolution>
+  <maximumResolution>0 1440</maximumResolution>
+  <desiredResolution>-1 -1</desiredResolution>
+ </quality>
+</escp2:QualityPresets>
+</gutenprint>
diff --git a/src/xml/escp2/weaves/Makefile.am b/src/xml/escp2/weaves/Makefile.am
new file mode 100644
index 0000000..030f976
--- /dev/null
+++ b/src/xml/escp2/weaves/Makefile.am
@@ -0,0 +1,43 @@
+## $Id: Makefile.am,v 1.1 2008/06/20 00:11:29 rlk Exp $
+## Copyright (C) 2008 Robert Krawitz
+##
+## 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, 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.
+
+## Process this file with automake to produce Makefile.in.
+
+@SET_MAKE@
+
+include $(top_srcdir)/scripts/global.mk
+
+## Variables
+
+pkgxmldatadir = $(pkgdatadir)/@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@/xml/escp2/weaves
+
+pkgxmldata_DATA =				\
+	pro7000.xml				\
+	pro7500.xml				\
+	pro7600.xml				\
+	standard.xml
+
+xml-stamp: $(pkgxmldata_DATA) Makefile.am
+	-rm -f xml-stamp
+	touch xml-stamp
+	for f in $(pkgxmldata_DATA) ; do echo $$f >> xml-stamp; done
+
+all-local: xml-stamp
+
+CLEANFILES = xmli18n-tmp.h xml-stamp
+
+EXTRA_DIST = $(pkgxmldata_DATA)
diff --git a/src/xml/escp2/weaves/Makefile.in b/src/xml/escp2/weaves/Makefile.in
new file mode 100644
index 0000000..2f5a0c4
--- /dev/null
+++ b/src/xml/escp2/weaves/Makefile.in
@@ -0,0 +1,497 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# Variables
+
+#export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
+#export STP_DATA_PATH = $(top_srcdir)/src/xml
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(top_srcdir)/scripts/global.mk
+subdir = src/xml/escp2/weaves
+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
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(pkgxmldatadir)"
+pkgxmldataDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(pkgxmldata_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_CUPS_PPDS = @BUILD_CUPS_PPDS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CONVERT = @CONVERT@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+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@
+DB2PS = @DB2PS@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DIALOG = @DIALOG@
+DOXYGEN = @DOXYGEN@
+DSYMUTIL = @DSYMUTIL@
+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@
+FIND = @FIND@
+FOOMATIC_CONFIGURE = @FOOMATIC_CONFIGURE@
+FOOMATIC_KITLOAD = @FOOMATIC_KITLOAD@
+FOOMATIC_PPDFILE = @FOOMATIC_PPDFILE@
+GENPPD_LIBS = @GENPPD_LIBS@
+GIMP2_CFLAGS = @GIMP2_CFLAGS@
+GIMP2_LIBS = @GIMP2_LIBS@
+GIMPTOOL2_CHECK = @GIMPTOOL2_CHECK@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GNUCFLAGS = @GNUCFLAGS@
+GREP = @GREP@
+GTK2_CFLAGS = @GTK2_CFLAGS@
+GTK2_LIBS = @GTK2_LIBS@
+GUTENPRINTUI2_BINARY_AGE = @GUTENPRINTUI2_BINARY_AGE@
+GUTENPRINTUI2_CFLAGS = @GUTENPRINTUI2_CFLAGS@
+GUTENPRINTUI2_CURRENT_INTERFACE = @GUTENPRINTUI2_CURRENT_INTERFACE@
+GUTENPRINTUI2_INTERFACE_AGE = @GUTENPRINTUI2_INTERFACE_AGE@
+GUTENPRINTUI2_LIBDEPS = @GUTENPRINTUI2_LIBDEPS@
+GUTENPRINTUI2_LIBS = $(top_builddir)/src/gutenprintui2/libgutenprintui2.la
+GUTENPRINTUI2_VERSION = @GUTENPRINTUI2_VERSION@
+GUTENPRINT_BINARY_AGE = @GUTENPRINT_BINARY_AGE@
+GUTENPRINT_CFLAGS = @GUTENPRINT_CFLAGS@
+GUTENPRINT_CURRENT_INTERFACE = @GUTENPRINT_CURRENT_INTERFACE@
+GUTENPRINT_INTERFACE_AGE = @GUTENPRINT_INTERFACE_AGE@
+GUTENPRINT_LIBDEPS = @GUTENPRINT_LIBDEPS@
+
+# Libraries
+GUTENPRINT_LIBS = $(top_builddir)/src/main/libgutenprint.la
+GUTENPRINT_MAJOR_VERSION = @GUTENPRINT_MAJOR_VERSION@
+GUTENPRINT_MICRO_VERSION = @GUTENPRINT_MICRO_VERSION@
+GUTENPRINT_MINOR_VERSION = @GUTENPRINT_MINOR_VERSION@
+GUTENPRINT_VERSION = @GUTENPRINT_VERSION@
+IJS_CFLAGS = @IJS_CFLAGS@
+IJS_CONFIG = @IJS_CONFIG@
+IJS_LIBS = @IJS_LIBS@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBREADLINE_DEPS = @LIBREADLINE_DEPS@
+LIBS = $(INTLLIBS) @LIBS@
+LIBTOOL = @LIBTOOL@
+LIBTOOL_DEPS = @LIBTOOL_DEPS@
+LN_S = @LN_S@
+LTALLOCA = @LTALLOCA@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PKG_CONFIG = @PKG_CONFIG@
+PLUG_IN_PATH = @PLUG_IN_PATH@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+RELEASE_DATE = @RELEASE_DATE@
+RM = @RM@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TEST = @TEST@
+TEXI2HTML = @TEXI2HTML@
+TRUE = @TRUE@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WHICH_PPDS = @WHICH_PPDS@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+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@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+cups_bindir = @cups_bindir@
+cups_conf_datadir = @cups_conf_datadir@
+cups_conf_serverbin = @cups_conf_serverbin@
+cups_conf_serverroot = @cups_conf_serverroot@
+cups_exec_prefix = @cups_exec_prefix@
+cups_prefix = @cups_prefix@
+cups_sbindir = @cups_sbindir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+gimp2_plug_indir = @gimp2_plug_indir@
+gutenprint_cflags = @gutenprint_cflags@
+gutenprint_libdeps = @gutenprint_libdeps@
+gutenprint_libs = @gutenprint_libs@
+gutenprintui2_cflags = @gutenprintui2_cflags@
+gutenprintui2_libdeps = @gutenprintui2_libdeps@
+gutenprintui2_libs = @gutenprintui2_libs@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+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/weaves
+pkgxmldata_DATA = \
+	pro7000.xml				\
+	pro7500.xml				\
+	pro7600.xml				\
+	standard.xml
+
+CLEANFILES = xmli18n-tmp.h xml-stamp
+EXTRA_DIST = $(pkgxmldata_DATA)
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/scripts/global.mk $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/xml/escp2/weaves/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  src/xml/escp2/weaves/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-pkgxmldataDATA: $(pkgxmldata_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(pkgxmldatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgxmldatadir)"
+	@list='$(pkgxmldata_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(pkgxmldataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgxmldatadir)/$$f'"; \
+	  $(pkgxmldataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgxmldatadir)/$$f"; \
+	done
+
+uninstall-pkgxmldataDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(pkgxmldata_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(pkgxmldatadir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(pkgxmldatadir)/$$f"; \
+	done
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA) all-local
+installdirs:
+	for dir in "$(DESTDIR)$(pkgxmldatadir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-pkgxmldataDATA
+
+install-dvi: install-dvi-am
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-info: install-info-am
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+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 \
+	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 \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am uninstall uninstall-am uninstall-pkgxmldataDATA
+
+
+@SET_MAKE@
+
+# Rules
+
+$(top_builddir)/src/main/libgutenprint.la:
+	cd $(top_builddir)/src/main; \
+	$(MAKE)
+
+$(top_builddir)/src/gutenprintui/libgutenprintui.la:
+	cd $(top_builddir)/src/gutenprintui; \
+	$(MAKE)
+
+$(top_builddir)/src/gutenprintui2/libgutenprintui2.la:
+	cd $(top_builddir)/src/gutenprintui2; \
+	$(MAKE)
+
+xml-stamp: $(pkgxmldata_DATA) Makefile.am
+	-rm -f xml-stamp
+	touch xml-stamp
+	for f in $(pkgxmldata_DATA) ; do echo $$f >> xml-stamp; done
+
+all-local: 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/pro7000.xml b/src/xml/escp2/weaves/pro7000.xml
new file mode 100644
index 0000000..b700f82
--- /dev/null
+++ b/src/xml/escp2/weaves/pro7000.xml
@@ -0,0 +1,30 @@
+<?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:PrinterWeaves name="pro7000">
+ <weave translate="text" name="Off" text="Off" command="\033(i\001\000\000"/>
+ <weave translate="text" name="On" text="Interleave" command="\033(i\001\000\001"/>
+ <weave translate="text" name="FOL" text="Full Overlap" command="\033(i\001\000\002"/>
+ <weave translate="text" name="FourPass" text="Four Pass" command="\033(i\001\000\003"/>
+ <weave translate="text" name="FOL2" text="Full Overlap 2" command="\033(i\001\000\004"/>
+</escp2:PrinterWeaves>
+</gutenprint>
diff --git a/src/xml/escp2/weaves/pro7500.xml b/src/xml/escp2/weaves/pro7500.xml
new file mode 100644
index 0000000..9522415
--- /dev/null
+++ b/src/xml/escp2/weaves/pro7500.xml
@@ -0,0 +1,31 @@
+<?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:PrinterWeaves name="pro7500">
+ <weave translate="text" name="Off" text="Off" command="\033(i\001\000\000"/>
+ <weave translate="text" name="On" text="Interleave" command="\033(i\001\000\001"/>
+ <weave translate="text" name="FOL" text="Full Overlap" command="\033(i\001\000\002"/>
+ <weave translate="text" name="FourPass" text="Four Pass" command="\033(i\001\000\003"/>
+ <weave translate="text" name="FOL2" text="Full Overlap 2" command="\033(i\001\000\004"/>
+ <weave translate="text" name="MW2" text="Interleave 2" command="\033(i\001\000\005"/>
+</escp2:PrinterWeaves>
+</gutenprint>
diff --git a/src/xml/escp2/weaves/pro7600.xml b/src/xml/escp2/weaves/pro7600.xml
new file mode 100644
index 0000000..a0b98a3
--- /dev/null
+++ b/src/xml/escp2/weaves/pro7600.xml
@@ -0,0 +1,32 @@
+<?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:PrinterWeaves name="pro7600">
+ <weave translate="text" name="Off" text="Off" command="\033(i\001\000\000"/>
+ <weave translate="text" name="On" text="Interleave" command="\033(i\001\000\001"/>
+ <weave translate="text" name="FOL" text="Full Overlap" command="\033(i\001\000\002"/>
+ <weave translate="text" name="FourPass" text="Four Pass" command="\033(i\001\000\003"/>
+ <weave translate="text" name="FOL2" text="Full Overlap 2" command="\033(i\001\000\004"/>
+ <weave translate="text" name="MW2" text="Interleave 2" command="\033(i\001\000\005"/>
+ <weave translate="text" name="EightPass" text="Eight Pass" command="\033(i\001\000\006"/>
+</escp2:PrinterWeaves>
+</gutenprint>
diff --git a/src/xml/escp2/weaves/standard.xml b/src/xml/escp2/weaves/standard.xml
new file mode 100644
index 0000000..98112bf
--- /dev/null
+++ b/src/xml/escp2/weaves/standard.xml
@@ -0,0 +1,27 @@
+ <?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:PrinterWeaves name="standard">
+ <weave translate="text" name="Off" text="Off" command="\033(i\001\000\000"/>
+ <weave translate="text" name="On" text="On" command="\033(i\001\000\001"/>
+</escp2:PrinterWeaves>
+</gutenprint>
diff --git a/src/xml/extract-strings.c b/src/xml/extract-strings.c
new file mode 100644
index 0000000..e6cecec
--- /dev/null
+++ b/src/xml/extract-strings.c
@@ -0,0 +1,63 @@
+/*
+ * "$Id: extract-strings.c,v 1.2 2008/06/14 02:25:25 rlk Exp $"
+ *
+ * Extract translation strings
+ *
+ * Copyright 2008 by Robert Krawitz.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2, 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.
+ */
+
+/*
+ * Include necessary headers...
+ */
+
+#include <stdio.h>
+#include <gutenprint/gutenprint.h>
+#include <gutenprint/mxml.h>
+#include "config.h"
+
+int
+main(int argc, char **argv)
+{
+  int status = 0;
+  argv++;
+  while (*argv)
+    {
+      stp_mxml_node_t *top =
+	stp_mxmlLoadFromFile(NULL, *argv, STP_MXML_NO_CALLBACK);
+      if (top)
+	{
+	  stp_mxml_node_t *n = top;
+	  do
+	    {
+	      const char *attr = stp_mxmlElementGetAttr(n, "translate");
+	      if (attr)
+		{
+		  const char *str = stp_mxmlElementGetAttr(n, attr);
+		  char *s;
+		  stp_asprintf(&s, "N_(\"%s\");", str);
+		  printf("%-40s /* %s */\n", s, *argv);
+		  stp_free(s);
+		}
+	      n = stp_mxmlWalkNext(n, top, STP_MXML_DESCEND);
+	    } while (n);
+	  stp_mxmlDelete(top);
+	}
+      else
+	{
+	  fprintf(stderr, "Cannot read %s: %s\n", *argv, strerror(errno));
+	  status = 1;
+	}
+      argv++;
+    }
+  return status;
+}
diff --git a/src/main/papers.xml b/src/xml/papers.xml
index 6aff8fe..fcda4f8 100644
--- a/src/main/papers.xml
+++ b/src/xml/papers.xml
@@ -1,100 +1,135 @@
 <?xml version="1.0"?>
 
 <!--
+   "$Id: papers.xml,v 1.5 2008/07/28 12:25:23 rlk Exp $"
+
    XML description of papers known to libgutenprint.
-   It should be edited by hand.
+   You can add additional paper sizes here.
 
-   "$Id: papers.xml,v 1.28 2008/04/15 00:08:20 rlk Exp $"
--->
+   NOTE: Margins should ONLY be specified for papers where the margin
+   is a property of the paper itself, for example a tear-off border.
+   Do NOT specify margins here to work around issues such as margins
+   being cut off (not printed) by the driver or by the printer itself.
+   These should either be handled with the Shrink Page If Necessary to
+   Fit Borders option (in CUPS) or if that doesn't work, by filing a
+   bug.
+
+   Changing borders here will change borders for ALL printers, even
+   even printers without whatever limitation it is that induced you
+   to consider setting margins in this file.  It is not under ANY
+   circumstances (other than the paper itself having margins) the right
+   thing to do.
 
-<!--
    Sizes are converted to 1/72in, then rounded down so that we don't
    print off the edge of the paper.
 -->
 
 
-
-<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<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>
   <paperdef>
 <!-- GROUP: Imperial -->
     <paper name="Letter">
-      <description value="Letter"/>
+      <description translate="value" value="Letter"/>
       <comment value="8.5in x 11in"/>
       <width value="612"/>
       <height value="792"/>
+<!-- DISTRIBUTORS: Please do NOT insert margins here to work around -->
+<!-- problems with page margins that were present in 5.0.0.  That -->
+<!-- workaround is no longer needed.  Please see the explanation at the -->
+<!-- top of this file. -->
       <unit value="english"/>
     </paper>
     <paper name="Legal">
-      <description value="Legal"/>
+      <description translate="value" value="Legal"/>
       <comment value="8.5in x 14in"/>
       <width value="612"/>
       <height value="1008"/>
+<!-- DISTRIBUTORS: Please do NOT insert margins here to work around -->
+<!-- problems with page margins that were present in 5.0.0.  That -->
+<!-- workaround is no longer needed.  Please see the explanation at the -->
+<!-- top of this file. -->
       <unit value="english"/>
     </paper>
     <paper name="Tabloid">
-      <description value="Tabloid"/>
+      <description translate="value" value="Tabloid"/>
       <comment value="11in x 17in"/>
       <width value="792"/>
       <height value="1224"/>
       <unit value="english"/>
     </paper>
     <paper name="Executive">
-      <description value="Executive"/>
+      <description translate="value" value="Executive"/>
       <comment value="7.25in x 10.5in"/>
       <width value="522"/>
       <height value="756"/>
       <unit value="english"/>
     </paper>
     <paper name="Postcard">
-      <description value="Postcard"/>
+      <description translate="value" value="Postcard"/>
       <comment value="100mm x 147mm"/>
       <width value="283"/>
       <height value="416"/>
       <unit value="english"/>
     </paper>
     <paper name="CD5Inch">
-      <description value="CD - 5 inch"/>
+      <description translate="value" value="CD - 5 inch"/>
       <comment value="CD, 116mm diameter"/>
       <width value="329"/>
       <height value="329"/>
       <unit value="english"/>
     </paper>
     <paper name="CD3Inch">
-      <description value="CD - 3 inch"/>
+      <description translate="value" value="CD - 3 inch"/>
       <comment value="CD, 65mm diameter"/>
       <width value="184"/>
       <height value="184"/>
       <unit value="english"/>
     </paper>
     <paper name="CDCustom">
-      <description value="CD - Custom"/>
+      <description translate="value" value="CD - Custom"/>
       <comment value="CD, custom diameter"/>
       <width value="340"/>
       <height value="340"/>
       <unit value="english"/>
     </paper>
     <paper name="w216h360">
-      <description value="3x5"/>
+      <description translate="value" value="3x5"/>
       <width value="216"/>
       <height value="360"/>
       <unit value="english-extended"/>
     </paper>
     <paper name="w252h360">
-      <description value="3 1/2 x5"/>
+      <description translate="value" value="3 1/2 x5"/>
       <width value="252"/>
       <height value="360"/>
       <unit value="english-extended"/>
     </paper>
     <paper name="w288h432">
-      <description value="4x6"/>
+      <description translate="value" value="4x6"/>
       <width value="288"/>
       <height value="432"/>
       <unit value="english"/>
     </paper>
     <paper name="w324h495">
-      <description value="Epson 4x6 Photo Paper (tear-off borders)"/>
+      <description translate="value" value="Epson 4x6 Photo Paper (tear-off borders)"/>
       <width value="324"/>
       <height value="495"/>
       <unit value="english-extended"/>
@@ -104,51 +139,51 @@
       <bottom value="45"/>
     </paper>
     <paper name="w360h504">
-      <description value="5x7"/>
+      <description translate="value" value="5x7"/>
       <width value="360"/>
       <height value="504"/>
       <unit value="english-extended"/>
     </paper>
     <paper name="w360h576">
-      <description value="5x8"/>
+      <description translate="value" value="5x8"/>
       <width value="360"/>
       <height value="576"/>
       <unit value="english-extended"/>
     </paper>
     <paper name="w432h576">
-      <description value="6x8"/>
+      <description translate="value" value="6x8"/>
       <width value="432"/>
       <height value="576"/>
       <unit value="english-extended"/>
     </paper>
     <paper name="c8x10">
-      <description value="8x10"/>
+      <description translate="value" value="8x10"/>
       <width value="576"/>
       <height value="720"/>
       <unit value="english-extended"/>
     </paper>
     <paper name="Statement">
-      <description value="Manual"/>
+      <description translate="value" value="Manual"/>
       <comment value="5.5in x 8.5in (Statement)"/>
       <width value="396"/>
       <height value="612"/>
       <unit value="english"/>
     </paper>
     <paper name="TabloidExtra">
-      <description value="12x18"/>
+      <description translate="value" value="12x18"/>
       <comment value="Tabloid Extra"/>
       <width value="864"/>
       <height value="1296"/>
       <unit value="english-extended"/>
     </paper>
     <paper name="SuperB">
-      <description value="Super B 13x19"/>
+      <description translate="value" value="Super B 13x19"/>
       <width value="936"/>
       <height value="1368"/>
       <unit value="english"/>
     </paper>
     <paper name="EngineeringC">
-      <description value="Engineering C 17x22"/>
+      <description translate="value" value="Engineering C 17x22"/>
       <width value="1224"/>
       <height value="1584"/>
       <unit value="english"/>
@@ -157,66 +192,66 @@
     Other common photographic paper sizes
 -->
     <paper name="w576h864">
-      <description value="8x12"/>
+      <description translate="value" value="8x12"/>
       <comment value="Sometimes used for 35mm"/>
       <width value="576"/>
       <height value="864"/>
       <unit value="english-extended"/>
     </paper>
     <paper name="w792h1008">
-      <description value="11x14"/>
+      <description translate="value" value="11x14"/>
       <width value="792"/>
       <height value="1008"/>
       <unit value="english-extended"/>
     </paper>
     <paper name="w1152h1440">
-      <description value="16x20"/>
+      <description translate="value" value="16x20"/>
       <width value="1152"/>
       <height value="1440"/>
       <unit value="english-extended"/>
     </paper>
     <paper name="w1152h1728">
-      <description value="16x24"/>
+      <description translate="value" value="16x24"/>
       <comment value="20 x 24 for 35mm"/>
       <width value="1152"/>
       <height value="1728"/>
       <unit value="english-extended"/>
     </paper>
     <paper name="w1440h1728">
-      <description value="20x24"/>
+      <description translate="value" value="20x24"/>
       <width value="1440"/>
       <height value="1728"/>
       <unit value="english-extended"/>
     </paper>
     <paper name="w1440h2160">
-      <description value="20x30"/>
+      <description translate="value" value="20x30"/>
       <comment value="24 x 30 for 35mm"/>
       <width value="1440"/>
       <height value="2160"/>
       <unit value="english-extended"/>
     </paper>
     <paper name="w1584h2160">
-      <description value="22x30"/>
+      <description translate="value" value="22x30"/>
       <comment value="Common watercolor paper"/>
       <width value="1584"/>
       <height value="2160"/>
       <unit value="english-extended"/>
     </paper>
     <paper name="w1728h2160">
-      <description value="24x30"/>
+      <description translate="value" value="24x30"/>
       <width value="1728"/>
       <height value="2160"/>
       <unit value="english-extended"/>
     </paper>
     <paper name="w1728h2592">
-      <description value="Super A1 24x36"/>
+      <description translate="value" value="Super A1 24x36"/>
       <comment value="Sometimes used for 35mm"/>
       <width value="1728"/>
       <height value="2592"/>
       <unit value="english-extended"/>
     </paper>
     <paper name="w2160h2880">
-      <description value="30x40"/>
+      <description translate="value" value="30x40"/>
       <width value="2160"/>
       <height value="2880"/>
       <unit value="english-extended"/>
@@ -233,98 +268,102 @@
     size is obtained by doubling or halving another A size.
 -->
     <paper name="w4768h6749">
-      <description value="4A"/>
+      <description translate="value" value="4A"/>
       <comment value="1682mm x 2378mm"/>
       <width value="4768"/>
       <height value="6749"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="w3370h4768">
-      <description value="2A"/>
+      <description translate="value" value="2A"/>
       <comment value="1189mm x 1682mm"/>
       <width value="3370"/>
       <height value="4768"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="SuperA0">
-      <description value="Super A0"/>
+      <description translate="value" value="Super A0"/>
       <comment value="914mm x 1292mm"/>
       <width value="2590"/>
       <height value="3662"/>
       <unit value="metric"/>
     </paper>
     <paper name="A0">
-      <description value="A0"/>
+      <description translate="value" value="A0"/>
       <comment value="841mm x 1189mm"/>
       <width value="2384"/>
       <height value="3370"/>
       <unit value="metric"/>
     </paper>
     <paper name="A1">
-      <description value="A1"/>
+      <description translate="value" value="A1"/>
       <comment value="594mm x 841mm"/>
       <width value="1684"/>
       <height value="2384"/>
       <unit value="metric"/>
     </paper>
     <paper name="A2">
-      <description value="A2"/>
+      <description translate="value" value="A2"/>
       <comment value="420mm x 594mm"/>
       <width value="1191"/>
       <height value="1684"/>
       <unit value="metric"/>
     </paper>
     <paper name="A3">
-      <description value="A3"/>
+      <description translate="value" value="A3"/>
       <comment value="297mm x 420mm"/>
       <width value="842"/>
       <height value="1191"/>
       <unit value="metric"/>
     </paper>
     <paper name="A4">
-      <description value="A4"/>
+      <description translate="value" value="A4"/>
       <comment value="210mm x 297mm"/>
       <width value="595"/>
       <height value="842"/>
       <unit value="metric"/>
+<!-- DISTRIBUTORS: Please do NOT insert margins here to work around -->
+<!-- problems with page margins that were present in 5.0.0.  That -->
+<!-- workaround is no longer needed.  Please see the explanation at the -->
+<!-- top of this file. -->
     </paper>
     <paper name="A5">
-      <description value="A5"/>
+      <description translate="value" value="A5"/>
       <comment value="148mm x 210mm"/>
       <width value="420"/>
       <height value="595"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="A6">
-      <description value="A6"/>
+      <description translate="value" value="A6"/>
       <comment value="105mm x  148mm"/>
       <width value="297"/>
       <height value="420"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="A7">
-      <description value="A7"/>
+      <description translate="value" value="A7"/>
       <comment value="74mm x 105mm"/>
       <width value="210"/>
       <height value="297"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="A8">
-      <description value="A8"/>
+      <description translate="value" value="A8"/>
       <comment value="52mm x 74mm"/>
       <width value="148"/>
       <height value="210"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="A9">
-      <description value="A9"/>
+      <description translate="value" value="A9"/>
       <comment value="37mm x 52mm"/>
       <width value="105"/>
       <height value="148"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="A10">
-      <description value="A10"/>
+      <description translate="value" value="A10"/>
       <comment value="26mm x 37mm"/>
       <width value="73"/>
       <height value="105"/>
@@ -335,35 +374,35 @@
      Allowance for trim is 3 millimetres.
 -->
     <paper name="w2437h3458">
-      <description value="RA0"/>
+      <description translate="value" value="RA0"/>
       <comment value="860mm x 1220mm"/>
       <width value="2437"/>
       <height value="3458"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="w1729h2437">
-      <description value="RA1"/>
+      <description translate="value" value="RA1"/>
       <comment value="610mm x 860mm"/>
       <width value="1729"/>
       <height value="2437"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="w1218h1729">
-      <description value="RA2"/>
+      <description translate="value" value="RA2"/>
       <comment value="430mm x 610mm"/>
       <width value="1218"/>
       <height value="1729"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="w864h1218">
-      <description value="RA3"/>
+      <description translate="value" value="RA3"/>
       <comment value="305mm x 430mm"/>
       <width value="864"/>
       <height value="1218"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="w609h864">
-      <description value="RA4"/>
+      <description translate="value" value="RA4"/>
       <comment value="215mm x 305mm"/>
       <width value="609"/>
       <height value="864"/>
@@ -373,35 +412,35 @@
     Stock sizes for bled work or extra trims.
 -->
     <paper name="w2551h3628">
-      <description value="SRA0"/>
+      <description translate="value" value="SRA0"/>
       <comment value="900mm x 1280mm"/>
       <width value="2551"/>
       <height value="3628"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="w1814h2551">
-      <description value="SRA1"/>
+      <description translate="value" value="SRA1"/>
       <comment value="640mm x 900mm"/>
       <width value="1814"/>
       <height value="2551"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="w1275h1814">
-      <description value="SRA2"/>
+      <description translate="value" value="SRA2"/>
       <comment value="450mm x 640mm"/>
       <width value="1275"/>
       <height value="1814"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="w907h1275">
-      <description value="SRA3"/>
+      <description translate="value" value="SRA3"/>
       <comment value="320mm x 450mm"/>
       <width value="907"/>
       <height value="1275"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="w637h907">
-      <description value="SRA4"/>
+      <description translate="value" value="SRA4"/>
       <comment value="225mm x 320mm"/>
       <width value="637"/>
       <height value="907"/>
@@ -412,91 +451,91 @@
     "B" series: Posters, wall charts and similar items.
 -->
     <paper name="w5669h8016">
-      <description value="4B ISO"/>
+      <description translate="value" value="4B ISO"/>
       <comment value="2000mm x 2828mm"/>
       <width value="5669"/>
       <height value="8016"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="w4008h5669">
-      <description value="2B ISO"/>
+      <description translate="value" value="2B ISO"/>
       <comment value="1414mm x 2000mm"/>
       <width value="4008"/>
       <height value="5669"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="ISOB0">
-      <description value="B0 ISO"/>
+      <description translate="value" value="B0 ISO"/>
       <comment value="1000mm x 1414mm"/>
       <width value="2834"/>
       <height value="4008"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="ISOB1">
-      <description value="B1 ISO"/>
+      <description translate="value" value="B1 ISO"/>
       <comment value="707mm x 1000mm"/>
       <width value="2004"/>
       <height value="2834"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="ISOB2">
-      <description value="B2 ISO"/>
+      <description translate="value" value="B2 ISO"/>
       <comment value="500mm x 707mm"/>
       <width value="1417"/>
       <height value="2004"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="ISOB3">
-      <description value="B3 ISO"/>
+      <description translate="value" value="B3 ISO"/>
       <comment value="353mm x 500mm"/>
       <width value="1000"/>
       <height value="1417"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="ISOB4">
-      <description value="B4 ISO"/>
+      <description translate="value" value="B4 ISO"/>
       <comment value="250mm x 353mm"/>
       <width value="708"/>
       <height value="1000"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="ISOB5">
-      <description value="B5 ISO"/>
+      <description translate="value" value="B5 ISO"/>
       <comment value="176mm x 250mm"/>
       <width value="498"/>
       <height value="708"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="ISOB6">
-      <description value="B6 ISO"/>
+      <description translate="value" value="B6 ISO"/>
       <comment value="125mm x 176mm"/>
       <width value="354"/>
       <height value="498"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="ISOB7">
-      <description value="B7 ISO"/>
+      <description translate="value" value="B7 ISO"/>
       <comment value="88mm x 125mm"/>
       <width value="249"/>
       <height value="354"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="ISOB8">
-      <description value="B8 ISO"/>
+      <description translate="value" value="B8 ISO"/>
       <comment value="62mm x 88mm"/>
       <width value="175"/>
       <height value="249"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="ISOB9">
-      <description value="B9 ISO"/>
+      <description translate="value" value="B9 ISO"/>
       <comment value="44mm x 62mm"/>
       <width value="124"/>
       <height value="175"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="ISOB10">
-      <description value="B10 ISO"/>
+      <description translate="value" value="B10 ISO"/>
       <comment value="31mm x 44mm"/>
       <width value="87"/>
       <height value="124"/>
@@ -506,73 +545,73 @@
     JIS
 -->
     <paper name="SuperB0">
-      <description value="Super B0 JIS"/>
+      <description translate="value" value="Super B0 JIS"/>
       <width value="3167"/> <!-- Should be 3169, but Epson driver doesn't like that -->
       <height value="4478"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="B0">
-      <description value="B0 JIS"/>
+      <description translate="value" value="B0 JIS"/>
       <width value="2919"/>
       <height value="4127"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="B1">
-      <description value="B1 JIS"/>
+      <description translate="value" value="B1 JIS"/>
       <width value="2063"/>
       <height value="2919"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="B2">
-      <description value="B2 JIS"/>
+      <description translate="value" value="B2 JIS"/>
       <width value="1459"/>
       <height value="2063"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="B3">
-      <description value="B3 JIS"/>
+      <description translate="value" value="B3 JIS"/>
       <width value="1029"/>
       <height value="1459"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="B4">
-      <description value="B4 JIS"/>
+      <description translate="value" value="B4 JIS"/>
       <width value="727"/>
       <height value="1029"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="B5">
-      <description value="B5 JIS"/>
+      <description translate="value" value="B5 JIS"/>
       <width value="518"/>
       <height value="727"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="B6">
-      <description value="B6 JIS"/>
+      <description translate="value" value="B6 JIS"/>
       <width value="362"/>
       <height value="518"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="B7">
-      <description value="B7 JIS"/>
+      <description translate="value" value="B7 JIS"/>
       <width value="257"/>
       <height value="362"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="B8">
-      <description value="B8 JIS"/>
+      <description translate="value" value="B8 JIS"/>
       <width value="180"/>
       <height value="257"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="B9">
-      <description value="B9 JIS"/>
+      <description translate="value" value="B9 JIS"/>
       <width value="127"/>
       <height value="180"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="B10">
-      <description value="B10 JIS"/>
+      <description translate="value" value="B10 JIS"/>
       <width value="90"/>
       <height value="127"/>
       <unit value="metric-extended"/>
@@ -582,7 +621,7 @@
     "C" series: Envelopes or folders suitable for A size stationery.
 -->
     <paper name="C0">
-      <description value="C0"/>
+      <description translate="value" value="C0"/>
       <comment value="917mm x 1297mm"/>
       <width value="2599"/>
       <height value="3676"/>
@@ -590,7 +629,7 @@
       <type value="envelope"/>
     </paper>
     <paper name="C0_l">
-      <description value="C0 landscape"/>
+      <description translate="value" value="C0 landscape"/>
       <comment value="917mm x 1297mm landscape"/>
       <width value="3676"/>
       <height value="2599"/>
@@ -598,7 +637,7 @@
       <type value="envelope"/>
     </paper>
     <paper name="C1">
-      <description value="C1"/>
+      <description translate="value" value="C1"/>
       <comment value="648mm x 917mm"/>
       <width value="1836"/>
       <height value="2599"/>
@@ -606,7 +645,7 @@
       <type value="envelope"/>
     </paper>
     <paper name="C1_l">
-      <description value="C1 landscape"/>
+      <description translate="value" value="C1 landscape"/>
       <comment value="648mm x 917mm landscape"/>
       <width value="2599"/>
       <height value="1836"/>
@@ -614,7 +653,7 @@
       <type value="envelope"/>
     </paper>
     <paper name="C2">
-      <description value="C2"/>
+      <description translate="value" value="C2"/>
       <comment value="458mm x 648mm"/>
       <width value="1298"/>
       <height value="1836"/>
@@ -622,7 +661,7 @@
       <type value="envelope"/>
     </paper>
     <paper name="C2_l">
-      <description value="C2 landscape"/>
+      <description translate="value" value="C2 landscape"/>
       <comment value="458mm x 648mm landscape"/>
       <width value="1836"/>
       <height value="1298"/>
@@ -630,7 +669,7 @@
       <type value="envelope"/>
     </paper>
     <paper name="C3">
-      <description value="C3"/>
+      <description translate="value" value="C3"/>
       <comment value="324mm x 458mm"/>
       <width value="918"/>
       <height value="1298"/>
@@ -638,7 +677,7 @@
       <type value="envelope"/>
     </paper>
     <paper name="C3_l">
-      <description value="C3 landscape"/>
+      <description translate="value" value="C3 landscape"/>
       <comment value="324mm x 458mm landscape"/>
       <width value="1298"/>
       <height value="918"/>
@@ -646,7 +685,7 @@
       <type value="envelope"/>
     </paper>
     <paper name="C4">
-      <description value="C4"/>
+      <description translate="value" value="C4"/>
       <comment value="229mm x 324mm"/>
       <width value="649"/>
       <height value="918"/>
@@ -654,7 +693,7 @@
       <type value="envelope"/>
     </paper>
     <paper name="C4_l">
-      <description value="C4 landscape"/>
+      <description translate="value" value="C4 landscape"/>
       <comment value="229mm x 324mm landscape"/>
       <width value="918"/>
       <height value="649"/>
@@ -662,7 +701,7 @@
       <type value="envelope"/>
     </paper>
     <paper name="C5">
-      <description value="C5"/>
+      <description translate="value" value="C5"/>
       <comment value="162mm x 229mm"/>
       <width value="459"/>
       <height value="649"/>
@@ -670,7 +709,7 @@
       <type value="envelope"/>
     </paper>
     <paper name="C5_l">
-      <description value="C5 landscape"/>
+      <description translate="value" value="C5 landscape"/>
       <comment value="162mm x 229mm landscape"/>
       <width value="649"/>
       <height value="459"/>
@@ -678,7 +717,7 @@
       <type value="envelope"/>
     </paper>
     <paper name="w354h918">
-      <description value="B6-C4"/>
+      <description translate="value" value="B6-C4"/>
       <comment value="125mm x 324mm"/>
       <width value="354"/>
       <height value="918"/>
@@ -686,7 +725,7 @@
       <type value="envelope"/>
     </paper>
     <paper name="w354h918_l">
-      <description value="B6-C4 landscape"/>
+      <description translate="value" value="B6-C4 landscape"/>
       <comment value="125mm x 324mm landscape"/>
       <width value="918"/>
       <height value="354"/>
@@ -694,7 +733,7 @@
       <type value="envelope"/>
     </paper>
     <paper name="C6">
-      <description value="C6"/>
+      <description translate="value" value="C6"/>
       <comment value="114mm x 162mm"/>
       <width value="323"/>
       <height value="459"/>
@@ -702,7 +741,7 @@
       <type value="envelope"/>
     </paper>
     <paper name="C6_l">
-      <description value="C6 landscape"/>
+      <description translate="value" value="C6 landscape"/>
       <comment value="114mm x 162mm landscape"/>
       <width value="459"/>
       <height value="323"/>
@@ -710,7 +749,7 @@
       <type value="envelope"/>
     </paper>
     <paper name="DL">
-      <description value="DL"/>
+      <description translate="value" value="DL"/>
       <comment value="110mm x 220mm"/>
       <width value="311"/>
       <height value="623"/>
@@ -718,7 +757,7 @@
       <type value="envelope"/>
     </paper>
     <paper name="DL_l">
-      <description value="DL landscape"/>
+      <description translate="value" value="DL landscape"/>
       <comment value="110mm x 220mm landscape"/>
       <width value="623"/>
       <height value="311"/>
@@ -726,7 +765,7 @@
       <type value="envelope"/>
     </paper>
     <paper name="w229h459">
-      <description value="C7-6"/>
+      <description translate="value" value="C7-6"/>
       <comment value="81mm x 162mm"/>
       <width value="229"/>
       <height value="459"/>
@@ -734,7 +773,7 @@
       <type value="envelope"/>
     </paper>
     <paper name="w229h459_l">
-      <description value="C7-6 landscape"/>
+      <description translate="value" value="C7-6 landscape"/>
       <comment value="81mm x 162mm landscape"/>
       <width value="459"/>
       <height value="229"/>
@@ -742,7 +781,7 @@
       <type value="envelope"/>
     </paper>
     <paper name="C7">
-      <description value="C7"/>
+      <description translate="value" value="C7"/>
       <comment value="81mm x 114mm"/>
       <width value="229"/>
       <height value="323"/>
@@ -750,7 +789,7 @@
       <type value="envelope"/>
     </paper>
     <paper name="C7_l">
-      <description value="C7 landscape"/>
+      <description translate="value" value="C7 landscape"/>
       <comment value="81mm x 114mm landscape"/>
       <width value="323"/>
       <height value="229"/>
@@ -758,7 +797,7 @@
       <type value="envelope"/>
     </paper>
     <paper name="C8">
-      <description value="C8"/>
+      <description translate="value" value="C8"/>
       <comment value="57mm x 81mm"/>
       <width value="161"/>
       <height value="229"/>
@@ -766,7 +805,7 @@
       <type value="envelope"/>
     </paper>
     <paper name="C8_l">
-      <description value="C8 landscape"/>
+      <description translate="value" value="C8 landscape"/>
       <comment value="57mm x 81mm landscape"/>
       <width value="229"/>
       <height value="161"/>
@@ -774,7 +813,7 @@
       <type value="envelope"/>
     </paper>
     <paper name="C9">
-      <description value="C9"/>
+      <description translate="value" value="C9"/>
       <comment value="40mm x 57mm"/>
       <width value="113"/>
       <height value="161"/>
@@ -782,7 +821,7 @@
       <type value="envelope"/>
     </paper>
     <paper name="C9_l">
-      <description value="C9 landscape"/>
+      <description translate="value" value="C9 landscape"/>
       <comment value="40mm x 57mm landscape"/>
       <width value="161"/>
       <height value="113"/>
@@ -790,7 +829,7 @@
       <type value="envelope"/>
     </paper>
     <paper name="C10">
-      <description value="C10"/>
+      <description translate="value" value="C10"/>
       <comment value="28mm x 40mm"/>
       <width value="79"/>
       <height value="113"/>
@@ -798,7 +837,7 @@
       <type value="envelope"/>
     </paper>
     <paper name="C10_l">
-      <description value="C10 landscape"/>
+      <description translate="value" value="C10 landscape"/>
       <comment value="28mm x 40mm landscape"/>
       <width value="113"/>
       <height value="79"/>
@@ -810,70 +849,70 @@
     US CAD standard paper sizes
 -->
     <paper name="ARCHA">
-      <description value="ArchA"/>
+      <description translate="value" value="ArchA"/>
       <comment value="9in x 12in"/>
       <width value="648"/>
       <height value="864"/>
       <unit value="english-extended"/>
     </paper>
     <paper name="ARCHA_trans">
-      <description value="ArchA transposed"/>
+      <description translate="value" value="ArchA transposed"/>
       <comment value="12in x 9in"/>
       <width value="864"/>
       <height value="648"/>
       <unit value="english-extended"/>
     </paper>
     <paper name="ARCHB">
-      <description value="ArchB"/>
+      <description translate="value" value="ArchB"/>
       <comment value="12in x 18in"/>
       <width value="864"/>
       <height value="1296"/>
       <unit value="english-extended"/>
     </paper>
     <paper name="ARCHB_trans">
-      <description value="ArchB transposed"/>
+      <description translate="value" value="ArchB transposed"/>
       <comment value="18in x 12in"/>
       <width value="1296"/>
       <height value="864"/>
       <unit value="english-extended"/>
     </paper>
     <paper name="ARCHC">
-      <description value="ArchC"/>
+      <description translate="value" value="ArchC"/>
       <comment value="18in x 24in"/>
       <width value="1296"/>
       <height value="1728"/>
       <unit value="english-extended"/>
     </paper>
     <paper name="ARCHC_trans">
-      <description value="ArchC transposed"/>
+      <description translate="value" value="ArchC transposed"/>
       <comment value="24in x 18in"/>
       <width value="1728"/>
       <height value="1296"/>
       <unit value="english-extended"/>
     </paper>
     <paper name="ARCHD">
-      <description value="ArchD"/>
+      <description translate="value" value="ArchD"/>
       <comment value="24in x 36in"/>
       <width value="1728"/>
       <height value="2592"/>
       <unit value="english-extended"/>
     </paper>
     <paper name="ARCHD_trans">
-      <description value="ArchD transposed"/>
+      <description translate="value" value="ArchD transposed"/>
       <comment value="36in x 24in"/>
       <width value="2592"/>
       <height value="1728"/>
       <unit value="english-extended"/>
     </paper>
     <paper name="ARCHE">
-      <description value="ArchE"/>
+      <description translate="value" value="ArchE"/>
       <comment value="36in x 48in"/>
       <width value="2592"/>
       <height value="3456"/>
       <unit value="english-extended"/>
     </paper>
     <paper name="ARCHE_trans">
-      <description value="ArchE transposed"/>
+      <description translate="value" value="ArchE transposed"/>
       <comment value="48in x 36in"/>
       <width value="3456"/>
       <height value="2592"/>
@@ -881,13 +920,13 @@
     </paper>
 <!-- GROUP: Foolscap -->
     <paper name="w612h936">
-      <description value="American foolscap"/>
+      <description translate="value" value="American foolscap"/>
       <width value="612"/>
       <height value="936"/>
       <unit value="english-extended"/>
     </paper>
     <paper name="w648h936">
-      <description value="European foolscap"/>
+      <description translate="value" value="European foolscap"/>
       <width value="648"/>
       <height value="936"/>
       <unit value="english-extended"/>
@@ -899,28 +938,28 @@
     standard metric sizes for case-bound titles as follows:
 -->
     <paper name="w535h697">
-      <description value="Crown Quarto"/>
+      <description translate="value" value="Crown Quarto"/>
       <comment value="189mm x 246mm"/>
       <width value="535"/>
       <height value="697"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="w569h731">
-      <description value="Large Crown Quarto"/>
+      <description translate="value" value="Large Crown Quarto"/>
       <comment value="201mm x 258mm"/>
       <width value="569"/>
       <height value="731"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="w620h782">
-      <description value="Demy Quarto"/>
+      <description translate="value" value="Demy Quarto"/>
       <comment value="219mm x 276mm"/>
       <width value="620"/>
       <height value="782"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="w671h884">
-      <description value="Royal Quarto"/>
+      <description translate="value" value="Royal Quarto"/>
       <comment value="237mm x 312mm"/>
       <width value="671"/>
       <height value="884"/>
@@ -928,7 +967,7 @@
     </paper>
 <!--
     <paper name="ISO A4">
-      <description value="ISO A4"/>
+      <description translate="value" value="ISO A4"/>
       <comment value="210mm x 297mm"/>
       <width value="595"/>
       <height value="841"/>
@@ -936,28 +975,28 @@
     </paper>
 -->
     <paper name="w348h527">
-      <description value="Crown Octavo"/>
+      <description translate="value" value="Crown Octavo"/>
       <comment value="123mm x 186mm"/>
       <width value="348"/>
       <height value="527"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="w365h561">
-      <description value="Large Crown Octavo"/>
+      <description translate="value" value="Large Crown Octavo"/>
       <comment value="129mm x 198mm"/>
       <width value="365"/>
       <height value="561"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="w391h612">
-      <description value="Demy Octavo"/>
+      <description translate="value" value="Demy Octavo"/>
       <comment value="138mm x 216mm"/>
       <width value="391"/>
       <height value="612"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="w442h663">
-      <description value="Royal Octavo"/>
+      <description translate="value" value="Royal Octavo"/>
       <comment value="156mm x 234mm"/>
       <width value="442"/>
       <height value="663"/>
@@ -965,7 +1004,7 @@
     </paper>
 <!--
     <paper name="ISO A5">
-      <description value="ISO A5"/>
+      <description translate="value" value="ISO A5"/>
       <comment value="148mm x 210mm"/>
       <width value="419"/>
       <height value="595"/>
@@ -976,21 +1015,21 @@
     Paperback sizes in common usage
 -->
     <paper name="w314h504">
-      <description value="Small paperback"/>
+      <description translate="value" value="Small paperback"/>
       <comment value="111mm x 178mm"/>
       <width value="314"/>
       <height value="504"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="w314h513">
-      <description value="Penguin small paperback"/>
+      <description translate="value" value="Penguin small paperback"/>
       <comment value="111mm x 181mm"/>
       <width value="314"/>
       <height value="513"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="cw365h561">
-      <description value="Penguin large paperback"/>
+      <description translate="value" value="Penguin large paperback"/>
       <comment value="129mm x 198mm"/>
       <width value="365"/>
       <height value="561"/>
@@ -1001,70 +1040,70 @@
     Miscellaneous sizes
 -->
     <paper name="w283h425">
-      <description value="10cm x 15cm"/>
+      <description translate="value" value="10cm x 15cm"/>
       <comment value="100 x 150mm"/>
       <width value="283"/>
       <height value="425"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="w283h420">
-      <description value="Hagaki Card"/>
+      <description translate="value" value="Hagaki Card"/>
       <comment value="100mm x 148mm"/>
       <width value="283"/>
       <height value="420"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="w420h567">
-      <description value="Oufuku Card"/>
+      <description translate="value" value="Oufuku Card"/>
       <comment value="148mm x 200mm"/>
       <width value="420"/>
       <height value="567"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="w340h666">
-      <description value="Japanese long envelope #3"/>
+      <description translate="value" value="Japanese long envelope #3"/>
       <width value="340"/>
       <height value="666"/>
       <unit value="metric-extended"/>
       <type value="envelope"/>
     </paper>
     <paper name="w340h666_l">
-      <description value="Japanese long envelope #3 landscape"/>
+      <description translate="value" value="Japanese long envelope #3 landscape"/>
       <width value="666"/>
       <height value="340"/>
       <unit value="metric-extended"/>
       <type value="envelope"/>
     </paper>
     <paper name="w255h581">
-      <description value="Japanese long envelope #4"/>
+      <description translate="value" value="Japanese long envelope #4"/>
       <width value="255"/>
       <height value="581"/>
       <unit value="metric-extended"/>
       <type value="envelope"/>
     </paper>
     <paper name="w255h581_l">
-      <description value="Japanese long envelope #4 landscape"/>
+      <description translate="value" value="Japanese long envelope #4 landscape"/>
       <width value="581"/>
       <height value="255"/>
       <unit value="metric-extended"/>
       <type value="envelope"/>
     </paper>
     <paper name="w680h941">
-      <description value="Japanese Kaku envelope #4"/>
+      <description translate="value" value="Japanese Kaku envelope #4"/>
       <width value="680"/>
       <height value="941"/>
       <unit value="metric-extended"/>
       <type value="envelope"/>
     </paper>
     <paper name="w680h941_l">
-      <description value="Japanese Kaku envelope #4 landscape"/>
+      <description translate="value" value="Japanese Kaku envelope #4 landscape"/>
       <width value="941"/>
       <height value="680"/>
       <unit value="metric-extended"/>
       <type value="envelope"/>
     </paper>
     <paper name="COM10">
-      <description value="Commercial 10"/>
+      <description translate="value" value="Commercial 10"/>
       <comment value="US Commercial 10 env"/>
       <width value="297"/>
       <height value="684"/>
@@ -1072,7 +1111,7 @@
       <type value="envelope"/>
     </paper>
     <paper name="COM10_l">
-      <description value="Commercial 10 landscape"/>
+      <description translate="value" value="Commercial 10 landscape"/>
       <comment value="US Commercial 10 env landscape"/>
       <width value="684"/>
       <height value="297"/>
@@ -1080,14 +1119,14 @@
       <type value="envelope"/>
     </paper>
     <paper name="w315h414">
-      <description value="A2 Invitation"/>
+      <description translate="value" value="A2 Invitation"/>
       <comment value="US A2 invitation"/>
       <width value="315"/>
       <height value="414"/>
       <unit value="english-extended"/>
     </paper>
     <paper name="Monarch">
-      <description value="Monarch Envelope"/>
+      <description translate="value" value="Monarch Envelope"/>
       <comment value="3.875in x 7.5in"/>
       <width value="279"/>
       <height value="540"/>
@@ -1095,7 +1134,7 @@
       <type value="envelope"/>
     </paper>
     <paper name="Monarch_l">
-      <description value="Monarch Envelope landscape"/>
+      <description translate="value" value="Monarch Envelope landscape"/>
       <comment value="3.875in x 7.5in landscape"/>
       <width value="540"/>
       <height value="279"/>
@@ -1103,54 +1142,54 @@
       <type value="envelope"/>
     </paper>
     <paper name="w288h387">
-      <description value="4x5 3/8"/>
+      <description translate="value" value="4x5 3/8"/>
       <width value="288"/>
       <height value="387"/>
       <unit value="english-extended"/>
     </paper>
     <paper name="w288h504">
-      <description value="4x7"/>
+      <description translate="value" value="4x7"/>
       <width value="288"/>
       <height value="504"/>
       <unit value="english-extended"/>
     </paper>
     <paper name="w253h337">
-      <description value="CP_L"/>
+      <description translate="value" value="CP_L"/>
       <comment value="89mm x 119mm"/>
       <width value="253"/>
       <height value="337"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="w155h244">
-      <description value="Card"/>
+      <description translate="value" value="Card"/>
       <comment value="54mm x 86mm"/>
       <width value="155"/>
       <height value="244"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="w283h566">
-      <description value="Wide Postcard"/>
+      <description translate="value" value="Wide Postcard"/>
       <comment value="100mm x 200mm"/>
       <width value="283"/>
       <height value="566"/>
       <unit value="english-extended"/>
     </paper>
     <paper name="w612h935">
-      <description value="Chilean Office"/>
+      <description translate="value" value="Chilean Office"/>
       <comment value="215.9mm x 330mm"/>
       <width value="612"/>
       <height value="935"/>
       <unit value="english-extended"/>
     </paper>
     <paper name="w1224h1584">
-      <description value="Chilean Double Letter"/>
+      <description translate="value" value="Chilean Double Letter"/>
       <comment value="431.8mm x 558.8mm"/>
       <width value="1224"/>
       <height value="1584"/>
       <unit value="english-extended"/>
     </paper>
     <paper name="w1224h1871">
-      <description value="Chilean Double Office"/>
+      <description translate="value" value="Chilean Double Office"/>
       <comment value="215.9mm x 660mm"/>
       <width value="1224"/>
       <height value="1871"/>
@@ -1160,7 +1199,7 @@
     Custom
 -->
     <paper name="Custom">
-      <description value="Custom"/>
+      <description translate="value" value="Custom"/>
       <comment value="User-Defined Size"/>
       <width value="0"/>
       <height value="0"/>
@@ -1168,58 +1207,76 @@
     </paper>
 <!-- Group: Roll Papers -->
     <paper name="w252">
-      <description value="89 mm Roll Paper"/>
+      <description translate="value" value="89 mm Roll Paper"/>
       <width value="252"/>
       <height value="0"/>
       <unit value="metric"/>
     </paper>
     <paper name="w288">
-      <description value="4 Inch Roll Paper"/>
+      <description translate="value" value="4 Inch Roll Paper"/>
       <width value="288"/>
       <height value="0"/>
       <unit value="english"/>
     </paper>
     <paper name="w360">
-      <description value="5 Inch Roll Paper"/>
+      <description translate="value" value="5 Inch Roll Paper"/>
       <width value="360"/>
       <height value="0"/>
       <unit value="english"/>
     </paper>
     <paper name="w595">
-      <description value="210 mm Roll Paper"/>
+      <description translate="value" value="210 mm Roll Paper"/>
       <width value="595"/>
       <height value="0"/>
       <unit value="metric"/>
     </paper>
     <paper name="w936">
-      <description value="13 Inch Roll Paper"/>
+      <description translate="value" value="13 Inch Roll Paper"/>
       <width value="936"/>
       <height value="0"/>
       <unit value="english"/>
     </paper>
+    <paper name="w1224">
+      <description translate="value" value="17 Inch Roll Paper"/>
+      <width value="1224"/>
+      <height value="0"/>
+      <unit value="english"/>
+    </paper>
     <paper name="w1584">
-      <description value="22 Inch Roll Paper"/>
+      <description translate="value" value="22 Inch Roll Paper"/>
       <width value="1584"/>
       <height value="0"/>
       <unit value="english"/>
     </paper>
     <paper name="w1728">
-      <description value="24 Inch Roll Paper"/>
+      <description translate="value" value="24 Inch Roll Paper"/>
       <width value="1728"/>
       <height value="0"/>
       <unit value="english"/>
     </paper>
     <paper name="w2592">
-      <description value="36 Inch Roll Paper"/>
+      <description translate="value" value="36 Inch Roll Paper"/>
       <width value="2592"/>
       <height value="0"/>
       <unit value="english"/>
     </paper>
     <paper name="w3168">
-      <description value="44 Inch Roll Paper"/>
+      <description translate="value" value="44 Inch Roll Paper"/>
       <width value="3168"/>
       <height value="0"/>
       <unit value="english"/>
     </paper>
+    <paper name="w4320">
+      <description translate="value" value="60 Inch Roll Paper"/>
+      <width value="4320"/>
+      <height value="0"/>
+      <unit value="english"/>
+    </paper>
+    <paper name="w4608">
+      <description translate="value" value="64 Inch Roll Paper"/>
+      <width value="4608"/>
+      <height value="0"/>
+      <unit value="english"/>
+    </paper>
   </paperdef>
 </gutenprint>
diff --git a/src/xml/printers.xml b/src/xml/printers.xml
new file mode 100644
index 0000000..f3b211a
--- /dev/null
+++ b/src/xml/printers.xml
@@ -0,0 +1,1557 @@
+<?xml version="1.0"?>
+
+<!--
+   "$Id: printers.xml,v 1.19 2008/10/19 13:57:27 rlk Exp $"
+
+   XML description of printers known to libgutenprint
+   You can add additional printers here, but the underlying driver has
+   to know about the model number.  You can have different printers
+   with the same model number but different parameters; this means
+   printers that are functionally identical but have different ink
+   characteristics.
+
+   NOTE TO TRANSLATORS: Printer names should not be translated into
+   their equivalents (the same printer sold under a different name) 
+   in other countries.  The correct way to handle this is to add
+   another printer to this list.  Translations should be done for 
+   e. g. character sets.
+
+   For example, a Japanese printer will have the same model name wherever
+   it is used and with whatever language the user speaks.
+-->
+
+<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>
+  <printdef>
+    <family name="ps">
+      <printer translate="name" name="PostScript Level 1" driver="ps" manufacturer="Adobe" model="0" />
+      <printer translate="name" name="PostScript Level 2" driver="ps2" manufacturer="Adobe" model="1" />
+    </family>
+    <family name="canon">
+      <parameters name="density_800_params">
+        <parameter type="float" name="Density">0.8</parameter>
+      </parameters>
+      <parameters name="gamma_5_density_800_params">
+        <parameter type="float" name="Density">0.8</parameter>
+        <parameter type="float" name="Gamma">0.5</parameter>
+      </parameters>
+      <parameters name="gamma_6_density_800_params">
+        <parameter type="float" name="Density">0.8</parameter>
+        <parameter type="float" name="Gamma">0.6</parameter>
+      </parameters>
+      <parameters name="gamma_8_density_900_params">
+        <parameter type="float" name="Density">0.9</parameter>
+        <parameter type="float" name="Gamma">0.8</parameter>
+      </parameters>
+      <parameters name="gamma_2_density_800_params">
+        <parameter type="float" name="Density">0.8</parameter>
+        <parameter type="float" name="Gamma">2.0</parameter>
+      </parameters>
+      <parameters name="gamma_750_params">
+        <parameter type="float" name="Gamma">0.75</parameter>
+      </parameters>
+      <parameters name="PIXMA_iP4000_params">
+        <parameter type="float" name="Gamma">0.60</parameter>
+      </parameters>
+      <parameters name="PIXMA_iP4200_params">
+        <parameter type="float" name="Brightness">1.30</parameter>
+        <parameter type="float" name="Gamma">0.70</parameter>
+        <parameter type="float" name="Density">0.80</parameter>
+      </parameters>
+      <parameters name="PIXMA_iP4300_params">
+        <parameter type="float" name="Brightness">0.7</parameter>
+        <parameter type="float" name="Density">0.6</parameter>
+        <parameter type="float" name="Contrast">1.7</parameter>
+        <parameter type="float" name="Gamma">0.9</parameter>
+        <parameter type="float" name="BlackGamma">0.6</parameter>
+      </parameters>
+      <parameters name="PIXMA_iX5000_params"> 
+        <parameter type="float" name="BlackGamma">2.0</parameter> 
+        <parameter type="float" name="YellowGamma">1.4</parameter> 
+        <parameter type="float" name="MagentaGamma">1.3</parameter> 
+        <parameter type="float" name="CyanGamma">1.3</parameter> 
+      </parameters>
+      <printer translate="name" name="Canon BJ-30" driver="bjc-30" manufacturer="Canon" model="30" parameters="gamma_2_density_800_params" />
+      <printer translate="name" name="Canon BJC-50" driver="bjc-50" manufacturer="Canon" model="4400" parameters="gamma_5_density_800_params" />
+      <printer translate="name" name="Canon BJC-55" driver="bjc-55" manufacturer="Canon" model="4400" parameters="gamma_5_density_800_params" />
+      <printer translate="name" name="Canon BJC-80" driver="bjc-80" manufacturer="Canon" model="4400" parameters="gamma_5_density_800_params" />
+      <printer translate="name" name="Canon BJC-85" driver="bjc-85" manufacturer="Canon" model="85" parameters="gamma_5_density_800_params" />
+      <printer translate="name" name="Canon BJC-210" driver="bjc-210" manufacturer="Canon" model="210" parameters="density_800_params" />
+      <printer translate="name" name="Canon BJC-240" driver="bjc-240" manufacturer="Canon" model="240" parameters="density_800_params" />
+      <printer translate="name" name="Canon BJC-250" driver="bjc-250" manufacturer="Canon" model="250" parameters="density_800_params" />
+      <printer translate="name" name="Canon BJC-1000" driver="bjc-1000" manufacturer="Canon" model="1000" parameters="density_800_params" />
+      <printer translate="name" name="Canon BJC-2000" driver="bjc-2000" manufacturer="Canon" model="2000" parameters="density_800_params" />
+      <printer translate="name" name="Canon BJC-2010" driver="bjc-2010" manufacturer="Canon" model="2000" parameters="density_800_params" />
+      <printer translate="name" name="Canon BJC-2100" driver="bjc-2100" manufacturer="Canon" model="4300" parameters="gamma_750_params" />
+      <printer translate="name" name="Canon BJC-2110" driver="bjc-2110" manufacturer="Canon" model="2000" parameters="density_800_params" />
+      <printer translate="name" name="Canon BJC-3000" driver="bjc-3000" manufacturer="Canon" model="3000" parameters="density_800_params" />
+      <printer translate="name" name="Canon BJC-4000" driver="bjc-4000" manufacturer="Canon" model="4300" parameters="gamma_750_params" />
+      <printer translate="name" name="Canon BJC-4300" driver="bjc-4300" manufacturer="Canon" model="4300" parameters="gamma_750_params" />
+      <printer translate="name" name="Canon BJC-4400" driver="bjc-4400" manufacturer="Canon" model="4400" parameters="density_800_params" />
+      <printer translate="name" name="Canon BJC-5100" driver="bjc-5100" manufacturer="Canon" model="5100" parameters="density_800_params" />
+      <printer translate="name" name="Canon BJC-5500" driver="bjc-5500" manufacturer="Canon" model="5500" parameters="density_800_params" />
+      <printer translate="name" name="Canon BJC-6000" driver="bjc-6000" manufacturer="Canon" model="6000" parameters="gamma_750_params" />
+      <printer translate="name" name="Canon BJC-6100" driver="bjc-6100" manufacturer="Canon" model="6100" parameters="density_800_params" />
+      <printer translate="name" name="Canon BJC-6200" driver="bjc-6200" manufacturer="Canon" model="6200" parameters="gamma_750_params" />
+      <printer translate="name" name="Canon BJC-6500" driver="bjc-6500" manufacturer="Canon" model="6500" parameters="gamma_750_params" />
+      <printer translate="name" name="Canon BJC-7000" driver="bjc-7000" manufacturer="Canon" model="7000" parameters="gamma_6_density_800_params" />
+      <printer translate="name" name="Canon BJC-7100" driver="bjc-7100" manufacturer="Canon" model="7100" parameters="density_800_params" />
+      <printer translate="name" name="Canon BJC-8200" driver="bjc-8200" manufacturer="Canon" model="8200" parameters="density_800_params" />
+      <printer translate="name" name="Canon BJC-8500" driver="bjc-8500" manufacturer="Canon" model="8500" parameters="density_800_params" />
+      <printer translate="name" name="Canon S100" driver="bjc-s100" manufacturer="Canon" model="4300" parameters="gamma_750_params" />
+      <printer translate="name" name="Canon S200" driver="bjc-s200" manufacturer="Canon" model="1000200" parameters="gamma_8_density_900_params" />
+      <printer translate="name" name="Canon S300" driver="bjc-s300" manufacturer="Canon" model="1000300" parameters="density_800_params" />
+      <printer translate="name" name="Canon S400" driver="bjc-s400" manufacturer="Canon" model="3000" parameters="density_800_params" />
+      <printer translate="name" name="Canon S450" driver="bjc-s450" manufacturer="Canon" model="6200" parameters="gamma_750_params" />
+      <printer translate="name" name="Canon S500" driver="bjc-s500" manufacturer="Canon" model="1000500" parameters="density_800_params" />
+      <printer translate="name" name="Canon S600" driver="bjc-s600" manufacturer="Canon" model="8200" parameters="density_800_params" />
+      <printer translate="name" name="Canon S630" driver="bjc-s630" manufacturer="Canon" model="8200" parameters="density_800_params" />
+      <printer translate="name" name="Canon S800" driver="bjc-s800" manufacturer="Canon" model="8200" parameters="density_800_params" />
+      <printer translate="name" name="Canon S4500" driver="bjc-s4500" manufacturer="Canon" model="6500" parameters="gamma_750_params" />
+      <printer translate="name" name="Canon PIXMA iP2000" driver="bjc-PIXMA-iP2000" manufacturer="Canon" model="3002000" parameters="PIXMA_iP4000_params" />
+      <printer translate="name" name="Canon PIXMA iP3000" driver="bjc-PIXMA-iP3000" manufacturer="Canon" model="3003000" parameters="PIXMA_iP4000_params" />
+      <printer translate="name" name="Canon PIXMA iP3100" driver="bjc-PIXMA-iP3100" manufacturer="Canon" model="3003000" parameters="PIXMA_iP4000_params" />
+      <printer translate="name" name="Canon PIXMA iP4000" driver="bjc-iP4000" manufacturer="Canon" model="3004000" parameters="PIXMA_iP4000_params" />
+      <printer translate="name" name="Canon PIXMA iP4100" driver="bjc-PIXMA-iP4100" manufacturer="Canon" model="3004000" parameters="PIXMA_iP4000_params" />
+      <printer translate="name" name="Canon PIXMA iP4200" driver="bjc-PIXMA-iP4200" manufacturer="Canon" model="3004200" parameters="PIXMA_iP4200_params" />
+      <printer translate="name" name="Canon PIXMA iP4300" driver="bjc-PIXMA-iP4300" manufacturer="Canon" model="3004200" parameters="PIXMA_iP4300_params" />
+      <printer translate="name" name="Canon PIXMA iP4500" driver="bjc-PIXMA-iP4500" manufacturer="Canon" model="3004500" parameters="PIXMA_iP4300_params" />
+      <printer translate="name" name="Canon PIXMA iP5000" driver="bjc-PIXMA-iP5000" manufacturer="Canon" model="3004000" parameters="PIXMA_iP4000_params" />
+      <printer translate="name" name="Canon PIXMA iP5200" driver="bjc-PIXMA-iP5200" manufacturer="Canon" model="3004200" parameters="PIXMA_iP4000_params" />
+      <printer translate="name" name="Canon PIXMA iP5300" driver="bjc-PIXMA-iP5300" manufacturer="Canon" model="3005300" parameters="PIXMA_iP4000_params" />
+      <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 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" />
+      <printer translate="name" name="Canon PIXMA MP160" driver="bjc-MULTIPASS-MP160" manufacturer="Canon" model="5000150" parameters="PIXMA_iP4000_params" />
+      <printer translate="name" name="Canon PIXMA MP170" driver="bjc-MULTIPASS-MP170" manufacturer="Canon" model="5000150" parameters="PIXMA_iP4000_params" />
+      <printer translate="name" name="Canon PIXMA MP180" driver="bjc-MULTIPASS-MP180" manufacturer="Canon" model="5000150" parameters="PIXMA_iP4000_params" />
+      <printer translate="name" name="Canon PIXMA MP500" driver="bjc-MULTIPASS-MP500" manufacturer="Canon" model="3004200" parameters="PIXMA_iP4000_params" />
+      <printer translate="name" name="Canon PIXMA MP520" driver="bjc-MULTIPASS-MP520" manufacturer="Canon" model="5000520" parameters="PIXMA_iP4000_params" />
+      <printer translate="name" name="Canon PIXMA MP610" driver="bjc-MULTIPASS-MP610" manufacturer="Canon" model="3005300" parameters="PIXMA_iP4000_params" />
+      <printer translate="name" name="Canon PIXMA MP700" driver="bjc-MULTIPASS-MP700" manufacturer="Canon" model="3003000" parameters="PIXMA_iP4000_params" />
+      <printer translate="name" name="Canon PIXMA MP710" driver="bjc-MULTIPASS-MP710" manufacturer="Canon" model="3003000" parameters="PIXMA_iP4000_params" />
+      <printer translate="name" name="Canon PIXMA MP730" driver="bjc-MULTIPASS-MP730" manufacturer="Canon" model="3003000" parameters="PIXMA_iP4000_params" />
+      <printer translate="name" name="Canon PIXMA MP740" driver="bjc-MULTIPASS-MP740" manufacturer="Canon" model="5000740" parameters="PIXMA_iP4000_params" />
+      <printer translate="name" name="Canon PIXMA MP750" driver="bjc-MULTIPASS-MP750" manufacturer="Canon" model="3004000" parameters="PIXMA_iP4000_params" />
+      <printer translate="name" name="Canon PIXMA MP760" driver="bjc-MULTIPASS-MP760" manufacturer="Canon" model="3004000" parameters="PIXMA_iP4000_params" />
+      <printer translate="name" name="Canon PIXMA MP770" driver="bjc-MULTIPASS-MP770" manufacturer="Canon" model="3004000" parameters="PIXMA_iP4000_params" />
+      <printer translate="name" name="Canon PIXMA MP780" driver="bjc-MULTIPASS-MP780" manufacturer="Canon" model="3004000" parameters="PIXMA_iP4000_params" />
+      <printer translate="name" name="Canon PIXMA MP790" driver="bjc-MULTIPASS-MP790" manufacturer="Canon" model="3004000" parameters="PIXMA_iP4000_params" />
+      <printer translate="name" name="Canon PIXMA MP830" driver="bjc-MULTIPASS-MP830" manufacturer="Canon" model="5000830" parameters="PIXMA_iP4000_params" />
+      <printer translate="name" name="Canon PIXUS iP3100" driver="bjc-PIXUS-iP3100" manufacturer="Canon" model="3003000" parameters="PIXMA_iP4000_params" />
+      <printer translate="name" name="Canon PIXUS iP4100" driver="bjc-PIXUS-iP4100" manufacturer="Canon" model="3004000" parameters="PIXMA_iP4000_params" />
+      <printer translate="name" name="Canon i80" driver="bjc-i80"   manufacturer="Canon" model="2000080" parameters="density_800_params" />
+      <printer translate="name" name="Canon i560" driver="bjc-i560" manufacturer="Canon" model="2000560" parameters="gamma_6_density_800_params" />
+      <printer translate="name" name="Canon i850" driver="bjc-i850" manufacturer="Canon" model="3003000" parameters="PIXMA_iP4000_params" />
+      <printer translate="name" name="Canon i860" driver="bjc-i860" manufacturer="Canon" model="3004000" parameters="PIXMA_iP4000_params" />
+      <printer translate="name" name="Canon i865" driver="bjc-i865" manufacturer="Canon" model="3004000" parameters="PIXMA_iP4000_params" />
+    </family>
+    <family name="escp2">
+      <parameters name="standard_params">
+        <parameter type="float" name="Gamma">0.470</parameter>
+      </parameters>
+      <parameters name="480_params">
+        <parameter type="float" name="MagentaGamma">0.95</parameter>
+        <parameter type="float" name="YellowGamma">0.9</parameter>
+        <parameter type="float" name="Gamma">0.470</parameter>
+      </parameters>
+      <parameters name="pro_5500_params">
+        <parameter type="float" name="CyanGamma">0.8</parameter>
+        <parameter type="float" name="Gamma">0.470</parameter>
+      </parameters>
+      <parameters name="cx3500_params">
+        <parameter type="float" name="CyanGamma">0.96</parameter>
+        <parameter type="float" name="MagentaGamma">1.02</parameter>
+        <parameter type="float" name="YellowGamma">1.02</parameter>
+        <parameter type="float" name="Gamma">0.500</parameter>
+      </parameters>
+      <parameters name="claria_params">
+        <parameter type="float" name="Gamma">0.470</parameter>
+        <parameter type="float" name="BlackDensity">0.8</parameter>
+      </parameters>
+      <printer translate="name" name="Epson Artisan 700" driver="escp2-artisan700" manufacturer="Epson" model="81" parameters="claria_params" />
+      <printer translate="name" name="Epson Artisan 800" driver="escp2-artisan800" manufacturer="Epson" model="81" parameters="claria_params" />
+      <printer translate="name" name="Epson B-300" driver="escp2-b300" manufacturer="Epson" model="87" parameters="standard_params" />
+      <printer translate="name" name="Epson B-308" driver="escp2-b308" manufacturer="Epson" model="87" parameters="standard_params" />
+      <printer translate="name" name="Epson B-500DN" driver="escp2-b500dn" manufacturer="Epson" model="87" parameters="standard_params" />
+      <printer translate="name" name="Epson B-508DN" driver="escp2-b508dn" manufacturer="Epson" model="87" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus C20" driver="escp2-c20" manufacturer="Epson" model="42" parameters="480_params" />
+      <printer translate="name" name="Epson Stylus C20SX" driver="escp2-c20sx" manufacturer="Epson" model="42" parameters="480_params" />
+      <printer translate="name" name="Epson Stylus C20UX" driver="escp2-c20ux" manufacturer="Epson" model="42" parameters="480_params" />
+      <printer translate="name" name="Epson Stylus C40" driver="escp2-c40" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer translate="name" name="Epson Stylus C40SX" driver="escp2-c40sx" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer translate="name" name="Epson Stylus C40UX" driver="escp2-c40ux" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer translate="name" name="Epson Stylus C41" driver="escp2-c41" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer translate="name" name="Epson Stylus C41SX" driver="escp2-c41sx" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer translate="name" name="Epson Stylus C41UX" driver="escp2-c41ux" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer translate="name" name="Epson Stylus C42" driver="escp2-c42" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer translate="name" name="Epson Stylus C42SX" driver="escp2-c42sx" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer translate="name" name="Epson Stylus C42UX" driver="escp2-c42ux" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer translate="name" name="Epson Stylus C43" driver="escp2-c43" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer translate="name" name="Epson Stylus C43SX" driver="escp2-c43sx" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer translate="name" name="Epson Stylus C43UX" driver="escp2-c43ux" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer translate="name" name="Epson Stylus C44" driver="escp2-c44" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer translate="name" name="Epson Stylus C44SX" driver="escp2-c44sx" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer translate="name" name="Epson Stylus C44UX" driver="escp2-c44ux" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer translate="name" name="Epson Stylus C45" driver="escp2-c45" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer translate="name" name="Epson Stylus C46" driver="escp2-c46" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer translate="name" name="Epson Stylus C48" driver="escp2-c48" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer translate="name" name="Epson Stylus C50" driver="escp2-c50" manufacturer="Epson" model="56" parameters="480_params" />
+      <printer translate="name" name="Epson Stylus C60" driver="escp2-c60" manufacturer="Epson" model="33" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus C61" driver="escp2-c61" manufacturer="Epson" model="52" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus C62" driver="escp2-c62" manufacturer="Epson" model="52" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus C63" driver="escp2-c63" manufacturer="Epson" model="61" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus C64" driver="escp2-c64" manufacturer="Epson" model="61" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus C65" driver="escp2-c65" manufacturer="Epson" model="66" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus C66" driver="escp2-c66" manufacturer="Epson" model="66" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus C68" driver="escp2-c68" manufacturer="Epson" model="66" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus C70" driver="escp2-c70" manufacturer="Epson" model="44" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus C79" driver="escp2-c79" manufacturer="Epson" model="66" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus C80" driver="escp2-c80" manufacturer="Epson" model="44" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus C82" driver="escp2-c82" manufacturer="Epson" model="55" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus C83" driver="escp2-c83" manufacturer="Epson" model="60" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus C84" driver="escp2-c84" manufacturer="Epson" model="60" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus C85" driver="escp2-c85" manufacturer="Epson" model="69" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus C86" driver="escp2-c86" manufacturer="Epson" model="69" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus C87" driver="escp2-c87" manufacturer="Epson" model="69" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus C88" driver="escp2-c88" manufacturer="Epson" model="69" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus C110" driver="escp2-c110" manufacturer="Epson" model="85" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus C120" driver="escp2-c120" manufacturer="Epson" model="85" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Color" driver="escp2" manufacturer="Epson" model="0" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Color I" driver="escp2-i" manufacturer="Epson" model="0" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Color II" driver="escp2-ii" manufacturer="Epson" model="0" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Color IIs" driver="escp2-iis" manufacturer="Epson" model="0" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Color PRO" driver="escp2-pro" manufacturer="Epson" model="45" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Pro XL" driver="escp2-pro-xl" manufacturer="Epson" model="39" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Color 400" driver="escp2-400" manufacturer="Epson" model="1" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Color 440" driver="escp2-440" manufacturer="Epson" model="10" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Color 460" driver="escp2-460" manufacturer="Epson" model="10" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Color 480" driver="escp2-480" manufacturer="Epson" model="21" parameters="480_params" />
+      <printer translate="name" name="Epson Stylus Color 500" driver="escp2-500" manufacturer="Epson" model="1" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Color 580" driver="escp2-580" manufacturer="Epson" model="38" parameters="480_params" />
+      <printer translate="name" name="Epson Stylus Color 600" driver="escp2-600" manufacturer="Epson" model="3" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Color 640" driver="escp2-640" manufacturer="Epson" model="11" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Color 660" driver="escp2-660" manufacturer="Epson" model="18" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Color 670" driver="escp2-670" manufacturer="Epson" model="25" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Color 680" driver="escp2-680" manufacturer="Epson" model="32" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Color 740" driver="escp2-740" manufacturer="Epson" model="12" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Color 760" driver="escp2-760" manufacturer="Epson" model="19" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Color 777" driver="escp2-777" manufacturer="Epson" model="32" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Color 800" driver="escp2-800" manufacturer="Epson" model="4" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Color 850" driver="escp2-850" manufacturer="Epson" model="5" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Color 860" driver="escp2-860" manufacturer="Epson" model="16" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Color 880" driver="escp2-880" manufacturer="Epson" model="33" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Color 8 3" driver="escp2-83" manufacturer="Epson" model="33" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Color 900" driver="escp2-900" manufacturer="Epson" model="13" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Color 980" driver="escp2-980" manufacturer="Epson" model="34" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Color 1160" driver="escp2-1160" manufacturer="Epson" model="17" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Color 1500" driver="escp2-1500" manufacturer="Epson" model="2" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Color 1520" driver="escp2-1520" manufacturer="Epson" model="6" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Color 3000" driver="escp2-3000" manufacturer="Epson" model="24" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Office B30" driver="escp2-of-b30" manufacturer="Epson" model="85" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Office B33" driver="escp2-of-b33" manufacturer="Epson" model="85" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Office B40W" driver="escp2-of-b40w" manufacturer="Epson" model="92" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Office T30" driver="escp2-of-t30" manufacturer="Epson" model="85" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Office T33" driver="escp2-of-t33" manufacturer="Epson" model="85" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Office T40W" driver="escp2-of-t40w" manufacturer="Epson" model="92" parameters="standard_params" />
+      <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 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" />
+      <printer translate="name" name="Epson Stylus Photo EX" driver="escp2-ex" manufacturer="Epson" model="8" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo EX3" driver="escp2-ex3" manufacturer="Epson" model="54" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo 720" driver="escp2-720" manufacturer="Epson" model="20" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo 750" driver="escp2-750" manufacturer="Epson" model="14" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo 780" driver="escp2-780" manufacturer="Epson" model="35" parameters="standard_params" />
+    <!--
+         Note that the 785EPX has a roll feed holder.  It's more like the 890
+         than the 780, despite the name.
+    -->
+      <printer translate="name" name="Epson Stylus Photo 785" driver="escp2-785" manufacturer="Epson" model="36" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo 790" driver="escp2-790" manufacturer="Epson" model="35" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo 810" driver="escp2-810" manufacturer="Epson" model="78" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo 820" driver="escp2-820" manufacturer="Epson" model="78" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo 825" driver="escp2-825" manufacturer="Epson" model="50" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo 830" driver="escp2-830" manufacturer="Epson" model="50" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo 830U" driver="escp2-830u" manufacturer="Epson" model="50" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo 870" driver="escp2-870" manufacturer="Epson" model="22" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo 875" driver="escp2-875" manufacturer="Epson" model="22" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo 890" driver="escp2-890" manufacturer="Epson" model="36" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo 895" driver="escp2-895" manufacturer="Epson" model="36" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo 900" driver="escp2-ph900" manufacturer="Epson" model="62" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo 915" driver="escp2-915" manufacturer="Epson" model="36" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo 925" driver="escp2-925" manufacturer="Epson" model="51" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo 935" driver="escp2-935" manufacturer="Epson" model="36" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo 950" driver="escp2-950" manufacturer="Epson" model="46" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo 960" driver="escp2-960" manufacturer="Epson" model="46" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo 1200" driver="escp2-1200" manufacturer="Epson" model="15" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo 1270" driver="escp2-1270" manufacturer="Epson" model="23" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo 1280" driver="escp2-1280" manufacturer="Epson" model="37" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo 1290" driver="escp2-1290" manufacturer="Epson" model="37" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo 1400" driver="escp2-1400" manufacturer="Epson" model="82" parameters="claria_params" />
+      <printer translate="name" name="Epson Stylus Photo 1410" driver="escp2-1410" manufacturer="Epson" model="82" parameters="claria_params" />
+      <printer translate="name" name="Epson Stylus Photo 2000P" driver="escp2-2000" manufacturer="Epson" model="26" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo 2100" driver="escp2-2100" manufacturer="Epson" model="47" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo 2200" driver="escp2-2200" manufacturer="Epson" model="47" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo R200" driver="escp2-r200" manufacturer="Epson" model="63" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo R210" driver="escp2-r210" manufacturer="Epson" model="63" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo R220" driver="escp2-r220" manufacturer="Epson" model="84" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo R230" driver="escp2-r230" manufacturer="Epson" model="84" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo R240" driver="escp2-r240" manufacturer="Epson" model="83" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo R245" driver="escp2-r245" manufacturer="Epson" model="83" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo R260" driver="escp2-r260" manufacturer="Epson" model="81" parameters="claria_params" />
+      <printer translate="name" name="Epson Stylus Photo R265" driver="escp2-r265" manufacturer="Epson" model="81" parameters="claria_params" />
+      <printer translate="name" name="Epson Stylus Photo R270" driver="escp2-r270" manufacturer="Epson" model="81" parameters="claria_params" />
+      <printer translate="name" name="Epson Stylus Photo R280" driver="escp2-r280" manufacturer="Epson" model="81" parameters="claria_params" />
+      <printer translate="name" name="Epson Stylus Photo R285" driver="escp2-r285" manufacturer="Epson" model="81" parameters="claria_params" />
+      <printer translate="name" name="Epson Stylus Photo R290" driver="escp2-r290" manufacturer="Epson" model="81" parameters="claria_params" />
+      <printer translate="name" name="Epson Stylus Photo R300" driver="escp2-r300" manufacturer="Epson" model="63" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo R310" driver="escp2-r310" manufacturer="Epson" model="63" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo R320" driver="escp2-r320" manufacturer="Epson" model="63" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo R340" driver="escp2-r340" manufacturer="Epson" model="84" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo R350" driver="escp2-r350" manufacturer="Epson" model="84" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo R360" driver="escp2-r360" manufacturer="Epson" model="81" parameters="claria_params" />
+      <printer translate="name" name="Epson Stylus Photo R380" driver="escp2-r380" manufacturer="Epson" model="81" parameters="claria_params" />
+      <printer translate="name" name="Epson Stylus Photo R390" driver="escp2-r390" manufacturer="Epson" model="81" parameters="claria_params" />
+      <printer translate="name" name="Epson Stylus Photo R800" driver="escp2-r800" manufacturer="Epson" model="64" parameters="standard_params" />
+      <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 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" />
+      <printer translate="name" name="Epson Stylus Photo RX430" driver="escp2-rx430" manufacturer="Epson" model="84" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo RX500" driver="escp2-rx500" manufacturer="Epson" model="84" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo RX510" driver="escp2-rx510" manufacturer="Epson" model="84" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo RX560" driver="escp2-rx560" manufacturer="Epson" model="81" parameters="claria_params" />
+      <printer translate="name" name="Epson Stylus Photo RX580" driver="escp2-rx580" manufacturer="Epson" model="81" parameters="claria_params" />
+      <printer translate="name" name="Epson Stylus Photo RX585" driver="escp2-rx585" manufacturer="Epson" model="81" parameters="claria_params" />
+      <printer translate="name" name="Epson Stylus Photo RX590" driver="escp2-rx590" manufacturer="Epson" model="81" parameters="claria_params" />
+      <printer translate="name" name="Epson Stylus Photo RX595" driver="escp2-rx595" manufacturer="Epson" model="81" parameters="claria_params" />
+      <printer translate="name" name="Epson Stylus Photo RX600" driver="escp2-rx600" manufacturer="Epson" model="84" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo RX610" driver="escp2-rx610" manufacturer="Epson" model="81" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo RX620" driver="escp2-rx620" manufacturer="Epson" model="84" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo RX630" driver="escp2-rx630" manufacturer="Epson" model="84" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo RX640" driver="escp2-rx640" manufacturer="Epson" model="81" parameters="claria_params" />
+      <printer translate="name" name="Epson Stylus Photo RX680" driver="escp2-rx680" manufacturer="Epson" model="81" parameters="claria_params" />
+      <printer translate="name" name="Epson Stylus Photo RX685" driver="escp2-rx685" manufacturer="Epson" model="81" parameters="claria_params" />
+      <printer translate="name" name="Epson Stylus Photo RX690" driver="escp2-rx690" manufacturer="Epson" model="81" 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="81" parameters="claria_params" />
+      <printer translate="name" name="Epson Stylus Photo TX800W" driver="escp2-tx800w" manufacturer="Epson" model="81" 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" />
+      <printer translate="name" name="Epson Stylus Pro 7500" driver="escp2-7500" manufacturer="Epson" model="29" parameters="pro_5500_params" />
+      <printer translate="name" name="Epson Stylus Pro 7600" driver="escp2-7600" manufacturer="Epson" model="48" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Pro 7800" driver="escp2-7800" manufacturer="Epson" model="48" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Pro 7880" driver="escp2-7880" manufacturer="Epson" model="89" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Pro 9000" driver="escp2-9000" manufacturer="Epson" model="30" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Pro 9500" driver="escp2-9500" manufacturer="Epson" model="31" parameters="pro_5500_params" />
+      <printer translate="name" name="Epson Stylus Pro 9600" driver="escp2-9600" manufacturer="Epson" model="49" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Pro 9800" driver="escp2-9800" manufacturer="Epson" model="49" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Pro 9880" driver="escp2-9880" manufacturer="Epson" model="90" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Pro 10000" driver="escp2-10000" manufacturer="Epson" model="41" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Pro 11880" driver="escp2-11880" manufacturer="Epson" model="88" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Scan 2000" driver="escp2-scan2000" manufacturer="Epson" model="12" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Scan 2500" driver="escp2-scan2500" manufacturer="Epson" model="12" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus CX1500" driver="escp2-cx1500" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer translate="name" name="Epson Stylus CX3100" driver="escp2-cx3100" manufacturer="Epson" model="52" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus CX3200" driver="escp2-cx3200" manufacturer="Epson" model="52" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus CX3500" driver="escp2-cx3500" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX3600" driver="escp2-cx3600" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX3650" driver="escp2-cx3650" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX3700" driver="escp2-cx3700" manufacturer="Epson" model="72" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus CX3800" driver="escp2-cx3800" manufacturer="Epson" model="72" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus CX3805" driver="escp2-cx3805" manufacturer="Epson" model="72" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus CX3810" driver="escp2-cx3810" manufacturer="Epson" model="72" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus CX4100" driver="escp2-cx4100" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX4200" driver="escp2-cx4200" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX4400" driver="escp2-cx4400" manufacturer="Epson" model="72" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus CX4500" driver="escp2-cx4500" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX4600" driver="escp2-cx4600" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX4700" driver="escp2-cx4700" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX4800" driver="escp2-cx4800" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX4900" driver="escp2-cx4900" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX5000" driver="escp2-cx5000" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX5000F" driver="escp2-cx5000f" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX5100" driver="escp2-cx5100" manufacturer="Epson" model="55" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX5200" driver="escp2-cx5200" manufacturer="Epson" model="55" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX5300" driver="escp2-cx5300" manufacturer="Epson" model="55" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX5400" driver="escp2-cx5400" manufacturer="Epson" model="55" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX5500" driver="escp2-cx5500" manufacturer="Epson" model="72" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus CX5600" driver="escp2-cx5600" manufacturer="Epson" model="72" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus CX5700" driver="escp2-cx5700" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX5800" driver="escp2-cx5800" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX6000" driver="escp2-cx6000" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX6300" driver="escp2-cx6300" manufacturer="Epson" model="79" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX6400" driver="escp2-cx6400" manufacturer="Epson" model="79" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX6500" driver="escp2-cx6500" manufacturer="Epson" model="80" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX6600" driver="escp2-cx6600" manufacturer="Epson" model="80" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX7000F" driver="escp2-cx7000f" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX7400" driver="escp2-cx7400" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX7700" driver="escp2-cx7700" manufacturer="Epson" model="80" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX7800" driver="escp2-cx7800" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX8300" driver="escp2-cx8300" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX8400" driver="escp2-cx8400" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX9300F" driver="escp2-cx9300f" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX9400" driver="escp2-cx9400" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX9400F" driver="escp2-cx9400f" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX9475F" driver="escp2-cx9475f" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus D68" driver="escp2-d68" manufacturer="Epson" model="66" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus D88" driver="escp2-d88" manufacturer="Epson" model="69" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus D92" driver="escp2-d92" manufacturer="Epson" model="66" parameters="standard_params" />
+      <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 DX4050" driver="escp2-dx4050" manufacturer="Epson" model="72" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus DX4200" driver="escp2-dx4200" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus DX4250" driver="escp2-dx4250" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus DX4400" driver="escp2-dx4400" manufacturer="Epson" model="72" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus DX4450" driver="escp2-dx4450" manufacturer="Epson" model="72" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus DX4800" driver="escp2-dx4800" manufacturer="Epson" model="65" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus DX7000F" driver="escp2-dx7000f" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus DX7400" driver="escp2-dx7400" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus DX7450" driver="escp2-dx7450" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus DX8400" driver="escp2-dx8400" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus DX8450" driver="escp2-dx8450" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus DX9400F" driver="escp2-dx9400f" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus NX100" driver="escp2-nx100" manufacturer="Epson" model="94" parameters="standard_params" />
+      <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="81" parameters="claria_params" />
+      <printer translate="name" name="Epson Stylus PX800FW" driver="escp2-px800fw" manufacturer="Epson" model="81" parameters="claria_params" />
+      <printer translate="name" name="Epson Stylus S20" driver="escp2-s20" manufacturer="Epson" model="94" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus SX100" driver="escp2-sx100" manufacturer="Epson" model="94" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus SX105" driver="escp2-sx105" manufacturer="Epson" model="94" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus SX200" driver="escp2-sx200" manufacturer="Epson" model="93" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus SX205" driver="escp2-sx205" manufacturer="Epson" model="93" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus SX400" driver="escp2-sx400" manufacturer="Epson" model="93" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus SX405" driver="escp2-sx405" manufacturer="Epson" model="93" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus T20" driver="escp2-t20" manufacturer="Epson" model="94" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus TX100" driver="escp2-tx100" manufacturer="Epson" model="94" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus TX200" driver="escp2-tx200" manufacturer="Epson" model="93" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus TX400" driver="escp2-tx400" manufacturer="Epson" model="93" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus PX800FW" driver="escp2-px800fw" manufacturer="Epson" model="81" parameters="claria_params" />
+      <printer translate="name" name="Epson PictureMate" driver="escp2-picmate" manufacturer="Epson" model="73" parameters="standard_params" />
+      <printer translate="name" name="Epson PictureMate Dash" driver="escp2-picmatedash" manufacturer="Epson" model="86" parameters="standard_params" />
+      <printer translate="name" name="Epson PictureMate Deluxe" driver="escp2-picmated" manufacturer="Epson" model="73" parameters="standard_params" />
+      <printer translate="name" name="Epson PictureMate Flash" driver="escp2-picmateflash" manufacturer="Epson" model="86" parameters="standard_params" />
+      <printer translate="name" name="Epson PictureMate Pal" driver="escp2-picmatepal" manufacturer="Epson" model="86" parameters="standard_params" />
+      <printer translate="name" name="Epson PictureMate Snap" driver="escp2-picmatesnap" manufacturer="Epson" model="86" parameters="standard_params" />
+      <printer translate="name" name="Epson PictureMate 100" driver="escp2-picmate100" manufacturer="Epson" model="86" parameters="standard_params" />
+      <printer translate="name" name="Epson PictureMate 200" driver="escp2-picmate200" manufacturer="Epson" model="73" parameters="standard_params" />
+      <printer translate="name" name="Epson PictureMate 210" driver="escp2-picmate210" manufacturer="Epson" model="86" parameters="standard_params" />
+      <printer translate="name" name="Epson PictureMate 215" driver="escp2-picmate215" manufacturer="Epson" model="86" parameters="standard_params" />
+      <printer translate="name" name="Epson PictureMate 240" driver="escp2-picmate240" manufacturer="Epson" model="86" parameters="standard_params" />
+      <printer translate="name" name="Epson PictureMate 250" driver="escp2-picmate250" manufacturer="Epson" model="86" parameters="standard_params" />
+      <printer translate="name" name="Epson PictureMate 260" driver="escp2-picmate260" manufacturer="Epson" model="86" parameters="standard_params" />
+      <printer translate="name" name="Epson PictureMate 270" driver="escp2-picmate270" manufacturer="Epson" model="86" parameters="standard_params" />
+      <printer translate="name" name="Epson PictureMate 280" driver="escp2-picmate280" manufacturer="Epson" model="86" parameters="standard_params" />
+      <printer translate="name" name="Epson PictureMate 290" driver="escp2-picmate290" manufacturer="Epson" model="86" parameters="standard_params" />
+      <printer translate="name" name="Epson PictureMate 500" driver="escp2-picmate500" manufacturer="Epson" model="73" parameters="standard_params" />
+      <printer translate="name" name="Epson PictureMate 2005" driver="escp2-picmate2005" manufacturer="Epson" model="73" parameters="standard_params" />
+      <printer translate="name" name="Epson WorkForce 30" driver="escp2-wf30" manufacturer="Epson" model="85" parameters="standard_params" />
+      <printer translate="name" name="Epson WorkForce 40" driver="escp2-wf40" manufacturer="Epson" model="92" parameters="standard_params" />
+      <printer translate="name" name="Epson WorkForce 500" driver="escp2-wf500" manufacturer="Epson" model="93" parameters="standard_params" />
+      <printer translate="name" name="Epson WorkForce 600" driver="escp2-wf600" manufacturer="Epson" model="92" parameters="standard_params" />
+      <printer translate="name" name="Epson CL 700" driver="escp2-cl700" manufacturer="Epson" model="38" parameters="480_params" />
+      <printer translate="name" name="Epson CL 750" driver="escp2-cl750" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer translate="name" name="Epson CL 760" driver="escp2-cl760" manufacturer="Epson" model="56" parameters="480_params" />
+      <printer translate="name" name="Epson E 100" driver="escp2-e100" manufacturer="Epson" model="73" parameters="standard_params" />
+      <printer translate="name" name="Epson E 150" driver="escp2-e150" manufacturer="Epson" model="86" parameters="standard_params" />
+      <printer translate="name" name="Epson E 200" driver="escp2-e200" manufacturer="Epson" model="73" parameters="standard_params" />
+      <printer translate="name" name="Epson E 300" driver="escp2-e300" manufacturer="Epson" model="86" parameters="standard_params" />
+      <printer translate="name" name="Epson E 500" driver="escp2-e500" manufacturer="Epson" model="86" parameters="standard_params" />
+      <printer translate="name" name="Epson E 520" driver="escp2-e520" manufacturer="Epson" model="86" parameters="standard_params" />
+      <printer translate="name" name="Epson E 700" driver="escp2-e700" manufacturer="Epson" model="86" parameters="standard_params" />
+      <printer translate="name" name="Epson E 720" driver="escp2-e720" manufacturer="Epson" model="86" parameters="standard_params" />
+      <printer translate="name" name="Epson EM 900C" driver="escp2-em900c" manufacturer="Epson" model="13" parameters="standard_params" />
+      <printer translate="name" name="Epson EM 930C" driver="escp2-em930c" manufacturer="Epson" model="34" parameters="standard_params" />
+      <printer translate="name" name="Epson MC 2000" driver="escp2-mc2000" manufacturer="Epson" model="26" parameters="standard_params" />
+      <printer translate="name" name="Epson MC 5000" driver="escp2-mc5000" manufacturer="Epson" model="40" parameters="pro_5500_params" />
+      <printer translate="name" name="Epson MC 7000" driver="escp2-mc7000" manufacturer="Epson" model="29" parameters="pro_5500_params" />
+      <printer translate="name" name="Epson MC 9000" driver="escp2-mc9000" manufacturer="Epson" model="31" parameters="pro_5500_params" />
+      <printer translate="name" name="Epson MC 10000" driver="escp2-mc10000" manufacturer="Epson" model="41" parameters="standard_params" />
+      <printer translate="name" name="Epson ME Office 70" driver="escp2-meof70" manufacturer="Epson" model="85" parameters="standard_params" />
+      <printer translate="name" name="Epson ME Office 80W" driver="escp2-meof80w" manufacturer="Epson" model="92" parameters="standard_params" />
+      <printer translate="name" name="Epson ME Office 700FW" driver="escp2-meof700fw" manufacturer="Epson" model="92" parameters="standard_params" />
+      <printer translate="name" name="Epson MJ 930C" driver="escp2-mj930c" manufacturer="Epson" model="4" parameters="standard_params" />
+      <printer translate="name" name="Epson MJ 5100C" driver="escp2-mj5100c" manufacturer="Epson" model="39" parameters="standard_params" />
+      <printer translate="name" name="Epson MJ 6000C" driver="escp2-mj6000c" manufacturer="Epson" model="6" parameters="standard_params" />
+      <printer translate="name" name="Epson MJ 8000C" driver="escp2-mj8000c" manufacturer="Epson" model="24" parameters="standard_params" />
+      <printer translate="name" name="Epson PM 670C" driver="escp2-pm670c" manufacturer="Epson" model="7" parameters="standard_params" />
+      <printer translate="name" name="Epson PM 700C" driver="escp2-pm700c" manufacturer="Epson" model="9" parameters="standard_params" />
+      <printer translate="name" name="Epson PM 730C" driver="escp2-pm730c" manufacturer="Epson" model="35" parameters="standard_params" />
+      <printer translate="name" name="Epson PM 740C" driver="escp2-pm740c" manufacturer="Epson" model="35" parameters="standard_params" />
+      <printer translate="name" name="Epson PM 750C" driver="escp2-pm750c" manufacturer="Epson" model="7" parameters="standard_params" />
+      <printer translate="name" name="Epson PM 760C" driver="escp2-pm760c" manufacturer="Epson" model="20" parameters="standard_params" />
+      <printer translate="name" name="Epson PM 770C" driver="escp2-pm770c" manufacturer="Epson" model="14" parameters="standard_params" />
+      <printer translate="name" name="Epson PM 780C" driver="escp2-pm780c" manufacturer="Epson" model="35" parameters="standard_params" />
+      <printer translate="name" name="Epson PM 790PT" driver="escp2-pm790pt" manufacturer="Epson" model="36" parameters="standard_params" />
+      <printer translate="name" name="Epson PM 800C" driver="escp2-pm800c" manufacturer="Epson" model="22" parameters="standard_params" />
+      <printer translate="name" name="Epson PM 850PT" driver="escp2-pm850pt" manufacturer="Epson" model="51" parameters="standard_params" />
+      <printer translate="name" name="Epson PM 870C" driver="escp2-pm870c" manufacturer="Epson" model="36" parameters="standard_params" />
+      <printer translate="name" name="Epson PM 880C" driver="escp2-pm880c" manufacturer="Epson" model="36" parameters="standard_params" />
+      <printer translate="name" name="Epson PM 930C" driver="escp2-pm930c" manufacturer="Epson" model="58" parameters="standard_params" />
+      <printer translate="name" name="Epson PM 940C" driver="escp2-pm940c" manufacturer="Epson" model="58" parameters="standard_params" />
+      <printer translate="name" name="Epson PM 950C" driver="escp2-pm950c" manufacturer="Epson" model="53" parameters="standard_params" />
+      <printer translate="name" name="Epson PM 970C" driver="escp2-pm970c" manufacturer="Epson" model="57" parameters="standard_params" />
+      <printer translate="name" name="Epson PM 980C" driver="escp2-pm980c" manufacturer="Epson" model="57" parameters="standard_params" />
+      <printer translate="name" name="Epson PM 2000C" driver="escp2-pm2000c" manufacturer="Epson" model="8" parameters="standard_params" />
+      <printer translate="name" name="Epson PM 2200C" driver="escp2-pm2200c" manufacturer="Epson" model="54" parameters="standard_params" />
+      <printer translate="name" name="Epson PM 3000C" driver="escp2-pm3000c" manufacturer="Epson" model="15" parameters="standard_params" />
+      <printer translate="name" name="Epson PM 3300C" driver="escp2-pm3300c" manufacturer="Epson" model="23" parameters="standard_params" />
+      <printer translate="name" name="Epson PM 3500C" driver="escp2-pm3500c" manufacturer="Epson" model="37" parameters="standard_params" />
+      <printer translate="name" name="Epson PM 3700C" driver="escp2-pm3700c" manufacturer="Epson" model="37" parameters="standard_params" />
+      <printer translate="name" name="Epson PM 4000PX" driver="escp2-pm4000px" manufacturer="Epson" model="47" parameters="standard_params" />
+      <printer translate="name" name="Epson PM 5000C" driver="escp2-pm5000c" manufacturer="Epson" model="27" parameters="standard_params" />
+      <printer translate="name" name="Epson PM 7000C" driver="escp2-pm7000c" manufacturer="Epson" model="28" parameters="standard_params" />
+      <printer translate="name" name="Epson PM 9000C" driver="escp2-pm9000c" manufacturer="Epson" model="30" parameters="standard_params" />
+      <printer translate="name" name="Epson PM 10000" driver="escp2-pm10000" manufacturer="Epson" model="41" parameters="standard_params" />
+      <printer translate="name" name="Epson PM A650" driver="escp2-pma650" manufacturer="Epson" model="74" parameters="standard_params" />
+      <printer translate="name" name="Epson PM A750" driver="escp2-pma750" manufacturer="Epson" model="75" parameters="standard_params" />
+      <printer translate="name" name="Epson PM A820" driver="escp2-pma820" manufacturer="Epson" model="81" parameters="claria_params" />
+      <printer translate="name" name="Epson PM A890" driver="escp2-pma890" manufacturer="Epson" model="76" parameters="standard_params" />
+      <printer translate="name" name="Epson PM A900" driver="escp2-pma900" manufacturer="Epson" model="70" parameters="standard_params" />
+      <printer translate="name" name="Epson PM A950" driver="escp2-pma950" manufacturer="Epson" model="70" parameters="standard_params" />
+      <printer translate="name" name="Epson PM D600" driver="escp2-pmd600" manufacturer="Epson" model="77" parameters="standard_params" />
+      <printer translate="name" name="Epson PM D750" driver="escp2-pmd750" manufacturer="Epson" model="63" parameters="standard_params" />
+      <printer translate="name" name="Epson PM D770" driver="escp2-pmd770" manufacturer="Epson" model="84" parameters="standard_params" />
+      <printer translate="name" name="Epson PM D800" driver="escp2-pmd800" manufacturer="Epson" model="84" parameters="standard_params" />
+      <printer translate="name" name="Epson PM D870" driver="escp2-pmd870" manufacturer="Epson" model="81" parameters="claria_params" />
+      <printer translate="name" name="Epson PM D1000" driver="escp2-pmd1000" manufacturer="Epson" model="84" parameters="standard_params" />
+      <printer translate="name" name="Epson PM G700" driver="escp2-pmg700" manufacturer="Epson" model="84" parameters="standard_params" />
+      <printer translate="name" name="Epson PM G720" driver="escp2-pmg720" manufacturer="Epson" model="84" parameters="standard_params" />
+      <printer translate="name" name="Epson PM G730" driver="escp2-pmg730" manufacturer="Epson" model="84" parameters="standard_params" />
+      <printer translate="name" name="Epson PM G800" driver="escp2-pmg800" manufacturer="Epson" model="68" parameters="standard_params" />
+      <printer translate="name" name="Epson PM G820" driver="escp2-pmg820" manufacturer="Epson" model="68" parameters="standard_params" />
+      <printer translate="name" name="Epson PM G850" driver="escp2-pmg850" manufacturer="Epson" model="81" parameters="claria_params" />
+      <printer translate="name" name="Epson PM G4500" driver="escp2-pmg4500" manufacturer="Epson" model="82" parameters="standard_params" />
+      <printer translate="name" name="Epson PX A650" driver="escp2-pxa650" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Offirio PX B300" driver="escp2-pxb300" manufacturer="Epson" model="87" parameters="standard_params" />
+      <printer translate="name" name="Epson Offirio PX B500" driver="escp2-pxb500" manufacturer="Epson" model="87" parameters="standard_params" />
+      <printer translate="name" name="Epson PX 101" driver="escp2-px101" manufacturer="Epson" model="85" parameters="standard_params" />
+      <printer translate="name" name="Epson PX 201" driver="escp2-px201" manufacturer="Epson" model="92" parameters="standard_params" />
+      <printer translate="name" name="Epson PX 601F" driver="escp2-px601f" manufacturer="Epson" model="92" parameters="standard_params" />
+      <printer translate="name" name="Epson PX G900" driver="escp2-pxg900" manufacturer="Epson" model="64" parameters="standard_params" />
+      <printer translate="name" name="Epson PX G920" driver="escp2-pxg920" manufacturer="Epson" model="64" parameters="standard_params" />
+      <printer translate="name" name="Epson PX G5000" driver="escp2-pxg5000" manufacturer="Epson" model="67" parameters="standard_params" />
+      <printer translate="name" name="Epson PX G5300" driver="escp2-pxg5300" manufacturer="Epson" model="91" parameters="standard_params" />
+      <printer translate="name" name="Epson PX V500" driver="escp2-pxv500" manufacturer="Epson" model="61" parameters="standard_params" />
+      <printer translate="name" name="Epson PX V600" driver="escp2-pxv600" manufacturer="Epson" model="69" parameters="standard_params" />
+      <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 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>
+    <family name="pcl">
+      <parameters name="pcl_inkjet_params">
+        <parameter type="float" name="Gamma">0.818</parameter>
+        <parameter type="float" name="Density">0.786</parameter>
+      </parameters>
+      <parameters name="pcl_laser_params">
+        <parameter type="float" name="Gamma">1.000</parameter>
+        <parameter type="float" name="Density">1.000</parameter>
+      </parameters>
+      <printer translate="name" name="Apollo P-2100" driver="pcl-apollo-p2100" manufacturer="Apollo" model="690" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="Apollo P-2150" driver="pcl-apollo-p2150" manufacturer="Apollo" model="690" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="Apollo P-2200" driver="pcl-apollo-p2200" manufacturer="Apollo" model="690" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="Apollo P-2250" driver="pcl-apollo-p2250" manufacturer="Apollo" model="690" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="Apollo P-2500" driver="pcl-apollo-p2500" manufacturer="Apollo" model="690" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="Apollo P-2550" driver="pcl-apollo-p2550" manufacturer="Apollo" model="690" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="Apollo P-2600" driver="pcl-apollo-p2600" manufacturer="Apollo" model="690" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="Apollo P-2650" driver="pcl-apollo-p2650" manufacturer="Apollo" model="690" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="Apple Color StyleWriter 4100" driver="pcl-apple-4100" manufacturer="Apple" model="601" parameters="pcl_inkjet_params" />	<!-- Uses 600 series driver -->
+      <printer translate="name" name="Apple Color StyleWriter 4500" driver="pcl-apple-4500" manufacturer="Apple" model="690" parameters="pcl_inkjet_params" />	<!-- Uses 690 driver -->
+      <printer translate="name" name="Apple Color StyleWriter 6500" driver="pcl-apple-6500" manufacturer="Apple" model="800" parameters="pcl_inkjet_params" />	<!-- Uses 850 driver -->
+      <printer translate="name" name="Apple LaserWriter Select 360" driver="pcl-apple-lw360" manufacturer="Apple" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother DCP-1200" driver="brother-dcp-1200" manufacturer="Brother" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother DCP-8045D" driver="brother-dcp-8045d" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-1040" driver="brother-hl-1040" manufacturer="Brother" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-1050" driver="brother-hl-1050" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-1060" driver="brother-hl-1060" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-1070" driver="brother-hl-1070" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-10V" driver="brother-hl-10v" manufacturer="Brother" model="3" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-10h" driver="brother-hl-10h" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-1240" driver="brother-hl-1240" manufacturer="Brother" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-1250" driver="brother-hl-1250" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-1260" driver="brother-hl-1260" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-1270N" driver="brother-hl-1270n" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-1430" driver="brother-hl-1430" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-1440" driver="brother-hl-1440" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-1450" driver="brother-hl-1450" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-1470N" driver="brother-hl-1470n" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-1650" driver="brother-hl-1650" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-1660e" driver="brother-hl-1660e" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-1670N" driver="brother-hl-1670n" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-1850" driver="brother-hl-1850" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-1870N" driver="brother-hl-1870n" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-2060" driver="brother-hl-2060" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-2460" driver="brother-hl-2460" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-2460N" driver="brother-hl-2460n" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-4Ve" driver="brother-hl-4ve" manufacturer="Brother" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-5030" driver="brother-hl-5030" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-5040" driver="brother-hl-5040" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-5050" driver="brother-hl-5050" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-5070N" driver="brother-hl-5070n" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-5140" driver="brother-hl-5140" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-5150D" driver="brother-hl-5150d" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-5170DN" driver="brother-hl-5170dn" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-630" driver="brother-hl-630" manufacturer="Brother" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-660" driver="brother-hl-660" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-7050" driver="brother-hl-7050" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-7050N" driver="brother-hl-7050n" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-760" driver="brother-hl-760" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-960" driver="brother-hl-960" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother MFC-6550MC" driver="brother-mfc-6550mc" manufacturer="Brother" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother MFC-8300" driver="brother-mfc-8300" manufacturer="Brother" model="3" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother MFC-9500" driver="brother-mfc-9500" manufacturer="Brother" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother MFC-9600" driver="brother-mfc-9600" manufacturer="Brother" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="Canon GP 335" driver="canon-gp_335" manufacturer="Canon" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Canon LBP-4sx" driver="canon-lbp-4sx" manufacturer="Canon" model="3" parameters="pcl_laser_params" />
+      <printer translate="name" name="Canon LBP-430" driver="canon-lbp-430" manufacturer="Canon" model="4" parameters="pcl_laser_params" />
+      <printer translate="name" name="Canon LBP-1000" driver="canon-lbp-1000" manufacturer="Canon" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Canon LBP-1260" driver="canon-lbp-1260" manufacturer="Canon" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Canon LBP-1760" driver="canon-lbp-1760" manufacturer="Canon" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Canon imageRunner 330s" driver="canon-ir_330s" manufacturer="Canon" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Citizen ProJet II" driver="citizen-projet_ii" manufacturer="Citizen" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="DEC 1800" driver="dec-1800" manufacturer="DEC" model="3" parameters="pcl_laser_params" />
+      <printer translate="name" name="DEC LN17" driver="dec-ln17" manufacturer="DEC" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Epson ActionLaser 1100" driver="epson-actl_1100" manufacturer="Epson" model="3" parameters="pcl_laser_params" />
+      <printer translate="name" name="Epson ActionLaser II" driver="epson-actl_ii" manufacturer="Epson" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="Epson AcuLaser C2000" driver="epson-acl_c2000" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Epson AcuLaser C2000PS" driver="epson-acl_c2000ps" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Epson AcuLaser C8500" driver="epson-acl_c8500" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Epson AcuLaser C8500PS" driver="epson-acl_c8500ps" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Epson AcuLaser C8600" driver="epson-acl_c8600" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Epson AcuLaser C8600PS" driver="epson-acl_c8600ps" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Epson EPL-5200" driver="epson-epl-5200" manufacturer="Epson" model="3" parameters="pcl_laser_params" />
+      <printer translate="name" name="Epson EPL-5200+" driver="epson-epl-5200plus" manufacturer="Epson" model="3" parameters="pcl_laser_params" />
+      <printer translate="name" name="Epson EPL-5700" driver="epson-epl-5700" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Epson EPL-5700PS" driver="epson-epl-5700ps" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Epson EPL-5800" driver="epson-epl-5800" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Epson EPL-5800PS" driver="epson-epl-5800ps" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Epson EPL-5900" driver="epson-epl-5900" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Epson EPL-5900PS" driver="epson-epl-5900ps" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Epson EPL-6100" driver="epson-epl-6100" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Epson EPL-6100PS" driver="epson-epl-6100ps" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Epson EPL-7100" driver="epson-epl-7100" manufacturer="Epson" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="Epson EPL-N2050" driver="epson-epl-n2050" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Epson EPL-N2050+" driver="epson-epl-n2050plus" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Epson EPL-N2050PS" driver="epson-epl-n2050ps" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Epson EPL-N2050PS+" driver="epson-epl-n2050psplus" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Epson EPL-N2120" driver="epson-epl-n2120" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Epson EPL-N2500" driver="epson-epl-n2500" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Epson EPL-N2500PS" driver="epson-epl-n2500ps" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Epson EPL-N2750" driver="epson-epl-n2750" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Epson EPL-N2750PS" driver="epson-epl-n2750ps" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Fujitsu PrintPartner 10V" driver="fujitsu-pp_10v" manufacturer="Fujitsu" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Fujitsu PrintPartner 16DV" driver="fujitsu-pp_16dv" manufacturer="Fujitsu" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Fujitsu PrintPartner 20W" driver="fujitsu-pp_20w" manufacturer="Fujitsu" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Fujitsu PrintPartner 8000" driver="fujitsu-pp_8000" manufacturer="Fujitsu" model="3" parameters="pcl_laser_params" />
+      <printer translate="name" name="Generic PCL 4 Printer" driver="pcl-g_4" manufacturer="Generic" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="Generic PCL 4 LF Printer" driver="pcl-g_4_l" manufacturer="Generic" model="23" parameters="pcl_laser_params" />
+      <printer translate="name" name="Generic PCL 5 Printer" driver="pcl-g_5" manufacturer="Generic" model="3" parameters="pcl_laser_params" />
+      <printer translate="name" name="Generic PCL 5 LF Printer" driver="pcl-g_5_l" manufacturer="Generic" model="33" parameters="pcl_laser_params" />
+      <printer translate="name" name="Generic PCL 5c Printer" driver="pcl-g_5c" manufacturer="Generic" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Generic PCL 5c LF Printer" driver="pcl-g_5c_l" manufacturer="Generic" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Generic PCL 5e Printer" driver="pcl-g_5e" manufacturer="Generic" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Generic PCL 5e LF Printer" driver="pcl-g_5e_l" manufacturer="Generic" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Generic PCL 6/PCL XL Printer" driver="pcl-g_6" manufacturer="Generic" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Generic PCL 6/PCL XL LF Printer" driver="pcl-g_6_l" manufacturer="Generic" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner 10512" driver="gestetner-10512" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner 2212" driver="gestetner-2212" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <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 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 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" />
+      <printer translate="name" name="Gestetner DSm415" driver="gestetner-dsm415" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner DSm615" driver="gestetner-dsm615" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner DSm616" driver="gestetner-dsm616" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner DSm618" driver="gestetner-dsm618" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner DSm618d" driver="gestetner-dsm618d" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner DSm620" driver="gestetner-dsm620" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <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 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 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 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" />
+      <printer translate="name" name="Gestetner MP 4000B" driver="gestetner-mp_4000b" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner MP 5000" driver="gestetner-mp_5000" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner MP 5000B" driver="gestetner-mp_5000b" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP Business Inkjet 2200" driver="hp-bij_2200" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP Business Inkjet 2230" driver="hp-bij_2230" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP Business Inkjet 2250" driver="hp-bij_2250" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP Business Inkjet 2250TN" driver="hp-bij_2250tn" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP Business Inkjet 2280" driver="hp-bij_2280" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP Color Inkjet Printer CP1160" driver="hp-cij_cp1160" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP Color Inkjet Printer CP1700" driver="hp-cij_cp1700" manufacturer="HP" model="901" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP Color LaserJet 2500" driver="hp-clj_2500" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP Color LaserJet 4500" driver="hp-clj_4500" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP Color LaserJet 4550" driver="hp-clj_4550" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP Color LaserJet 4600" driver="hp-clj_4600" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP Color LaserJet 5" driver="hp-clj_5" manufacturer="HP" model="3" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP Color LaserJet 5000" driver="hp-clj_5000" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP Color LaserJet 5500" driver="hp-clj_5500" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP Color LaserJet 8550GN" driver="hp-clj_8550gn" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP DesignJet 230" driver="pcl-desnj-230" manufacturer="HP" model="10230" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DesignJet 250C" driver="pcl-desnj-250" manufacturer="HP" model="10250" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DesignJet 430" driver="pcl-desnj-430" manufacturer="HP" model="10230" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DesignJet 450C" driver="pcl-desnj-450" manufacturer="HP" model="10250" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DesignJet 455CA" driver="pcl-desnj-455" manufacturer="HP" model="10250" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DesignJet 488CA" driver="pcl-desnj-488" manufacturer="HP" model="10250" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DesignJet 700" driver="pcl-desnj-700" manufacturer="HP" model="10700" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DesignJet 750C Plus" driver="hp-desnj_750c_plus" manufacturer="HP" model="10750" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DesignJet 750C" driver="pcl-750" manufacturer="HP" model="10750" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DesignJet 2500CP" driver="pcl-desnj-2500" manufacturer="HP" model="12500" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DesignJet 3500CP" driver="pcl-desnj-3500" manufacturer="HP" model="13500" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DesignJet ColorPro CAD" driver="hp-desnj_cp_cad" manufacturer="HP" model="2500" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 400" driver="pcl-400" manufacturer="HP" model="400" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 420C" driver="hp-dj_420c" manufacturer="HP" model="540" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 450" driver="hp-dj_450" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 500" driver="pcl-500" manufacturer="HP" model="500" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 500C" driver="pcl-501" manufacturer="HP" model="501" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 505J Plus" driver="hp-dj_505j_plus" manufacturer="HP" model="500" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 510" driver="hp-dj_510" manufacturer="HP" model="500" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 520" driver="pcl-520" manufacturer="HP" model="500" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 540C" driver="pcl-540" manufacturer="HP" model="540" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 550C" driver="pcl-550" manufacturer="HP" model="550" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 5550" driver="hp-dj_5550" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 5551" driver="hp-dj_5551" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 560C" driver="pcl-560" manufacturer="HP" model="550" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 600" driver="pcl-600" manufacturer="HP" model="600" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 600C" driver="pcl-601" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 610C" driver="hp-dj_610c" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 610CL" driver="hp-dj_610cl" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 6122" driver="hp-dj_6122" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 6127" driver="hp-dj_6127" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 612C" driver="hp-dj_612c" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 640C" driver="hp-dj_640c" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 648C" driver="hp-dj_648c" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 660C" driver="hp-dj_660c" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 670C" driver="hp-dj_670c" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 670TV" driver="hp-dj_670tv" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 672C" driver="hp-dj_672c" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 680C" driver="hp-dj_680c" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 682C" driver="hp-dj_682c" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 690C" driver="pcl-690" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 692C" driver="hp-dj_692c" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 693C" driver="hp-dj_693c" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 694C" driver="hp-dj_694c" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 695C" driver="hp-dj_695c" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 697C" driver="hp-dj_697c" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 810C" driver="pcl-810" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />  <!-- Uses 840 driver -->
+      <printer translate="name" name="HP DeskJet 812C" driver="pcl-812" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />  <!-- Uses 840 driver -->
+      <printer translate="name" name="HP DeskJet 815C" driver="hp-dj_815c" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 816C" driver="hp-dj_816c" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 825C" driver="hp-dj_825c" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 830C" driver="hp-dj_830c" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 832C" driver="hp-dj_832c" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 840C" driver="pcl-840" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />  <!-- Uses 840 driver -->
+      <printer translate="name" name="HP DeskJet 841C" driver="hp-dj_841c" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 842C" driver="pcl-842" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />  <!-- Uses 840 driver -->
+      <printer translate="name" name="HP DeskJet 843C" driver="hp-dj_843c" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 845C" driver="pcl-845" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />  <!-- Uses 840 driver -->
+      <printer translate="name" name="HP DeskJet 850C" driver="pcl-850" manufacturer="HP" model="800" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 855C" driver="pcl-855" manufacturer="HP" model="800" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 870C" driver="pcl-870" manufacturer="HP" model="800" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 880C" driver="hp-dj_880c" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 882C" driver="hp-dj_882c" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 890C" driver="pcl-890" manufacturer="HP" model="800" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 895C" driver="pcl-895" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />  <!-- Uses 840 driver -->
+      <printer translate="name" name="HP DeskJet 916C" driver="pcl-900" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 920C" driver="hp-dj_920c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 9300" driver="hp-dj_9300" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 930C" driver="hp-dj_930c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 932C" driver="hp-dj_932c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 933C" driver="hp-dj_933c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 934C" driver="hp-dj_934c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 935C" driver="hp-dj_935c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 940C" driver="hp-dj_940c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 948C" driver="hp-dj_948c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 950C" driver="hp-dj_950c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 952C" driver="hp-dj_952c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 955C" driver="hp-dj_955c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 957C" driver="hp-dj_957c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 959C" driver="hp-dj_959c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 960C" driver="hp-dj_960c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 970C" driver="hp-dj_970c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 975C" driver="hp-dj_975c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 980C" driver="hp-dj_980c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 990C" driver="hp-dj_990c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 995C" driver="hp-dj_995c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 1100C" driver="pcl-1100" manufacturer="HP" model="1100" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 1120C" driver="pcl-1120" manufacturer="HP" model="1100" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 1125C" driver="hp-dj_1125c" manufacturer="HP" model="1100" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 1200C" driver="pcl-1200" manufacturer="HP" model="1200" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 1220C" driver="pcl-1220" manufacturer="HP" model="901" parameters="pcl_inkjet_params" />  <!-- Uses 900 series driver (large) -->
+      <printer translate="name" name="HP DeskJet 1600C" driver="pcl-1600" manufacturer="HP" model="1600" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 1600CM" driver="hp-dj_1600cm" manufacturer="HP" model="1600" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 2000" driver="pcl-2000" manufacturer="HP" model="2000" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 2500" driver="pcl-2500" manufacturer="HP" model="2500" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 2500CM" driver="hp-2500cm" manufacturer="HP" model="2500" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 340C" driver="pcl-340" manufacturer="HP" model="340" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 3810" driver="hp-dj_3810" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 3816" driver="hp-dj_3816" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 3820" driver="hp-dj_3820" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 3822" driver="hp-dj_3822" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP LaserJet 2" driver="pcl-2" manufacturer="HP" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 2D" driver="hp-lj_2d" manufacturer="HP" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 2P Plus" driver="hp-lj_2p_plus" manufacturer="HP" model="21" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 2P" driver="pcl-2p" manufacturer="HP" model="21" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 3" driver="pcl-3" manufacturer="HP" model="3" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 3D" driver="hp-lj_3d" manufacturer="HP" model="3" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 3P w/ PCL5" driver="hp-lj_3p_w_pcl5" manufacturer="HP" model="4" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 3P w/PS" driver="hp-lj_3p_w_ps" manufacturer="HP" model="3" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 4 Plus" driver="hp-lj_4_plus" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 4" driver="pcl-4" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 4L" driver="pcl-4l" manufacturer="HP" model="4" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 4M" driver="hp-lj_4m" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 4ML" driver="hp-lj_4ml" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 4P" driver="hp-lj_4p" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 4Si" driver="pcl-4si" manufacturer="HP" model="51" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 4V" driver="pcl-4v" manufacturer="HP" model="5" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 5" driver="pcl-5" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 5L" driver="hp-lj_5l" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 5M" driver="hp-lj_5m" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 5MP" driver="hp-lj_5mp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 5P" driver="hp-lj_5p" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 5Si" driver="pcl-5si" manufacturer="HP" model="7" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 6" driver="pcl-6" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 6L" driver="hp-lj_6l" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 6MP" driver="hp-lj_6mp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 6P" driver="hp-lj_6p" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 1010" driver="hp-lj_1010" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 1012" driver="hp-lj_1012" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 1015" driver="hp-lj_1015" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 1022" driver="hp-lj_1022" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 1100" driver="hp-lj_1100" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 1100A" driver="hp-lj_1100a" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 1150" driver="hp-lj_1150" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 1160" driver="hp-lj_1160" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 1200" driver="hp-lj_1200" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 1220" driver="hp-lj_1220" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 1300" driver="hp-lj_1300" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 1320" driver="hp-lj_1320" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 2100" driver="hp-lj_2100" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 2100M" driver="hp-lj_2100m" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 2200" driver="hp-lj_2200" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 2300" driver="hp-lj_2300" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 2410" driver="hp-lj_2410" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 2420" driver="hp-lj_2420" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 2430" driver="hp-lj_2430" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 3015" driver="hp-lj_3015" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 3020" driver="hp-lj_3020" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 3030" driver="hp-lj_3030" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 3050" driver="hp-lj_3050" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 3052" driver="hp-lj_3052" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 3055" driver="hp-lj_3055" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 3200" driver="hp-lj_3200" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 3200m" driver="hp-lj_3200m" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 3200se" driver="hp-lj_3200se" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 3300 MFP" driver="hp-lj_3300_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 3310 MFP" driver="hp-lj_3310_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 3320 MFP" driver="hp-lj_3320_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 3320N MFP" driver="hp-lj_3320n_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 3330 MFP" driver="hp-lj_3330_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 3380" driver="hp-lj_3380" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 3390" driver="hp-lj_3390" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 3392" driver="hp-lj_3392" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 4000" driver="hp-lj_4000" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 4050" driver="hp-lj_4050" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 4100" driver="hp-lj_4100" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 4200" driver="hp-lj_4200" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 4240" driver="hp-lj_4240" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 4250" driver="hp-lj_4250" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 4300" driver="hp-lj_4300" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 4345 mfp" driver="hp-lj_4345_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 4350" driver="hp-lj_4350" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 5000" driver="hp-lj_5000" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 5100" driver="hp-lj_5100" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 5200" driver="hp-lj_5200" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 5200L" driver="hp-lj_5200l" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 8000" driver="hp-lj_8000" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 8100" driver="hp-lj_8100" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 8150" driver="hp-lj_8150" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 9000" driver="hp-lj_9000" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 9040" driver="hp-lj_9040" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 9040 MFP" driver="hp-lj_9040_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 9050" driver="hp-lj_9050" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 9050 MFP" driver="hp-lj_9050_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet M3027 MFP" driver="hp-lj_m3027_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet M3035 MFP" driver="hp-lj_m3035_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet M4345 MFP" driver="hp-lj_m4345_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet M5025 MFP" driver="hp-lj_m5025_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet M5035 MFP" driver="hp-lj_m5035_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet P2010" driver="hp-lj_p2010" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet P2015" driver="hp-lj_p2015" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet P3004" driver="hp-lj_p3004" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet P3005" driver="hp-lj_p3005" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP Mopier 240" driver="hp-mopier_240" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP Mopier 320" driver="hp-mopier_320" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP OfficeJet 300" driver="hp-oj_300" manufacturer="HP" model="500" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 330" driver="hp-oj_330" manufacturer="HP" model="500" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 350" driver="hp-oj_350" manufacturer="HP" model="500" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 500" driver="hp-oj_500" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 520" driver="hp-oj_520" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 570" driver="hp-oj_570" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 580" driver="hp-oj_580" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 590" driver="hp-oj_590" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 600" driver="hp-oj_600" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 610" driver="hp-oj_610" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 625" driver="hp-oj_625" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 630" driver="hp-oj_630" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 635" driver="hp-oj_635" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 700" driver="hp-oj_700" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 710" driver="hp-oj_710" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 720" driver="hp-oj_720" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 725" driver="hp-oj_725" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 5105" driver="hp-oj_5105" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 5110" driver="hp-oj_5110" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 5110xi" driver="hp-oj_5110xi" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 6105" driver="hp-oj_6105" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 6110" driver="hp-oj_6110" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 7110" driver="hp-oj_7110" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 7130" driver="hp-oj_7130" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 7140" driver="hp-oj_7140" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet D125" driver="hp-oj_d125" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet D135" driver="hp-oj_d135" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet D145" driver="hp-oj_d145" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet D155" driver="hp-oj_d155" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet G55" driver="hp-oj_g55" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet G85" driver="hp-oj_g85" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet G95" driver="hp-oj_g95" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet K60" driver="hp-oj_k60" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet K60xi" driver="hp-oj_k60xi" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet K80" driver="hp-oj_k80" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet K80xi" driver="hp-oj_k80xi" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet LX" driver="hp-oj_lx" manufacturer="HP" model="500" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet Pro 1150C" driver="hp-oj_pro_1150c" manufacturer="HP" model="800" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet Pro 1170C" driver="hp-oj_pro_1170c" manufacturer="HP" model="800" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet Pro 1175C" driver="hp-oj_pro_1175c" manufacturer="HP" model="800" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet R40" driver="hp-oj_r40" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet R45" driver="hp-oj_r45" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet R60" driver="hp-oj_r60" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet R65" driver="hp-oj_r65" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet R80" driver="hp-oj_r80" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet T45" driver="hp-oj_t45" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet T65" driver="hp-oj_t65" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet V40" driver="hp-oj_v40" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet V40xi" driver="hp-oj_v40xi" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet" driver="hp-oj" manufacturer="HP" model="500" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP PSC 370" driver="hp-psc_370" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP PSC 380" driver="hp-psc_380" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP PSC 500" driver="hp-psc_500" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP PSC 750" driver="hp-psc_750" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP PSC 950" driver="hp-psc_950" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP PSC 950xi" driver="hp-psc_950xi" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP PSC 2110" driver="hp-psc_2110" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP PSC 2150" driver="hp-psc_2150" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP PSC 2210" driver="hp-psc_2210" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP PhotoSmart 7150" driver="hp-psc_7150" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP PhotoSmart 7345" driver="hp-psc_7345" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP PhotoSmart 7350" driver="hp-psc_7350" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP PhotoSmart 7550" driver="hp-psc_7550" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP PhotoSmart P100" driver="hp-psc_p100" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP PhotoSmart P130" driver="hp-psc_p130" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP PhotoSmart P230" driver="hp-psc_p230" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP PhotoSmart P1000" driver="pcl-P1000" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />  <!-- Uses 900 series driver -->
+      <printer translate="name" name="HP PhotoSmart P1100" driver="pcl-P1100" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />  <!-- Uses 900 series driver -->
+      <printer translate="name" name="HP PhotoSmart P1115" driver="hp-psc_p1115" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP PhotoSmart P1215" driver="hp-psc_p1215" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP PhotoSmart P1218" driver="hp-psc_p1218" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP PhotoSmart P1315" driver="hp-psc_p1315" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP e-printer e20" driver="hp-e-printer_e20" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="IBM 4019" driver="ibm-4019" manufacturer="IBM" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="IBM 4029 030 LaserPrinter 10" driver="ibm-4029_030_lp_10" manufacturer="IBM" model="3" parameters="pcl_laser_params" />
+      <printer translate="name" name="IBM 4312" driver="ibm-4312" manufacturer="IBM" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="IBM Infoprint 12" driver="ibm-infoprint_12" manufacturer="IBM" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="IBM Page Printer 3112" driver="ibm-pp_3112" manufacturer="IBM" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec 4353 MF" driver="infotec-4353_mf" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec 4452 MF" driver="infotec-4452_mf" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec 4651 MF" driver="infotec-4651_mf" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec IS2022" driver="infotec-is2022" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec IS2027" driver="infotec-is2027" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec IS2032" driver="infotec-is2032" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec IS2035" driver="infotec-is2035" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec IS2045" driver="infotec-is2045" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec IS2090" driver="infotec-is2090" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec IS2105" driver="infotec-is2105" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec IS 2015" driver="infotec-is_2015" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec IS 2018" driver="infotec-is_2018" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec IS 2018D" driver="infotec-is_2018d" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec IS 2060" driver="infotec-is_2060" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec IS 2075" driver="infotec-is_2075" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec IS 2122" driver="infotec-is_2122" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec IS 2127" driver="infotec-is_2127" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec IS 2132" driver="infotec-is_2132" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec IS 2135" driver="infotec-is_2135" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec IS 2145" driver="infotec-is_2145" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec IS 2151" driver="infotec-is_2151" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec IS 2160" driver="infotec-is_2160" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec IS 2175" driver="infotec-is_2175" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec IS 2215" driver="infotec-is_2215" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec IS 2216" driver="infotec-is_2216" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec IS 2220" driver="infotec-is_2220" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec IS 2220D" driver="infotec-is_2220d" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec IS 2225" driver="infotec-is_2225" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec IS 2230" driver="infotec-is_2230" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec IS 2235" driver="infotec-is_2235" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec IS 2245" driver="infotec-is_2245" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec IS 2255" driver="infotec-is_2255" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec IS 2265" driver="infotec-is_2265" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec IS 2275" driver="infotec-is_2275" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec IS 2316" driver="infotec-is_2316" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec IS 2320" driver="infotec-is_2320" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec IS 2325" driver="infotec-is_2325" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec IS 2416" driver="infotec-is_2416" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec IS 2425" driver="infotec-is_2425" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec IS 2430" driver="infotec-is_2430" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec IS 2435" driver="infotec-is_2435" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec IS 2445" driver="infotec-is_2445" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec IS 3090" driver="infotec-is_3090" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec IS 3110" driver="infotec-is_3110" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec IS 3135" driver="infotec-is_3135" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec MP 2550" driver="infotec-mp_2550" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec MP 2550B" driver="infotec-mp_2550b" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec MP 3350" driver="infotec-mp_3350" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec MP 3350B" driver="infotec-mp_3350b" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec MP 4000" driver="infotec-mp_4000" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec MP 4000B" driver="infotec-mp_4000b" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec MP 5000" driver="infotec-mp_5000" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec MP 5000B" driver="infotec-mp_5000b" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera F-1010" driver="kyocera-f-1010" manufacturer="Kyocera" model="22" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-600 - KPDL-2" driver="kyocera-fs-600_kpdl-2" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-600" driver="kyocera-fs-600" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-680" driver="kyocera-fs-680" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-800" driver="kyocera-fs-800" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-1000" driver="kyocera-fs-1000" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-1000+" driver="kyocera-fs-1000plus" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-1010" driver="kyocera-fs-1010" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-1050" driver="kyocera-fs-1050" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-1200" driver="kyocera-fs-1200" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-1600" driver="kyocera-fs-1600" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-1600+" driver="kyocera-fs-1600plus" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-1700" driver="kyocera-fs-1700" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-1700+" driver="kyocera-fs-1700plus" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-1750" driver="kyocera-fs-1750" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-1800" driver="kyocera-fs-1800" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-1800+" driver="kyocera-fs-1800plus" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-1900" driver="kyocera-fs-1900" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-3500" driver="kyocera-fs-3500" manufacturer="Kyocera" model="32" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-3600" driver="kyocera-fs-3600" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-3600+" driver="kyocera-fs-3600plus" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-3700" driver="kyocera-fs-3700" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-3700+" driver="kyocera-fs-3700plus" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-3750" driver="kyocera-fs-3750" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-3800" driver="kyocera-fs-3800" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-5800C" driver="kyocera-fs-5800c" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-5900C" driver="kyocera-fs-5900c" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-6500" driver="kyocera-fs-6500" manufacturer="Kyocera" model="32" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-6500+" driver="kyocera-fs-6500plus" manufacturer="Kyocera" model="32" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-6700" driver="kyocera-fs-6700" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-7000" driver="kyocera-fs-7000" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-7000+" driver="kyocera-fs-7000plus" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-8000C" driver="kyocera-fs-8000c" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-9000" driver="kyocera-fs-9000" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-9100DN" driver="kyocera-fs-9100dn" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-9500DN" driver="kyocera-fs-9500dn" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera KM-1530" driver="kyocera-km-1530" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera KM-1810" driver="kyocera-km-1810" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera KM-2030" driver="kyocera-km-2030" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera KM-2530" driver="kyocera-km-2530" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera KM-3530" driver="kyocera-km-3530" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera KM-4230" driver="kyocera-km-4230" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera KM-4530" driver="kyocera-km-4530" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera KM-5230" driver="kyocera-km-5230" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera KM-5530" driver="kyocera-km-5530" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera KM-6230" driver="kyocera-km-6230" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier 5622" driver="lanier-5622" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier 5627" driver="lanier-5627" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier 5632" driver="lanier-5632" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier 5635" driver="lanier-5635" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier 5645" driver="lanier-5645" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD0105" driver="lanier-ld0105" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD015" driver="lanier-ld015" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD035" driver="lanier-ld035" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD045" driver="lanier-ld045" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD060" driver="lanier-ld060" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD075" driver="lanier-ld075" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD090" driver="lanier-ld090" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD115" driver="lanier-ld115" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD116" driver="lanier-ld116" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD118" driver="lanier-ld118" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD118d" driver="lanier-ld118d" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD120" driver="lanier-ld120" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD120d" driver="lanier-ld120d" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD122" driver="lanier-ld122" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD127" driver="lanier-ld127" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD132" driver="lanier-ld132" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD135" driver="lanier-ld135" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD145" driver="lanier-ld145" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD151" driver="lanier-ld151" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD160" driver="lanier-ld160" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD175" driver="lanier-ld175" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD225" driver="lanier-ld225" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <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="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" />
+      <printer translate="name" name="Lexmark Optra E220" driver="lexmark-optra_e220" manufacturer="Lexmark" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lexmark Optra E321" driver="lexmark-optra_e321" manufacturer="Lexmark" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lexmark Optra E323" driver="lexmark-optra_e323" manufacturer="Lexmark" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lexmark Valuewriter 300" driver="lexmark-vw_300" manufacturer="Lexmark" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="Minolta PagePro 6" driver="minolta-pp_6" manufacturer="Minolta" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Minolta PagePro 6e" driver="minolta-pp_6e" manufacturer="Minolta" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Minolta PagePro 6ex" driver="minolta-pp_6ex" manufacturer="Minolta" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Minolta PagePro 8" driver="minolta-pp_8" manufacturer="Minolta" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Minolta PagePro 8L" driver="minolta-pp_8l" manufacturer="Minolta" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="Minolta PagePro 1100" driver="minolta-pp_1100" manufacturer="Minolta" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NEC SuperScript 660i" driver="nec-ssc_660i" manufacturer="NEC" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NEC SuperScript 860" driver="nec-ssc_860" manufacturer="NEC" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="NEC SuperScript 870" driver="nec-ssc_870" manufacturer="NEC" model="2" parameters="pcl_laser_params" />
+      <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 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" />
+      <printer translate="name" name="NRG DSm618" driver="nrg-dsm618" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG DSm618d" driver="nrg-dsm618d" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG DSm620" driver="nrg-dsm620" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG DSm620d" driver="nrg-dsm620d" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG DSm622" driver="nrg-dsm622" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG DSm627" driver="nrg-dsm627" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG DSm632" driver="nrg-dsm632" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG DSm635" driver="nrg-dsm635" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG DSm645" driver="nrg-dsm645" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG DSm651" driver="nrg-dsm651" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG DSm660" driver="nrg-dsm660" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG DSm675" driver="nrg-dsm675" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG DSm725" driver="nrg-dsm725" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG DSm730" driver="nrg-dsm730" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG DSm735" driver="nrg-dsm735" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG DSm745" driver="nrg-dsm745" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG MP 1100" driver="nrg-mp_1100" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG MP 1350" driver="nrg-mp_1350" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG MP 1600" driver="nrg-mp_1600" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG MP 161" driver="nrg-mp_161" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG MP 2000" driver="nrg-mp_2000" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG MP 2500" driver="nrg-mp_2500" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG MP 2510" driver="nrg-mp_2510" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG MP 2550" driver="nrg-mp_2550" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG MP 2550B" driver="nrg-mp_2550b" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG MP 3010" driver="nrg-mp_3010" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG MP 3350" driver="nrg-mp_3350" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG MP 3350B" driver="nrg-mp_3350b" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG MP 3500" driver="nrg-mp_3500" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG MP 4000" driver="nrg-mp_4000" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG MP 4000B" driver="nrg-mp_4000b" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG MP 4500" driver="nrg-mp_4500" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG MP 5000" driver="nrg-mp_5000" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG MP 5000B" driver="nrg-mp_5000b" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG MP 5500" driver="nrg-mp_5500" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG MP 6500" driver="nrg-mp_6500" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG MP 7500" driver="nrg-mp_7500" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG MP 9000" driver="nrg-mp_9000" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Oki OL400" driver="okidata-ol400" manufacturer="Oki" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="Oki OL400e" driver="okidata-ol400e" manufacturer="Oki" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="Oki OL400ex" driver="okidata-ol400ex" manufacturer="Oki" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="Oki OL410e" driver="okidata-ol410e" manufacturer="Oki" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Oki OL600e" driver="okidata-ol600e" manufacturer="Oki" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="Oki OL610e/S" driver="okidata-ol610e_s" manufacturer="Oki" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="Oki OL800" driver="okidata-ol800" manufacturer="Oki" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="Oki OL810ex" driver="okidata-ol810ex" manufacturer="Oki" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Oki Okipage 6e" driver="okidata-okp_6e" manufacturer="Oki" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Oki Okipage 6ex" driver="okidata-okp_6ex" manufacturer="Oki" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Oki Okipage 8p" driver="okidata-okp_8p" manufacturer="Oki" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Oki Okipage 10e" driver="okidata-okp_10e" manufacturer="Oki" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Oki Okipage 10ex" driver="okidata-okp_10ex" manufacturer="Oki" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Oki Okipage 14ex" driver="okidata-okp_14ex" manufacturer="Oki" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Oki Super 6e" driver="okidata-super_6e" manufacturer="Oki" model="4" parameters="pcl_laser_params" />
+      <printer translate="name" name="Olivetti JP350S" driver="olivetti-jp350s" manufacturer="Olivetti" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="Olivetti PG 306" driver="olivetti-pg_306" manufacturer="Olivetti" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="PCPI 1030" driver="pcpi-1030" manufacturer="PCPI" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="Panasonic KX-P4410" driver="panasonic-kx-p4410" manufacturer="Panasonic" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="Panasonic KX-P4450" driver="panasonic-kx-p4450" manufacturer="Panasonic" model="3" parameters="pcl_laser_params" />
+      <printer translate="name" name="Panasonic KX-P6150" driver="panasonic-kx-p6150" manufacturer="Panasonic" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="Panasonic KX-P6500" driver="panasonic-kx-p6500" manufacturer="Panasonic" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="Raven LP-410" driver="raven-lp-410" manufacturer="Raven" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 1022" driver="ricoh-afc_1022" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 1027" driver="ricoh-afc_1027" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 1032" driver="ricoh-afc_1032" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 1035" driver="ricoh-afc_1035" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 1045" driver="ricoh-afc_1045" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 1060" driver="ricoh-afc_1060" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 1075" driver="ricoh-afc_1075" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 1515" driver="ricoh-afc_1515" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 2015" driver="ricoh-afc_2015" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 2016" driver="ricoh-afc_2016" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 2018" driver="ricoh-afc_2018" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 2018D" driver="ricoh-afc_2018d" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 2020" driver="ricoh-afc_2020" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 2020D" driver="ricoh-afc_2020d" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 2022" driver="ricoh-afc_2022" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 2027" driver="ricoh-afc_2027" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 2032" driver="ricoh-afc_2032" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 2035" driver="ricoh-afc_2035" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 2035e" driver="ricoh-afc_2035e" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 2045" driver="ricoh-afc_2045" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 2045e" driver="ricoh-afc_2045e" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 2051" driver="ricoh-afc_2051" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 2060" driver="ricoh-afc_2060" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 2075" driver="ricoh-afc_2075" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 2090" driver="ricoh-afc_2090" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 2105" driver="ricoh-afc_2105" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 220" driver="ricoh-afc_220" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 3025" driver="ricoh-afc_3025" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 3030" driver="ricoh-afc_3030" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 3035" driver="ricoh-afc_3035" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 3045" driver="ricoh-afc_3045" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 401" driver="ricoh-afc_401" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 700" driver="ricoh-afc_700" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio MP 1100" driver="ricoh-afc_mp_1100" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio MP 1350" driver="ricoh-afc_mp_1350" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio MP 1600" driver="ricoh-afc_mp_1600" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio MP 161" driver="ricoh-afc_mp_161" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio MP 2000" driver="ricoh-afc_mp_2000" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio MP 2500" driver="ricoh-afc_mp_2500" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio MP 2510" driver="ricoh-afc_mp_2510" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio MP 2550" driver="ricoh-afc_mp_2550" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio MP 2550B" driver="ricoh-afc_mp_2550b" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio MP 3010" driver="ricoh-afc_mp_3010" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio MP 3350" driver="ricoh-afc_mp_3350" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio MP 3350B" driver="ricoh-afc_mp_3350b" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio MP 3500" driver="ricoh-afc_mp_3500" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio MP 4000" driver="ricoh-afc_mp_4000" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio MP 4000B" driver="ricoh-afc_mp_4000b" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio MP 4500" driver="ricoh-afc_mp_4500" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio MP 5000" driver="ricoh-afc_mp_5000" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio MP 5000B" driver="ricoh-afc_mp_5000b" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio MP 5500" driver="ricoh-afc_mp_5500" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio MP 6500" driver="ricoh-afc_mp_6500" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio MP 7500" driver="ricoh-afc_mp_7500" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio MP 9000" driver="ricoh-afc_mp_9000" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Samsung ML-85" driver="samsung-ml-85" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Samsung ML-1250" driver="samsung-ml-1250" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Samsung ML-1450" driver="samsung-ml-1450" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Samsung ML-1450PS" driver="samsung-ml-1450ps" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Samsung ML-1650" driver="samsung-ml-1650" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Samsung ML-1651N" driver="samsung-ml-1651n" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Samsung ML-1750" driver="samsung-ml-1750" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Samsung ML-2150" driver="samsung-ml-2150" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Samsung ML-2150PS" driver="samsung-ml-2150ps" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Samsung ML-2151N" driver="samsung-ml-2151n" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Samsung ML-2151NPS" driver="samsung-ml-2151nps" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Samsung ML-2152W" driver="samsung-ml-2152w" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Samsung ML-2152WPS" driver="samsung-ml-2152wps" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Samsung ML-2250" driver="samsung-ml-2250" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Samsung ML-2550" driver="samsung-ml-2550" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Samsung ML-2551N" driver="samsung-ml-2551n" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Samsung ML-2552W" driver="samsung-ml-2552w" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Samsung ML-4600" driver="samsung-ml-4600" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Samsung ML-5000a" driver="samsung-ml-5000a" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Samsung ML-6000" driver="samsung-ml-6000" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Samsung ML-6100" driver="samsung-ml-6100" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Samsung ML-7000" driver="samsung-ml-7000" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Samsung ML-7000N" driver="samsung-ml-7000n" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Samsung ML-7000P" driver="samsung-ml-7000p" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Samsung ML-7050" driver="samsung-ml-7050" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Samsung ML-7300" driver="samsung-ml-7300" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Samsung ML-7300N" driver="samsung-ml-7300n" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Samsung QL-5100A" driver="samsung-ql-5100a" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Samsung QL-6050" driver="samsung-ql-6050" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
+      <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 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" />
+      <printer translate="name" name="Savin 40105" driver="savin-40105" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 4015" driver="savin-4015" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 4018" driver="savin-4018" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <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 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" />
+      <printer translate="name" name="Savin 4090" driver="savin-4090" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 7025" driver="savin-7025" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 8016" driver="savin-8016" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 8020" driver="savin-8020" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 8020d" driver="savin-8020d" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 8025" driver="savin-8025" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <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 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 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" />
+      <printer translate="name" name="Savin 8075" driver="savin-8075" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 8090" driver="savin-8090" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 8110" driver="savin-8110" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 8135" driver="savin-8135" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 816" driver="savin-816" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 9016" driver="savin-9016" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 9021d" driver="savin-9021d" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 9025" driver="savin-9025" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 9025b" driver="savin-9025b" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 9033" driver="savin-9033" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 9033b" driver="savin-9033b" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 9040" driver="savin-9040" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 9040b" driver="savin-9040b" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 9050" driver="savin-9050" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 9050b" driver="savin-9050b" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Seiko SpeedJET 200" driver="seiko-sj_200" manufacturer="Seiko" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="Sharp AR-161" driver="sharp-ar-161" manufacturer="Sharp" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Sharp AR-M257" driver="sharp-ar-m257" manufacturer="Sharp" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Sony IJP-V100" driver="sony-ijp-v100" manufacturer="Sony" model="601" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="Star LS-04" driver="star-ls-04" manufacturer="Star" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="Star LaserPrinter 8" driver="star-lp_8" manufacturer="Star" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="Tally MT908" driver="tally-mt908" manufacturer="Tally" model="3" parameters="pcl_laser_params" />
+      <printer translate="name" name="Xerox Able 1406" driver="xerox-able_1406" manufacturer="Xerox" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Xerox DocuPrint 4508" driver="xerox-dp_4508" manufacturer="Xerox" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Xerox DocuPrint C20" driver="xerox-dp_c20" manufacturer="Xerox" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Xerox DocuPrint N4512" driver="xerox-dp_n4512" manufacturer="Xerox" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Xerox DocuPrint N4512PS" driver="xerox-dp_n4512ps" manufacturer="Xerox" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Xerox DocuPrint P12" driver="xerox-dp_p12" manufacturer="Xerox" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="Xerox DocuPrint P1202" driver="xerox-dp_p1202" manufacturer="Xerox" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Xerox DocuPrint P8e" driver="xerox-dp_p8e" manufacturer="Xerox" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Xerox Document Centre 400" driver="xerox-dc_400" manufacturer="Xerox" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Xerox WorkCentre M118" driver="xerox-wc_m118" manufacturer="Xerox" model="6" parameters="pcl_laser_params" />
+    </family>
+    <family name="lexmark">
+      <parameters name="standard_params">
+        <parameter type="float" name="MagentaGamma">0.95</parameter>
+        <parameter type="float" name="Gamma">0.5</parameter>
+        <parameter type="float" name="Density">2.0</parameter>
+      </parameters>
+      <printer translate="name" name="Compaq IJ1200" driver="compaq-ij1200" manufacturer="Compaq" model="10042" parameters="standard_params" />
+      <printer translate="name" name="Lexmark X73" driver="lexmark-x73" manufacturer="Lexmark" model="10042" parameters="standard_params" />
+      <printer translate="name" name="Lexmark Z42" driver="lexmark-z42" manufacturer="Lexmark" model="10042" parameters="standard_params" />
+      <printer translate="name" name="Lexmark Z43" driver="lexmark-z43" manufacturer="Lexmark" model="10042" parameters="standard_params" />
+      <printer translate="name" name="Lexmark Z52" driver="lexmark-z52" manufacturer="Lexmark" model="10052" parameters="standard_params" />
+      <printer translate="name" name="Lexmark Z53" driver="lexmark-z53" manufacturer="Lexmark" model="10052" parameters="standard_params" />
+    </family>
+    <family name="dyesub">
+      <printer translate="name" name="Olympus P-10" driver="olympus-p10" manufacturer="Olympus" model="2" />
+      <printer translate="name" name="Olympus P-11" driver="olympus-p11" manufacturer="Olympus" model="2" />
+      <printer translate="name" name="Olympus P-200" driver="olympus-p200" manufacturer="Olympus" model="4" />
+      <printer translate="name" name="Olympus P-300" driver="olympus-p300" manufacturer="Olympus" model="0" />
+      <printer translate="name" name="Olympus P-300E" driver="olympus-p300e" manufacturer="Olympus" model="0" />
+      <printer translate="name" name="Olympus P-300U" driver="olympus-p300u" manufacturer="Olympus" model="0" />
+      <printer translate="name" name="Olympus P-330E" driver="olympus-p330e" manufacturer="Olympus" model="0" />
+      <printer translate="name" name="Olympus P-330NE" driver="olympus-p330ne" manufacturer="Olympus" model="0" />
+      <printer translate="name" name="Olympus P-400" driver="olympus-p400" manufacturer="Olympus" model="1" />
+      <printer translate="name" name="Olympus P-440" driver="olympus-p440" manufacturer="Olympus" model="3" />
+      <printer translate="name" name="Olympus P-S100" driver="olympus-ps100" manufacturer="Olympus" model="20" />
+      <printer translate="name" name="Canon CP-10" driver="canon-cp10" manufacturer="Canon" model="1002" />
+      <printer translate="name" name="Canon CP-100" driver="canon-cp100" manufacturer="Canon" model="1000" />
+      <printer translate="name" name="Canon CP-200" driver="canon-cp200" manufacturer="Canon" model="1000" />
+      <printer translate="name" name="Canon CP-220" driver="canon-cp220" manufacturer="Canon" model="1001" />
+      <printer translate="name" name="Canon CP-300" driver="canon-cp300" manufacturer="Canon" model="1000" />
+      <printer translate="name" name="Canon CP-330" driver="canon-cp330" manufacturer="Canon" model="1001" />
+      <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-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" />
+      <printer translate="name" name="Canon SELPHY-CP-730" driver="canon-cp730" manufacturer="Canon" model="1001" />
+      <printer translate="name" name="Canon SELPHY-CP-740" driver="canon-cp740" manufacturer="Canon" model="1001" />
+      <printer translate="name" name="Canon SELPHY-CP-750" driver="canon-cp750" manufacturer="Canon" model="1001" />
+      <printer translate="name" name="Canon SELPHY ES1" driver="canon-es1" manufacturer="Canon" model="1003" />
+      <printer translate="name" name="Canon SELPHY ES2" driver="canon-es2" manufacturer="Canon" model="1003" />
+      <printer translate="name" name="Canon SELPHY ES20" driver="canon-es20" manufacturer="Canon" model="1003" />
+      <printer translate="name" name="Sony DPP-EX5" driver="sony-dppex5" manufacturer="Sony" model="2002" />
+      <printer translate="name" name="Sony DPP-EX7" driver="sony-dppex5" manufacturer="Sony" model="2002" />
+      <printer translate="name" name="Sony UP-DP10" driver="sony-updp10" manufacturer="Sony" model="2000" />
+      <printer translate="name" name="Sony UP-DR100" driver="sony-updr100" manufacturer="Sony" model="2003" />
+      <printer translate="name" name="Sony UP-DR150" driver="sony-updr150" manufacturer="Sony" model="2001" />
+      <printer translate="name" name="Fujifilm Printpix-CX-400" driver="fujifilm-cx400" manufacturer="Fujifilm" model="3000" />
+      <printer translate="name" name="Fujifilm Printpix-CX-550" driver="fujifilm-cx550" manufacturer="Fujifilm" model="3001" />
+      <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"/>
+    </family>
+    <family name="raw">
+      <printer translate="name" name="RAW DATA 16 bit" driver="raw-data-16" manufacturer="" model="0" />
+      <printer translate="name" name="RAW DATA 8 bit" driver="raw-data-8" manufacturer="" model="1" />
+    </family>
+  </printdef>
+</gutenprint>