Imported Upstream version 5.2.10~pre1

author: Didier Raboud <odyx@debian.org> 2014-04-16 08:13:23 +0200
committer: Didier Raboud <odyx@debian.org> 2014-04-16 08:13:23 +0200
commit: d7d42f6c969dc54157d85b7b6b611581bbfa7595 (patch)
tree: dfa630457b374b77f1f128cbc9104ea2d6963575 /src/xml/escp2/inks
parent: ccd50c2bd4db57503722816aa23a5092cbe69f40 (diff)
47 files changed, 1063 insertions, 115 deletions
diff --git a/src/xml/escp2/inks/Makefile.am b/src/xml/escp2/inks/Makefile.am
index cb0e8b0..17ceaa0 100644
--- a/src/xml/escp2/inks/Makefile.am
+++ b/src/xml/escp2/inks/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.13 2011/03/05 18:49:13 rlk Exp $
+## $Id: Makefile.am,v 1.15 2014/01/23 13:22:41 rlk Exp $
 ## Copyright (C) 2008 Robert Krawitz
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -63,8 +63,10 @@ pkgxmldata_DATA =				\
 	pro_ultrachrome_k34.xml			\
 	pro_ultrachrome_k3v.xml			\
 	pro_ultrachrome_k3v4.xml		\
+	pro_ultrachrome_k3v10.xml		\
 	standard.xml				\
 	standard_gen0.xml			\
+	sx445.xml				\
 	ultrachrome.xml				\
 	wf40.xml				\
 	wf500.xml				\
diff --git a/src/xml/escp2/inks/Makefile.in b/src/xml/escp2/inks/Makefile.in
index 367177b..208bb1f 100644
--- a/src/xml/escp2/inks/Makefile.in
+++ b/src/xml/escp2/inks/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 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.
@@ -21,6 +20,51 @@
 #export STP_DATA_PATH = $(top_srcdir)/src/xml
 
 VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -39,8 +83,8 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(top_srcdir)/scripts/global.mk
+DIST_COMMON = $(top_srcdir)/scripts/global.mk $(srcdir)/Makefile.in \
+	$(srcdir)/Makefile.am $(top_srcdir)/scripts/mkinstalldirs
 subdir = src/xml/escp2/inks
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
@@ -60,8 +104,25 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -83,12 +144,20 @@ am__nobase_list = $(am__nobase_strip_setup); \
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(pkgxmldatadir)"
 DATA = $(pkgxmldata_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -146,6 +215,7 @@ GUTENPRINTUI2_INTERFACE_AGE = @GUTENPRINTUI2_INTERFACE_AGE@
 GUTENPRINTUI2_LIBDEPS = @GUTENPRINTUI2_LIBDEPS@
 GUTENPRINTUI2_LIBS = $(top_builddir)/src/gutenprintui2/libgutenprintui2.la
 GUTENPRINTUI2_VERSION = @GUTENPRINTUI2_VERSION@
+GUTENPRINT_BASE_VERSION = @GUTENPRINT_BASE_VERSION@
 GUTENPRINT_BINARY_AGE = @GUTENPRINT_BINARY_AGE@
 GUTENPRINT_CFLAGS = @GUTENPRINT_CFLAGS@
 GUTENPRINT_CURRENT_INTERFACE = @GUTENPRINT_CURRENT_INTERFACE@
@@ -157,6 +227,7 @@ 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_RELEASE_VERSION = @GUTENPRINT_RELEASE_VERSION@
 GUTENPRINT_VERSION = @GUTENPRINT_VERSION@
 IJS_CFLAGS = @IJS_CFLAGS@
 IJS_CONFIG = @IJS_CONFIG@
@@ -181,6 +252,8 @@ LIBREADLINE_DEPS = @LIBREADLINE_DEPS@
 LIBS = $(INTLLIBS) @LIBS@
 LIBTOOL = @LIBTOOL@
 LIBTOOL_DEPS = @LIBTOOL_DEPS@
+LIBUSB_CFLAGS = @LIBUSB_CFLAGS@
+LIBUSB_LIBS = @LIBUSB_LIBS@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTALLOCA = @LTALLOCA@
@@ -339,8 +412,10 @@ pkgxmldata_DATA = \
 	pro_ultrachrome_k34.xml			\
 	pro_ultrachrome_k3v.xml			\
 	pro_ultrachrome_k3v4.xml		\
+	pro_ultrachrome_k3v10.xml		\
 	standard.xml				\
 	standard_gen0.xml			\
+	sx445.xml				\
 	ultrachrome.xml				\
 	wf40.xml				\
 	wf500.xml				\
@@ -372,6 +447,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
+$(top_srcdir)/scripts/global.mk:
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -389,8 +465,11 @@ clean-libtool:
 	-rm -rf .libs _libs
 install-pkgxmldataDATA: $(pkgxmldata_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(pkgxmldatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgxmldatadir)"
 	@list='$(pkgxmldata_DATA)'; test -n "$(pkgxmldatadir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgxmldatadir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(pkgxmldatadir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -404,14 +483,12 @@ uninstall-pkgxmldataDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(pkgxmldata_DATA)'; test -n "$(pkgxmldatadir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(pkgxmldatadir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(pkgxmldatadir)" && rm -f $$files
-tags: TAGS
-TAGS:
+	dir='$(DESTDIR)$(pkgxmldatadir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
 
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -464,10 +541,15 @@ install-am: all-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
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -549,16 +631,17 @@ uninstall-am: uninstall-pkgxmldataDATA
 .MAKE: install-am install-strip
 
 .PHONY: all all-am all-local check check-am clean clean-generic \
-	clean-libtool dist-hook distclean distclean-generic \
-	distclean-libtool distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pkgxmldataDATA install-ps \
-	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
+	clean-libtool cscopelist-am ctags-am dist-hook distclean \
+	distclean-generic distclean-libtool distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-pkgxmldataDATA install-ps 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 tags-am uninstall \
+	uninstall-am uninstall-pkgxmldataDATA
 
 
 @SET_MAKE@
diff --git a/src/xml/escp2/inks/artisan.xml b/src/xml/escp2/inks/artisan.xml
index 283c12f..3b69f80 100644
--- a/src/xml/escp2/inks/artisan.xml
+++ b/src/xml/escp2/inks/artisan.xml
@@ -20,7 +20,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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="artisan">
+<escp2InkGroup name="artisan">
 <InkList translate="text" name="None" text="EPSON Standard Inks">
  <Shades>
   <shade count="1">1.000000</shade>
@@ -281,5 +281,5 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   </Channels>
  </InkName>
 </InkList>
-</escp2:InkGroup>
+</escp2InkGroup>
 </gutenprint>
diff --git a/src/xml/escp2/inks/b500.xml b/src/xml/escp2/inks/b500.xml
index b05cc3a..9cb8d9d 100644
--- a/src/xml/escp2/inks/b500.xml
+++ b/src/xml/escp2/inks/b500.xml
@@ -20,7 +20,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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">
+<escp2InkGroup name="b500">
 <InkList translate="text" name="None" text="EPSON Standard Inks">
  <Shades>
   <shade count="1">1.000000</shade>
@@ -150,5 +150,5 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   </Channels>
  </InkName>
 </InkList>
-</escp2:InkGroup>
+</escp2InkGroup>
 </gutenprint>
diff --git a/src/xml/escp2/inks/c120.xml b/src/xml/escp2/inks/c120.xml
index 40f360f..3f76227 100644
--- a/src/xml/escp2/inks/c120.xml
+++ b/src/xml/escp2/inks/c120.xml
@@ -20,7 +20,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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">
+<escp2InkGroup name="c120">
 <InkList translate="text" name="None" text="EPSON Standard Inks">
  <Shades>
   <shade count="1">1.000000</shade>
@@ -138,5 +138,5 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   </Channels>
  </InkName>
 </InkList>
-</escp2:InkGroup>
+</escp2InkGroup>
 </gutenprint>
diff --git a/src/xml/escp2/inks/c64.xml b/src/xml/escp2/inks/c64.xml
index bcae2c3..add88ab 100644
--- a/src/xml/escp2/inks/c64.xml
+++ b/src/xml/escp2/inks/c64.xml
@@ -20,7 +20,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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">
+<escp2InkGroup name="c64">
 <InkList translate="text" name="None" text="EPSON Standard Inks">
  <Shades>
   <shade count="1">1.000000</shade>
@@ -204,5 +204,5 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   </Channels>
  </InkName>
 </InkList>
-</escp2:InkGroup>
+</escp2InkGroup>
 </gutenprint>
diff --git a/src/xml/escp2/inks/c80.xml b/src/xml/escp2/inks/c80.xml
index 7528a47..91b174d 100644
--- a/src/xml/escp2/inks/c80.xml
+++ b/src/xml/escp2/inks/c80.xml
@@ -20,7 +20,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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">
+<escp2InkGroup name="c80">
 <InkList translate="text" name="None" text="EPSON Standard Inks">
  <Shades>
   <shade count="1">1.000000</shade>
@@ -205,5 +205,5 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   </Channels>
  </InkName>
 </InkList>
-</escp2:InkGroup>
+</escp2InkGroup>
 </gutenprint>
diff --git a/src/xml/escp2/inks/c82.xml b/src/xml/escp2/inks/c82.xml
index 66d6e47..48685a3 100644
--- a/src/xml/escp2/inks/c82.xml
+++ b/src/xml/escp2/inks/c82.xml
@@ -20,7 +20,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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">
+<escp2InkGroup name="c82">
 <InkList translate="text" name="None" text="EPSON Standard Inks">
  <Shades>
   <shade count="1">1.000000</shade>
@@ -205,5 +205,5 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   </Channels>
  </InkName>
 </InkList>
-</escp2:InkGroup>
+</escp2InkGroup>
 </gutenprint>
diff --git a/src/xml/escp2/inks/claria.xml b/src/xml/escp2/inks/claria.xml
index 9c492eb..81747c8 100644
--- a/src/xml/escp2/inks/claria.xml
+++ b/src/xml/escp2/inks/claria.xml
@@ -20,7 +20,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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">
+<escp2InkGroup name="claria">
 <InkList translate="text" name="None" text="EPSON Standard Inks">
  <Shades>
   <shade count="1">1.000000</shade>
@@ -399,5 +399,5 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   </Channels>
  </InkName>
 </InkList>
-</escp2:InkGroup>
+</escp2InkGroup>
 </gutenprint>
diff --git a/src/xml/escp2/inks/cmy.xml b/src/xml/escp2/inks/cmy.xml
index d6d362f..fbaa098 100644
--- a/src/xml/escp2/inks/cmy.xml
+++ b/src/xml/escp2/inks/cmy.xml
@@ -20,7 +20,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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">
+<escp2InkGroup name="cmy">
 <InkList translate="text" name="None" text="EPSON Standard Inks">
  <Shades>
   <shade count="1">1.000000</shade>
@@ -52,5 +52,5 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   </Channels>
  </InkName>
 </InkList>
-</escp2:InkGroup>
+</escp2InkGroup>
 </gutenprint>
diff --git a/src/xml/escp2/inks/cmykrb.xml b/src/xml/escp2/inks/cmykrb.xml
index c8853c4..f53eec6 100644
--- a/src/xml/escp2/inks/cmykrb.xml
+++ b/src/xml/escp2/inks/cmykrb.xml
@@ -20,7 +20,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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">
+<escp2InkGroup name="cmykrb">
 <Curves>
  <curve name="cmykrbCyan" wrap="wrap" type="linear" gamma="0" piecewise="false">
   <sequence count="48" lower-bound="0" upper-bound="1">
@@ -660,5 +660,5 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   </Channels>
  </InkName>
 </InkList>
-</escp2:InkGroup>
+</escp2InkGroup>
 </gutenprint>
diff --git a/src/xml/escp2/inks/cmykro.xml b/src/xml/escp2/inks/cmykro.xml
index 8cf8cf1..50decb4 100644
--- a/src/xml/escp2/inks/cmykro.xml
+++ b/src/xml/escp2/inks/cmykro.xml
@@ -20,7 +20,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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">
+<escp2InkGroup name="cmykro">
 <Curves>
  <curve name="cmykroCyan" wrap="wrap" type="linear" gamma="0" piecewise="false">
   <sequence count="48" lower-bound="0" upper-bound="1">
@@ -659,5 +659,5 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   </Channels>
  </InkName>
 </InkList>
-</escp2:InkGroup>
+</escp2InkGroup>
 </gutenprint>
diff --git a/src/xml/escp2/inks/cx3650.xml b/src/xml/escp2/inks/cx3650.xml
index 77d908b..004d6b1 100644
--- a/src/xml/escp2/inks/cx3650.xml
+++ b/src/xml/escp2/inks/cx3650.xml
@@ -20,7 +20,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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">
+<escp2InkGroup name="cx3650">
 <InkList translate="text" name="None" text="EPSON Standard Inks">
  <Shades>
   <shade count="1">1.000000</shade>
@@ -204,5 +204,5 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   </Channels>
  </InkName>
 </InkList>
-</escp2:InkGroup>
+</escp2InkGroup>
 </gutenprint>
diff --git a/src/xml/escp2/inks/defaultblack.xml b/src/xml/escp2/inks/defaultblack.xml
index 2d0f6e6..e520b15 100644
--- a/src/xml/escp2/inks/defaultblack.xml
+++ b/src/xml/escp2/inks/defaultblack.xml
@@ -20,7 +20,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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">
+<escp2InkGroup name="defaultblack">
 <InkList translate="text" name="None" text="EPSON Standard Inks">
  <Shades>
   <shade count="1">1.000000</shade>
@@ -36,5 +36,5 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   </Channels>
  </InkName>
 </InkList>
-</escp2:InkGroup>
+</escp2InkGroup>
 </gutenprint>
diff --git a/src/xml/escp2/inks/f360.xml b/src/xml/escp2/inks/f360.xml
index ef33d13..be01d2c 100644
--- a/src/xml/escp2/inks/f360.xml
+++ b/src/xml/escp2/inks/f360.xml
@@ -20,7 +20,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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">
+<escp2InkGroup name="f360">
 <InkList translate="text" name="None" text="EPSON Standard Inks">
  <Shades>
   <shade count="1">1.000000</shade>
@@ -205,5 +205,5 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   </Channels>
  </InkName>
 </InkList>
-</escp2:InkGroup>
+</escp2InkGroup>
 </gutenprint>
diff --git a/src/xml/escp2/inks/f360_photo.xml b/src/xml/escp2/inks/f360_photo.xml
index 0efd6b9..0128197 100644
--- a/src/xml/escp2/inks/f360_photo.xml
+++ b/src/xml/escp2/inks/f360_photo.xml
@@ -20,7 +20,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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">
+<escp2InkGroup name="f360_photo">
 <InkList translate="text" name="None" text="EPSON Standard Inks">
  <Shades>
   <shade count="1">1.000000</shade>
@@ -281,5 +281,5 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   </Channels>
  </InkName>
 </InkList>
-</escp2:InkGroup>
+</escp2InkGroup>
 </gutenprint>
diff --git a/src/xml/escp2/inks/f360_photo7_japan.xml b/src/xml/escp2/inks/f360_photo7_japan.xml
index bc18d1f..50b10c7 100644
--- a/src/xml/escp2/inks/f360_photo7_japan.xml
+++ b/src/xml/escp2/inks/f360_photo7_japan.xml
@@ -20,7 +20,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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">
+<escp2InkGroup name="f360_photo7_japan">
 <InkList translate="text" name="None" text="EPSON Standard Inks">
  <Shades>
   <shade count="1">1.000000</shade>
@@ -415,5 +415,5 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   </Channels>
  </InkName>
 </InkList>
-</escp2:InkGroup>
+</escp2InkGroup>
 </gutenprint>
diff --git a/src/xml/escp2/inks/f360_ultrachrome.xml b/src/xml/escp2/inks/f360_ultrachrome.xml
index 464e060..c9332cf 100644
--- a/src/xml/escp2/inks/f360_ultrachrome.xml
+++ b/src/xml/escp2/inks/f360_ultrachrome.xml
@@ -20,7 +20,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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">
+<escp2InkGroup name="f360_ultrachrome">
 <InkList translate="text" name="ultraphoto" text="UltraChrome Photo Black">
  <Shades>
   <shade count="2">1.000000 0.480000</shade>
@@ -786,5 +786,5 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   </Channels>
  </InkName>
 </InkList>
-</escp2:InkGroup>
+</escp2InkGroup>
 </gutenprint>
diff --git a/src/xml/escp2/inks/f360_ultrachrome_k3.xml b/src/xml/escp2/inks/f360_ultrachrome_k3.xml
index 0d3b142..0036f8b 100644
--- a/src/xml/escp2/inks/f360_ultrachrome_k3.xml
+++ b/src/xml/escp2/inks/f360_ultrachrome_k3.xml
@@ -20,7 +20,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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">
+<escp2InkGroup name="f360_ultrachrome_k3">
 <InkList translate="text" name="ultra3photo" text="Photo Black">
  <Shades>
   <shade count="3">1.000000 0.480000 0.160000</shade>
@@ -604,5 +604,5 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   </Channels>
  </InkName>
 </InkList>
-</escp2:InkGroup>
+</escp2InkGroup>
 </gutenprint>
diff --git a/src/xml/escp2/inks/f360_ultrachrome_k3v.xml b/src/xml/escp2/inks/f360_ultrachrome_k3v.xml
index 4660f47..4dd2839 100644
--- a/src/xml/escp2/inks/f360_ultrachrome_k3v.xml
+++ b/src/xml/escp2/inks/f360_ultrachrome_k3v.xml
@@ -20,7 +20,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   along with this program; if not, write to the Free Software
  *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 </copyright>
-<escp2:InkGroup name="f360_ultrachrome_k3v">
+<escp2InkGroup name="f360_ultrachrome_k3v">
 <InkList translate="text" name="ultra3photo" text="Photo Black">
  <Shades>
   <shade count="3">1.000000 0.480000 0.160000</shade>
@@ -604,5 +604,5 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   </Channels>
  </InkName>
 </InkList>
-</escp2:InkGroup>
+</escp2InkGroup>
 </gutenprint>
diff --git a/src/xml/escp2/inks/f360_ultrachrome_k3v_2.xml b/src/xml/escp2/inks/f360_ultrachrome_k3v_2.xml
index e759cb1..0281046 100644
--- a/src/xml/escp2/inks/f360_ultrachrome_k3v_2.xml
+++ b/src/xml/escp2/inks/f360_ultrachrome_k3v_2.xml
@@ -20,7 +20,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   along with this program; if not, write to the Free Software
  *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 </copyright>
-<escp2:InkGroup name="f360_ultrachrome_k3v">
+<escp2InkGroup name="f360_ultrachrome_k3v">
 <InkList translate="text" name="ultra3photo" text="Photo Black">
  <initSequence>IK\002\000\000\061</initSequence>
  <Shades>
@@ -606,5 +606,5 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   </Channels>
  </InkName>
 </InkList>
-</escp2:InkGroup>
+</escp2InkGroup>
 </gutenprint>
diff --git a/src/xml/escp2/inks/nx100.xml b/src/xml/escp2/inks/nx100.xml
index 7c3538f..6dd412a 100644
--- a/src/xml/escp2/inks/nx100.xml
+++ b/src/xml/escp2/inks/nx100.xml
@@ -20,7 +20,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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">
+<escp2InkGroup name="nx100">
 <InkList translate="text" name="None" text="EPSON Standard Inks">
  <Shades>
   <shade count="1">1.000000</shade>
@@ -135,5 +135,5 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   </Channels>
  </InkName>
 </InkList>
-</escp2:InkGroup>
+</escp2InkGroup>
 </gutenprint>
diff --git a/src/xml/escp2/inks/photo_gen0.xml b/src/xml/escp2/inks/photo_gen0.xml
index 9231583..e4dcd4c 100644
--- a/src/xml/escp2/inks/photo_gen0.xml
+++ b/src/xml/escp2/inks/photo_gen0.xml
@@ -20,7 +20,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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">
+<escp2InkGroup name="photo_gen0">
 <InkList translate="text" name="None" text="EPSON Standard Inks">
  <Shades>
   <shade count="1">1.000000</shade>
@@ -398,5 +398,5 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   </Channels>
  </InkName>
 </InkList>
-</escp2:InkGroup>
+</escp2InkGroup>
 </gutenprint>
diff --git a/src/xml/escp2/inks/photo_gen1.xml b/src/xml/escp2/inks/photo_gen1.xml
index 7bf0e59..be7c6ba 100644
--- a/src/xml/escp2/inks/photo_gen1.xml
+++ b/src/xml/escp2/inks/photo_gen1.xml
@@ -20,7 +20,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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">
+<escp2InkGroup name="photo_gen1">
 <InkList translate="text" name="None" text="EPSON Standard Inks">
  <Shades>
   <shade count="1">1.000000</shade>
@@ -398,5 +398,5 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   </Channels>
  </InkName>
 </InkList>
-</escp2:InkGroup>
+</escp2InkGroup>
 </gutenprint>
diff --git a/src/xml/escp2/inks/photo_gen2.xml b/src/xml/escp2/inks/photo_gen2.xml
index ebddcbc..1d2efc7 100644
--- a/src/xml/escp2/inks/photo_gen2.xml
+++ b/src/xml/escp2/inks/photo_gen2.xml
@@ -20,7 +20,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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">
+<escp2InkGroup name="photo_gen2">
 <InkList translate="text" name="None" text="EPSON Standard Inks">
  <Shades>
   <shade count="1">1.000000</shade>
@@ -398,5 +398,5 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   </Channels>
  </InkName>
 </InkList>
-</escp2:InkGroup>
+</escp2InkGroup>
 </gutenprint>
diff --git a/src/xml/escp2/inks/photo_gen3.xml b/src/xml/escp2/inks/photo_gen3.xml
index 9b23ff4..e899b4b 100644
--- a/src/xml/escp2/inks/photo_gen3.xml
+++ b/src/xml/escp2/inks/photo_gen3.xml
@@ -20,7 +20,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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">
+<escp2InkGroup name="photo_gen3">
 <InkList translate="text" name="None" text="EPSON Standard Inks">
  <Shades>
   <shade count="1">1.000000</shade>
@@ -398,5 +398,5 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   </Channels>
  </InkName>
 </InkList>
-</escp2:InkGroup>
+</escp2InkGroup>
 </gutenprint>
diff --git a/src/xml/escp2/inks/photo_gen3_4.xml b/src/xml/escp2/inks/photo_gen3_4.xml
index 7d40057..1b83402 100644
--- a/src/xml/escp2/inks/photo_gen3_4.xml
+++ b/src/xml/escp2/inks/photo_gen3_4.xml
@@ -20,7 +20,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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">
+<escp2InkGroup name="photo_gen3_4">
 <InkList translate="text" name="None" text="EPSON Standard Inks">
  <Shades>
   <shade count="1">1.000000</shade>
@@ -205,5 +205,5 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   </Channels>
  </InkName>
 </InkList>
-</escp2:InkGroup>
+</escp2InkGroup>
 </gutenprint>
diff --git a/src/xml/escp2/inks/photo_gen4.xml b/src/xml/escp2/inks/photo_gen4.xml
index 1457e32..2283184 100644
--- a/src/xml/escp2/inks/photo_gen4.xml
+++ b/src/xml/escp2/inks/photo_gen4.xml
@@ -20,7 +20,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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">
+<escp2InkGroup name="photo_gen3">
 <InkList translate="text" name="None" text="EPSON Standard Inks">
  <Shades>
   <shade count="1">1.000000</shade>
@@ -281,5 +281,5 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   </Channels>
  </InkName>
 </InkList>
-</escp2:InkGroup>
+</escp2InkGroup>
 </gutenprint>
diff --git a/src/xml/escp2/inks/photo_pigment.xml b/src/xml/escp2/inks/photo_pigment.xml
index f7781ec..f63cb69 100644
--- a/src/xml/escp2/inks/photo_pigment.xml
+++ b/src/xml/escp2/inks/photo_pigment.xml
@@ -20,7 +20,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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">
+<escp2InkGroup name="photo_pigment">
 <InkList translate="text" name="None" text="EPSON Standard Inks">
  <Shades>
   <shade count="1">1.000000</shade>
@@ -281,5 +281,5 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   </Channels>
  </InkName>
 </InkList>
-</escp2:InkGroup>
+</escp2InkGroup>
 </gutenprint>
diff --git a/src/xml/escp2/inks/picturemate_4.xml b/src/xml/escp2/inks/picturemate_4.xml
index b48f5f3..602992c 100644
--- a/src/xml/escp2/inks/picturemate_4.xml
+++ b/src/xml/escp2/inks/picturemate_4.xml
@@ -20,7 +20,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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">
+<escp2InkGroup name="picturemate_4">
 <InkList translate="text" name="picturemate_4" text="Standard">
  <Shades>
   <shade count="1">1.000000</shade>
@@ -82,5 +82,5 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   </Channels>
  </InkName>
 </InkList>
-</escp2:InkGroup>
+</escp2InkGroup>
 </gutenprint>
diff --git a/src/xml/escp2/inks/picturemate_6.xml b/src/xml/escp2/inks/picturemate_6.xml
index fa5068a..418de94 100644
--- a/src/xml/escp2/inks/picturemate_6.xml
+++ b/src/xml/escp2/inks/picturemate_6.xml
@@ -20,7 +20,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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">
+<escp2InkGroup name="picturemate_6">
 <InkList translate="text" name="picturemate_6" text="Standard">
  <Shades>
   <shade count="1">1.000000</shade>
@@ -216,5 +216,5 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   </Channels>
  </InkName>
 </InkList>
-</escp2:InkGroup>
+</escp2InkGroup>
 </gutenprint>
diff --git a/src/xml/escp2/inks/pro_gen1.xml b/src/xml/escp2/inks/pro_gen1.xml
index dab731f..d1a2760 100644
--- a/src/xml/escp2/inks/pro_gen1.xml
+++ b/src/xml/escp2/inks/pro_gen1.xml
@@ -20,7 +20,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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">
+<escp2InkGroup name="pro_gen1">
 <InkList translate="text" name="None" text="EPSON Standard Inks">
  <Shades>
   <shade count="1">1.000000</shade>
@@ -398,5 +398,5 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   </Channels>
  </InkName>
 </InkList>
-</escp2:InkGroup>
+</escp2InkGroup>
 </gutenprint>
diff --git a/src/xml/escp2/inks/pro_gen2.xml b/src/xml/escp2/inks/pro_gen2.xml
index bf21a18..f005b6c 100644
--- a/src/xml/escp2/inks/pro_gen2.xml
+++ b/src/xml/escp2/inks/pro_gen2.xml
@@ -20,7 +20,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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">
+<escp2InkGroup name="pro_gen2">
 <InkList translate="text" name="None" text="EPSON Standard Inks">
  <Shades>
   <shade count="1">1.000000</shade>
@@ -398,5 +398,5 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   </Channels>
  </InkName>
 </InkList>
-</escp2:InkGroup>
+</escp2InkGroup>
 </gutenprint>
diff --git a/src/xml/escp2/inks/pro_pigment.xml b/src/xml/escp2/inks/pro_pigment.xml
index baf5b93..340688c 100644
--- a/src/xml/escp2/inks/pro_pigment.xml
+++ b/src/xml/escp2/inks/pro_pigment.xml
@@ -20,7 +20,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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">
+<escp2InkGroup name="pro_pigment">
 <InkList translate="text" name="None" text="EPSON Standard Inks">
  <Shades>
   <shade count="1">1.000000</shade>
@@ -281,5 +281,5 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   </Channels>
  </InkName>
 </InkList>
-</escp2:InkGroup>
+</escp2InkGroup>
 </gutenprint>
diff --git a/src/xml/escp2/inks/pro_ultrachrome.xml b/src/xml/escp2/inks/pro_ultrachrome.xml
index 675aa57..637e58c 100644
--- a/src/xml/escp2/inks/pro_ultrachrome.xml
+++ b/src/xml/escp2/inks/pro_ultrachrome.xml
@@ -20,7 +20,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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">
+<escp2InkGroup name="pro_ultrachrome">
 <InkList translate="text" name="ultraphoto" text="UltraChrome Photo Black">
 <Shades>
  <shade count="2">1.000000 0.480000</shade>
@@ -786,5 +786,5 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   </Channels>
  </InkName>
 </InkList>
-</escp2:InkGroup>
+</escp2InkGroup>
 </gutenprint>
diff --git a/src/xml/escp2/inks/pro_ultrachrome_k3.xml b/src/xml/escp2/inks/pro_ultrachrome_k3.xml
index dd9ae97..74e76be 100644
--- a/src/xml/escp2/inks/pro_ultrachrome_k3.xml
+++ b/src/xml/escp2/inks/pro_ultrachrome_k3.xml
@@ -20,7 +20,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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">
+<escp2InkGroup name="pro_ultrachrome_k3">
 <InkList translate="text" name="ultra3photo" text="Photo Black">
  <initSequence>IK\002\000\000\061</initSequence>
  <Shades>
@@ -606,5 +606,5 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   </Channels>
  </InkName>
 </InkList>
-</escp2:InkGroup>
+</escp2InkGroup>
 </gutenprint>
diff --git a/src/xml/escp2/inks/pro_ultrachrome_k34.xml b/src/xml/escp2/inks/pro_ultrachrome_k34.xml
index 941ab5d..7077f4c 100644
--- a/src/xml/escp2/inks/pro_ultrachrome_k34.xml
+++ b/src/xml/escp2/inks/pro_ultrachrome_k34.xml
@@ -20,7 +20,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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">
+<escp2InkGroup name="pro_ultrachrome_k3">
 <InkList translate="text" name="ultra3photo" text="Photo Black">
  <initSequence>IK\002\000\000\061</initSequence>
  <Shades>
@@ -200,5 +200,5 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   </Channels>
  </InkName>
 </InkList>
-</escp2:InkGroup>
+</escp2InkGroup>
 </gutenprint>
diff --git a/src/xml/escp2/inks/pro_ultrachrome_k3v.xml b/src/xml/escp2/inks/pro_ultrachrome_k3v.xml
index a217f5f..8a7f6a9 100644
--- a/src/xml/escp2/inks/pro_ultrachrome_k3v.xml
+++ b/src/xml/escp2/inks/pro_ultrachrome_k3v.xml
@@ -20,7 +20,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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_k3v">
+<escp2InkGroup name="pro_ultrachrome_k3v">
 <InkList translate="text" name="ultra3photo" text="Photo Black">
  <initSequence>IK\002\000\000\061</initSequence>
  <Shades>
@@ -606,5 +606,5 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   </Channels>
  </InkName>
 </InkList>
-</escp2:InkGroup>
+</escp2InkGroup>
 </gutenprint>
diff --git a/src/xml/escp2/inks/pro_ultrachrome_k3v10.xml b/src/xml/escp2/inks/pro_ultrachrome_k3v10.xml
new file mode 100644
index 0000000..6677137
--- /dev/null
+++ b/src/xml/escp2/inks/pro_ultrachrome_k3v10.xml
@@ -0,0 +1,724 @@
+<?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>
+<escp2InkGroup name="pro_ultrachrome_k3v">
+<InkList translate="text" name="ultra3photo" text="Photo Black">
+ <initSequence>IK\002\000\000\061</initSequence>
+ <Shades>
+  <shade count="3">1.000000 0.480000 0.160000</shade>
+  <shade count="2">1.000000 0.340000</shade>
+  <shade count="2">1.000000 0.250000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <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" name="Black" text="Black" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="DarkGrayTrans"/>
+    </subchannel>
+    <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="DarkGrayTrans"/>
+     <SubchannelValueParam name="DarkGrayValue"/>
+     <SubchannelScaleParam name="DarkGrayScale"/>
+    </subchannel>
+    <subchannel color="0" subchannel="3" name="LightLightBlack" text="Light Light Black" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="LightGrayTrans"/>
+     <SubchannelValueParam name="LightGrayValue"/>
+     <SubchannelScaleParam name="LightGrayScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
+     <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" name="Magenta" text="Magenta" translate="text">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhotoCMYK7" text="Seven Color Photo" InkID="CcMmYKk">
+  <Channels>
+   <channel name="photo2_black" index="0">
+    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+    </subchannel>
+    <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="GrayValue"/>
+     <SubchannelScaleParam name="GrayScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
+     <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" name="Magenta" text="Magenta" translate="text">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK">
+  <Channels>
+   <channel name="black" index="0">
+    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
+     <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" name="Magenta" text="Magenta" translate="text">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhotoCMY" text="Five Color Photo Composite" InkID="CcMmYK">
+  <Channels>
+   <channel name="photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
+     <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" name="Magenta" text="Magenta" translate="text">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
+  <Channels>
+   <channel name="black" index="0">
+    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="CMY" text="Three Color Composite" InkID="CMYK">
+  <Channels>
+   <channel name="standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYKkk" text="Eight Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="black" index="0">
+    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_black" index="1">
+    <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_photo3_black" index="2">
+    <subchannel color="0" subchannel="3" name="LightLightBlack" text="Light Light Black" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="3">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="4">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="5">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="6">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="7">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYKkkOG" text="Ten Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="black" index="0">
+    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_black" index="1">
+    <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_photo3_black" index="2">
+    <subchannel color="0" subchannel="3" name="LightLightBlack" text="Light Light Black" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="3">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="4">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="5">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="6">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="7">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_orange" index="8">
+    <subchannel color="10" name="Orange" text="Orange" translate="text">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_green" index="9">
+    <subchannel color="11" name="Green" text="Green" translate="text">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+
+<InkList translate="text" name="ultra3matte" text="Matte Black">
+ <initSequence>IK\002\000\000\121</initSequence>
+ <Shades>
+  <shade count="3">1.000000 0.278000 0.093000</shade>
+  <shade count="2">1.000000 0.340000</shade>
+  <shade count="2">1.000000 0.250000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <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" name="Black" text="Black" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="DarkGrayTrans"/>
+    </subchannel>
+    <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="DarkGrayTrans"/>
+     <SubchannelValueParam name="DarkGrayValue"/>
+     <SubchannelScaleParam name="DarkGrayScale"/>
+    </subchannel>
+    <subchannel color="0" subchannel="3" name="LightLightBlack" text="Light Light Black" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="LightGrayTrans"/>
+     <SubchannelValueParam name="LightGrayValue"/>
+     <SubchannelScaleParam name="LightGrayScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
+     <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" name="Magenta" text="Magenta" translate="text">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhotoCMYK7" text="Seven Color Photo" InkID="CcMmYKk">
+  <Channels>
+   <channel name="photo2_black" index="0">
+    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+    </subchannel>
+    <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="GrayValue"/>
+     <SubchannelScaleParam name="GrayScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
+     <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" name="Magenta" text="Magenta" translate="text">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK">
+  <Channels>
+   <channel name="black" index="0">
+    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
+     <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" name="Magenta" text="Magenta" translate="text">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhotoCMY" text="Five Color Photo Composite" InkID="CcMmYK">
+  <Channels>
+   <channel name="photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
+     <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" name="Magenta" text="Magenta" translate="text">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
+  <Channels>
+   <channel name="black" index="0">
+    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="CMY" text="Three Color Composite" InkID="CMYK">
+  <Channels>
+   <channel name="standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYKkk" text="Eight Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="black" index="0">
+    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_black" index="1">
+    <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_photo3_black" index="2">
+    <subchannel color="0" subchannel="3" name="LightLightBlack" text="Light Light Black" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="3">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="4">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="5">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="6">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="7">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYKkkOG" text="Ten Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="black" index="0">
+    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_black" index="1">
+    <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_photo3_black" index="2">
+    <subchannel color="0" subchannel="3" name="LightLightBlack" text="Light Light Black" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="3">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="4">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="5">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="6">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="7">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_orange" index="8">
+    <subchannel color="10" name="Orange" text="Orange" translate="text">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_green" index="9">
+    <subchannel color="11" name="Green" text="Green" translate="text">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+</escp2InkGroup>
+</gutenprint>
diff --git a/src/xml/escp2/inks/pro_ultrachrome_k3v4.xml b/src/xml/escp2/inks/pro_ultrachrome_k3v4.xml
index b5c3034..df84750 100644
--- a/src/xml/escp2/inks/pro_ultrachrome_k3v4.xml
+++ b/src/xml/escp2/inks/pro_ultrachrome_k3v4.xml
@@ -20,7 +20,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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_k3v4">
+<escp2InkGroup name="pro_ultrachrome_k3v4">
 <InkList translate="text" name="ultra3photo" text="Photo Black">
  <initSequence>IK\002\000\000\061</initSequence>
  <Shades>
@@ -177,5 +177,5 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   </Channels>
  </InkName>
 </InkList>
-</escp2:InkGroup>
+</escp2InkGroup>
 </gutenprint>
diff --git a/src/xml/escp2/inks/standard.xml b/src/xml/escp2/inks/standard.xml
index 6c811e5..9b13905 100644
--- a/src/xml/escp2/inks/standard.xml
+++ b/src/xml/escp2/inks/standard.xml
@@ -20,7 +20,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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">
+<escp2InkGroup name="standard">
 <InkList translate="text" name="None" text="EPSON Standard Inks">
  <Shades>
   <shade count="1">1.000000</shade>
@@ -205,5 +205,5 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   </Channels>
  </InkName>
 </InkList>
-</escp2:InkGroup>
+</escp2InkGroup>
 </gutenprint>
diff --git a/src/xml/escp2/inks/standard_gen0.xml b/src/xml/escp2/inks/standard_gen0.xml
index 32f36c0..5b7ee5d 100644
--- a/src/xml/escp2/inks/standard_gen0.xml
+++ b/src/xml/escp2/inks/standard_gen0.xml
@@ -20,7 +20,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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">
+<escp2InkGroup name="standard_gen0">
 <InkList translate="text" name="None" text="EPSON Standard Inks">
  <Shades>
   <shade count="1">1.000000</shade>
@@ -205,5 +205,5 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   </Channels>
  </InkName>
 </InkList>
-</escp2:InkGroup>
+</escp2InkGroup>
 </gutenprint>
diff --git a/src/xml/escp2/inks/sx445.xml b/src/xml/escp2/inks/sx445.xml
new file mode 100644
index 0000000..7abb32f
--- /dev/null
+++ b/src/xml/escp2/inks/sx445.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>
+<escp2InkGroup 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" name="Black" text="Black" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c64_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c64_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" headOffset="129" name="Magenta" text="Magenta" translate="text">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c64_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" headOffset="257" name="Yellow" text="Yellow" translate="text">
+     <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" name="Cyan" text="Cyan" translate="text">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c64_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" headOffset="129" name="Magenta" text="Magenta" translate="text">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c64_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" headOffset="257" name="Yellow" text="Yellow" translate="text">
+     <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" name="Black" text="Black" translate="text">
+     <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" name="Cyan" text="Cyan" translate="text">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c64_magenta" index="1">
+    <subchannel color="1" headOffset="129" name="Magenta" text="Magenta" translate="text">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c64_yellow" index="2">
+    <subchannel color="4" headOffset="257" name="Yellow" text="Yellow" translate="text">
+     <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" name="Black" text="Black" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c64_cyan" index="1">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c64_magenta" index="2">
+    <subchannel color="1" headOffset="129" name="Magenta" text="Magenta" translate="text">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c64_yellow" index="3">
+    <subchannel color="4" headOffset="257" name="Yellow" text="Yellow" translate="text">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+</escp2InkGroup>
+</gutenprint>
diff --git a/src/xml/escp2/inks/ultrachrome.xml b/src/xml/escp2/inks/ultrachrome.xml
index e82a5e1..1c180cf 100644
--- a/src/xml/escp2/inks/ultrachrome.xml
+++ b/src/xml/escp2/inks/ultrachrome.xml
@@ -20,7 +20,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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">
+<escp2InkGroup name="ultrachrome">
 <InkList translate="text" name="ultraphoto" text="UltraChrome Photo Black">
  <Shades>
   <shade count="2">1.000000 0.480000</shade>
@@ -786,5 +786,5 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   </Channels>
  </InkName>
 </InkList>
-</escp2:InkGroup>
+</escp2InkGroup>
 </gutenprint>
diff --git a/src/xml/escp2/inks/wf40.xml b/src/xml/escp2/inks/wf40.xml
index 72c5a26..177fdc9 100644
--- a/src/xml/escp2/inks/wf40.xml
+++ b/src/xml/escp2/inks/wf40.xml
@@ -20,7 +20,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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">
+<escp2InkGroup name="wf40">
 <InkList translate="text" name="None" text="EPSON Standard Inks">
  <Shades>
   <shade count="1">1.000000</shade>
@@ -138,5 +138,5 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   </Channels>
  </InkName>
 </InkList>
-</escp2:InkGroup>
+</escp2InkGroup>
 </gutenprint>
diff --git a/src/xml/escp2/inks/wf500.xml b/src/xml/escp2/inks/wf500.xml
index 30685b1..073f632 100644
--- a/src/xml/escp2/inks/wf500.xml
+++ b/src/xml/escp2/inks/wf500.xml
@@ -20,7 +20,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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">
+<escp2InkGroup name="wf500">
 <InkList translate="text" name="None" text="EPSON Standard Inks">
  <Shades>
   <shade count="1">1.000000</shade>
@@ -135,5 +135,5 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   </Channels>
  </InkName>
 </InkList>
-</escp2:InkGroup>
+</escp2InkGroup>
 </gutenprint>
diff --git a/src/xml/escp2/inks/x80.xml b/src/xml/escp2/inks/x80.xml
index 5aa670d..80ce8e8 100644
--- a/src/xml/escp2/inks/x80.xml
+++ b/src/xml/escp2/inks/x80.xml
@@ -20,7 +20,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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">
+<escp2InkGroup name="x80">
 <InkList translate="text" name="None" text="EPSON Standard Inks">
  <Shades>
   <shade count="1">1.000000</shade>
@@ -135,5 +135,5 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   </Channels>
  </InkName>
 </InkList>
-</escp2:InkGroup>
+</escp2InkGroup>
 </gutenprint>
author	Didier Raboud <odyx@debian.org>	2014-04-16 08:13:23 +0200
committer	Didier Raboud <odyx@debian.org>	2014-04-16 08:13:23 +0200
commit	d7d42f6c969dc54157d85b7b6b611581bbfa7595 (patch)
tree	dfa630457b374b77f1f128cbc9104ea2d6963575 /src/xml/escp2/inks
parent	ccd50c2bd4db57503722816aa23a5092cbe69f40 (diff)