New upstream version 5.3.1

author: Didier Raboud <odyx@debian.org> 2018-09-25 08:33:05 +0200
committer: Didier Raboud <odyx@debian.org> 2018-09-25 08:33:05 +0200
commit: e50542121e724e851fc5d6c68bb773f80c0bc12c (patch)
tree: 655c3f6331a6e8fd8b09ceb4da8f5896484ae16a /src/xml/escp2/inks
parent: 9dd97a029bf391c42b1dc76f2f7c5e386bb8f466 (diff)
51 files changed, 336 insertions, 123 deletions
diff --git a/src/xml/escp2/inks/Makefile.am b/src/xml/escp2/inks/Makefile.am
index 493067c..647ba2a 100644
--- a/src/xml/escp2/inks/Makefile.am
+++ b/src/xml/escp2/inks/Makefile.am
@@ -11,8 +11,7 @@
 ## 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.
+## along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ## Process this file with automake to produce Makefile.in.
 
@@ -32,6 +31,7 @@ pkgxmldata_DATA =				\
 	c80.xml					\
 	c82.xml					\
 	claria.xml				\
+	claria_xp.xml				\
 	cmy.xml					\
 	cmykrb.xml				\
 	cmykro.xml				\
diff --git a/src/xml/escp2/inks/Makefile.in b/src/xml/escp2/inks/Makefile.in
index 3db12cb..11cbfb3 100644
--- a/src/xml/escp2/inks/Makefile.in
+++ b/src/xml/escp2/inks/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.13.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -20,7 +20,17 @@
 #export STP_DATA_PATH = $(top_srcdir)/src/xml
 
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
 am__make_running_with_option = \
   case $${target_option-} in \
       ?) ;; \
@@ -83,22 +93,21 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-DIST_COMMON = $(top_srcdir)/scripts/global.mk $(srcdir)/Makefile.in \
-	$(srcdir)/Makefile.am
 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/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
-	$(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/stp.m4 \
+	$(top_srcdir)/m4/stp_cups.m4 $(top_srcdir)/m4/stp_option.m4 \
 	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
@@ -152,6 +161,8 @@ am__uninstall_files_from_dir = { \
 am__installdirs = "$(DESTDIR)$(pkgxmldatadir)"
 DATA = $(pkgxmldata_DATA)
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+	$(top_srcdir)/scripts/global.mk
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -162,6 +173,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BASH = @BASH@
+BASHREAL = @BASHREAL@
 BUILD_CUPS_PPDS = @BUILD_CUPS_PPDS@
 BZIP2 = @BZIP2@
 CC = @CC@
@@ -182,7 +195,6 @@ DB2PDF = @DB2PDF@
 DB2PS = @DB2PS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DIALOG = @DIALOG@
 DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
@@ -199,6 +211,7 @@ EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 FIND = @FIND@
 GENPPD_LIBS = @GENPPD_LIBS@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GIMP2_CFLAGS = @GIMP2_CFLAGS@
 GIMP2_LIBS = @GIMP2_LIBS@
 GIMPTOOL2_CHECK = @GIMPTOOL2_CHECK@
@@ -261,10 +274,12 @@ LTALLOCA = @LTALLOCA@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
+MINIMAL_PRINTERS_TO_TEST = @MINIMAL_PRINTERS_TO_TEST@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -288,7 +303,6 @@ PKGROOT = @PKGROOT@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PLUG_IN_PATH = @PLUG_IN_PATH@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
 RELEASE_DATE = @RELEASE_DATE@
@@ -306,9 +320,11 @@ VERSION = @VERSION@
 WHICH_PPDS = @WHICH_PPDS@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 XZ = @XZ@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+ZPAQ = @ZPAQ@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -376,7 +392,6 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
-GUTENPRINTUI_LIBS = $(top_builddir)/src/gutenprintui/libgutenprintui.la
 pkgxmldatadir = $(pkgdatadir)/@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@/xml/escp2/inks
 pkgxmldata_DATA = \
 	artisan.xml				\
@@ -386,6 +401,7 @@ pkgxmldata_DATA = \
 	c80.xml					\
 	c82.xml					\
 	claria.xml				\
+	claria_xp.xml				\
 	cmy.xml					\
 	cmykrb.xml				\
 	cmykro.xml				\
@@ -445,16 +461,15 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/xml/escp2/inks/Makefile'; \
 	$(am__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);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
-$(top_srcdir)/scripts/global.mk:
+$(top_srcdir)/scripts/global.mk $(am__empty):
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -498,7 +513,10 @@ ctags CTAGS:
 cscope cscopelist:
 
 
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -650,6 +668,8 @@ uninstall-am: uninstall-pkgxmldataDATA
 	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
 	uninstall-am uninstall-pkgxmldataDATA
 
+.PRECIOUS: Makefile
+
 
 @SET_MAKE@
 
@@ -659,10 +679,6 @@ $(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)
diff --git a/src/xml/escp2/inks/artisan.xml b/src/xml/escp2/inks/artisan.xml
index 3b69f80..57600b1 100644
--- a/src/xml/escp2/inks/artisan.xml
+++ b/src/xml/escp2/inks/artisan.xml
@@ -17,8 +17,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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.
+ *   along with this program.  If not, see https://www.gnu.org/licenses/.
 </copyright>
 <escp2InkGroup name="artisan">
 <InkList translate="text" name="None" text="EPSON Standard Inks">
diff --git a/src/xml/escp2/inks/b500.xml b/src/xml/escp2/inks/b500.xml
index 9cb8d9d..b352494 100644
--- a/src/xml/escp2/inks/b500.xml
+++ b/src/xml/escp2/inks/b500.xml
@@ -17,8 +17,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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.
+ *   along with this program.  If not, see https://www.gnu.org/licenses/.
 </copyright>
 <escp2InkGroup name="b500">
 <InkList translate="text" name="None" text="EPSON Standard Inks">
diff --git a/src/xml/escp2/inks/c120.xml b/src/xml/escp2/inks/c120.xml
index 3f76227..42b70f6 100644
--- a/src/xml/escp2/inks/c120.xml
+++ b/src/xml/escp2/inks/c120.xml
@@ -17,8 +17,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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.
+ *   along with this program.  If not, see https://www.gnu.org/licenses/.
 </copyright>
 <escp2InkGroup name="c120">
 <InkList translate="text" name="None" text="EPSON Standard Inks">
diff --git a/src/xml/escp2/inks/c64.xml b/src/xml/escp2/inks/c64.xml
index add88ab..1181729 100644
--- a/src/xml/escp2/inks/c64.xml
+++ b/src/xml/escp2/inks/c64.xml
@@ -17,8 +17,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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.
+ *   along with this program.  If not, see https://www.gnu.org/licenses/.
 </copyright>
 <escp2InkGroup name="c64">
 <InkList translate="text" name="None" text="EPSON Standard Inks">
diff --git a/src/xml/escp2/inks/c80.xml b/src/xml/escp2/inks/c80.xml
index 91b174d..1d8f3c7 100644
--- a/src/xml/escp2/inks/c80.xml
+++ b/src/xml/escp2/inks/c80.xml
@@ -17,8 +17,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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.
+ *   along with this program.  If not, see https://www.gnu.org/licenses/.
 </copyright>
 <escp2InkGroup name="c80">
 <InkList translate="text" name="None" text="EPSON Standard Inks">
diff --git a/src/xml/escp2/inks/c82.xml b/src/xml/escp2/inks/c82.xml
index 48685a3..7ae2c95 100644
--- a/src/xml/escp2/inks/c82.xml
+++ b/src/xml/escp2/inks/c82.xml
@@ -17,8 +17,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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.
+ *   along with this program.  If not, see https://www.gnu.org/licenses/.
 </copyright>
 <escp2InkGroup name="c82">
 <InkList translate="text" name="None" text="EPSON Standard Inks">
diff --git a/src/xml/escp2/inks/claria.xml b/src/xml/escp2/inks/claria.xml
index 81747c8..0f9ac51 100644
--- a/src/xml/escp2/inks/claria.xml
+++ b/src/xml/escp2/inks/claria.xml
@@ -17,8 +17,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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.
+ *   along with this program.  If not, see https://www.gnu.org/licenses/.
 </copyright>
 <escp2InkGroup name="claria">
 <InkList translate="text" name="None" text="EPSON Standard Inks">
diff --git a/src/xml/escp2/inks/claria_xp.xml b/src/xml/escp2/inks/claria_xp.xml
new file mode 100644
index 0000000..44d38b5
--- /dev/null
+++ b/src/xml/escp2/inks/claria_xp.xml
@@ -0,0 +1,245 @@
+<?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, see https://www.gnu.org/licenses/.
+</copyright>
+<escp2InkGroup name="claria_xp">
+<Curves>
+ <curve name="cmykrCyan" wrap="wrap" type="linear" gamma="0" piecewise="false">
+  <sequence count="48" lower-bound="0" upper-bound="1">
+	1	1	1	1	1	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
+	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="cmykrMagenta" wrap="wrap" type="linear" gamma="0" piecewise="false">
+  <sequence count="48" lower-bound="0" upper-bound="1">
+	0	0.125	0.25	0.375	0.5	0.625	0.75	0.875
+	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="cmykrYellow" wrap="wrap" type="linear" gamma="0" piecewise="false">
+  <sequence count="48" lower-bound="0" upper-bound="1">
+	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="cmykrRed" wrap="wrap" type="linear" gamma="0" piecewise="false">
+  <sequence count="48" lower-bound="0" upper-bound="1">
+	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>
+</Curves>
+
+<InkList translate="text" name="None" text="EPSON Standard Inks">
+ <Shades>
+  <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="CMYKk" text="Six Color Photo" InkID="OTHER">
+  <Channels>
+   <channel name="claria_photo_black" index="0">
+    <subchannel color="0" subchannel="0" subchannel="0" name="Black" text="Black" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="LightBlackTrans"/>
+    </subchannel>
+    <subchannel color="0" subchannel="1" headOffset="2" name="LightBlack" text="Light Black" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="GrayValue"/>
+     <SubchannelScaleParam name="GrayScale"/>
+    </subchannel>
+   </channel>
+   <channel name="claria_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <HueCurve ref="cmykrCyan"/>
+    <subchannel color="2" subchannel="0" headOffset="2" name="Cyan" text="Cyan" translate="text">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="claria_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <HueCurve ref="cmykrMagenta"/>
+    <subchannel color="1" subchannel="0" headOffset="1" name="Magenta" text="Magenta" translate="text">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="claria_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <HueCurve ref="cmykrYellow"/>
+    <subchannel color="4" subchannel="0" headOffset="0" name="Yellow" text="Yellow" translate="text">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="claria_red" index="4">
+    <HueCurveParam name="RedHueCurve"/>
+    <HueCurve ref="cmykrRed"/>
+    <subchannel color="7" subchannel="0" headOffset="1" name="Red" text="Red" translate="text">
+     <ChannelDensityParam name="RedDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhotoCMYKk" text="Five Color Photo" InkID="CMYKk">
+  <Channels>
+   <channel name="claria_photo_black" index="0">
+    <subchannel color="0" subchannel="0" headOffset="0" name="Black" text="Black" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="LightBlackTrans"/>
+    </subchannel>
+    <subchannel color="0" subchannel="1" headOffset="2" name="LightBlack" text="Light Black" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="GrayValue"/>
+     <SubchannelScaleParam name="GrayScale"/>
+    </subchannel>
+   </channel>
+   <channel name="claria_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0" headOffset="2" name="Cyan" text="Cyan" translate="text">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="claria_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0" headOffset="1" name="Magenta" text="Magenta" translate="text">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="claria_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="0" headOffset="0" 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="claria_black" index="0">
+    <subchannel color="0" subchannel="0" headOffset="0" name="Black" text="Black" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="claria_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0" headOffset="2" name="Cyan" text="Cyan" translate="text">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="claria_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0" headOffset="1" name="Magenta" text="Magenta" translate="text">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="claria_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="0" headOffset="0" 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="claria_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" headOffset="2" subchannel="2" name="Cyan" text="Cyan" translate="text">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="claria_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0" headOffset="1" name="Magenta" text="Magenta" translate="text">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="claria_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="0" headOffset="0" name="Yellow" text="Yellow" translate="text">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYKkR" text="Six Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="claria_black" index="0">
+    <subchannel color="0" subchannel="0" headOffset="0" name="Black" text="Black" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="claria_extended_black" index="1">
+    <subchannel color="0" subchannel="1" headOffset="2" name="LightBlack" text="Light Black" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="claria_cyan" index="2">
+    <subchannel color="2" subchannel="0" headOffset="2" name="Cyan" text="Cyan" translate="text">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="claria_magenta" index="3">
+    <subchannel color="1" subchannel="0" headOffset="1" name="Magenta" text="Magenta" translate="text">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="claria_yellow" index="4">
+    <subchannel color="4" subchannel="0" headOffset="0"  name="Yellow" text="Yellow" translate="text">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="claria_red" index="5">
+    <subchannel color="7" subchannel="0" headOffset="1" name="Red" text="Red" translate="text">
+     <ChannelDensityParam name="RedDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+</escp2InkGroup>
+</gutenprint>
diff --git a/src/xml/escp2/inks/cmy.xml b/src/xml/escp2/inks/cmy.xml
index fbaa098..0e82c85 100644
--- a/src/xml/escp2/inks/cmy.xml
+++ b/src/xml/escp2/inks/cmy.xml
@@ -17,8 +17,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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.
+ *   along with this program.  If not, see https://www.gnu.org/licenses/.
 </copyright>
 <escp2InkGroup name="cmy">
 <InkList translate="text" name="None" text="EPSON Standard Inks">
diff --git a/src/xml/escp2/inks/cmykrb.xml b/src/xml/escp2/inks/cmykrb.xml
index f53eec6..07073e0 100644
--- a/src/xml/escp2/inks/cmykrb.xml
+++ b/src/xml/escp2/inks/cmykrb.xml
@@ -17,8 +17,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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.
+ *   along with this program.  If not, see https://www.gnu.org/licenses/.
 </copyright>
 <escp2InkGroup name="cmykrb">
 <Curves>
diff --git a/src/xml/escp2/inks/cmykro.xml b/src/xml/escp2/inks/cmykro.xml
index 50decb4..d0d4964 100644
--- a/src/xml/escp2/inks/cmykro.xml
+++ b/src/xml/escp2/inks/cmykro.xml
@@ -17,8 +17,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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.
+ *   along with this program.  If not, see https://www.gnu.org/licenses/.
 </copyright>
 <escp2InkGroup name="cmykro">
 <Curves>
diff --git a/src/xml/escp2/inks/cx3650.xml b/src/xml/escp2/inks/cx3650.xml
index 004d6b1..d5ee76c 100644
--- a/src/xml/escp2/inks/cx3650.xml
+++ b/src/xml/escp2/inks/cx3650.xml
@@ -17,8 +17,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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.
+ *   along with this program.  If not, see https://www.gnu.org/licenses/.
 </copyright>
 <escp2InkGroup name="cx3650">
 <InkList translate="text" name="None" text="EPSON Standard Inks">
diff --git a/src/xml/escp2/inks/defaultblack.xml b/src/xml/escp2/inks/defaultblack.xml
index e520b15..44cbe19 100644
--- a/src/xml/escp2/inks/defaultblack.xml
+++ b/src/xml/escp2/inks/defaultblack.xml
@@ -17,8 +17,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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.
+ *   along with this program.  If not, see https://www.gnu.org/licenses/.
 </copyright>
 <escp2InkGroup name="defaultblack">
 <InkList translate="text" name="None" text="EPSON Standard Inks">
diff --git a/src/xml/escp2/inks/f360.xml b/src/xml/escp2/inks/f360.xml
index be01d2c..9c596d7 100644
--- a/src/xml/escp2/inks/f360.xml
+++ b/src/xml/escp2/inks/f360.xml
@@ -17,8 +17,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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.
+ *   along with this program.  If not, see https://www.gnu.org/licenses/.
 </copyright>
 <escp2InkGroup name="f360">
 <InkList translate="text" name="None" text="EPSON Standard Inks">
diff --git a/src/xml/escp2/inks/f360_photo.xml b/src/xml/escp2/inks/f360_photo.xml
index 0128197..ba76065 100644
--- a/src/xml/escp2/inks/f360_photo.xml
+++ b/src/xml/escp2/inks/f360_photo.xml
@@ -17,8 +17,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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.
+ *   along with this program.  If not, see https://www.gnu.org/licenses/.
 </copyright>
 <escp2InkGroup name="f360_photo">
 <InkList translate="text" name="None" text="EPSON Standard Inks">
diff --git a/src/xml/escp2/inks/f360_photo7_japan.xml b/src/xml/escp2/inks/f360_photo7_japan.xml
index 50b10c7..8e2f2ad 100644
--- a/src/xml/escp2/inks/f360_photo7_japan.xml
+++ b/src/xml/escp2/inks/f360_photo7_japan.xml
@@ -17,8 +17,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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.
+ *   along with this program.  If not, see https://www.gnu.org/licenses/.
 </copyright>
 <escp2InkGroup name="f360_photo7_japan">
 <InkList translate="text" name="None" text="EPSON Standard Inks">
diff --git a/src/xml/escp2/inks/f360_ultrachrome.xml b/src/xml/escp2/inks/f360_ultrachrome.xml
index c9332cf..2c87652 100644
--- a/src/xml/escp2/inks/f360_ultrachrome.xml
+++ b/src/xml/escp2/inks/f360_ultrachrome.xml
@@ -17,8 +17,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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.
+ *   along with this program.  If not, see https://www.gnu.org/licenses/.
 </copyright>
 <escp2InkGroup name="f360_ultrachrome">
 <InkList translate="text" name="ultraphoto" text="UltraChrome Photo Black">
diff --git a/src/xml/escp2/inks/f360_ultrachrome_k3.xml b/src/xml/escp2/inks/f360_ultrachrome_k3.xml
index 0036f8b..1e7cd4f 100644
--- a/src/xml/escp2/inks/f360_ultrachrome_k3.xml
+++ b/src/xml/escp2/inks/f360_ultrachrome_k3.xml
@@ -17,8 +17,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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.
+ *   along with this program.  If not, see https://www.gnu.org/licenses/.
 </copyright>
 <escp2InkGroup name="f360_ultrachrome_k3">
 <InkList translate="text" name="ultra3photo" text="Photo Black">
diff --git a/src/xml/escp2/inks/f360_ultrachrome_k3v.xml b/src/xml/escp2/inks/f360_ultrachrome_k3v.xml
index 4dd2839..e29ff6e 100644
--- a/src/xml/escp2/inks/f360_ultrachrome_k3v.xml
+++ b/src/xml/escp2/inks/f360_ultrachrome_k3v.xml
@@ -17,8 +17,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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.
+ *   along with this program.  If not, see https://www.gnu.org/licenses/.
 </copyright>
 <escp2InkGroup name="f360_ultrachrome_k3v">
 <InkList translate="text" name="ultra3photo" text="Photo Black">
diff --git a/src/xml/escp2/inks/f360_ultrachrome_k3v_2.xml b/src/xml/escp2/inks/f360_ultrachrome_k3v_2.xml
index 0281046..5dad05b 100644
--- a/src/xml/escp2/inks/f360_ultrachrome_k3v_2.xml
+++ b/src/xml/escp2/inks/f360_ultrachrome_k3v_2.xml
@@ -17,8 +17,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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.
+ *   along with this program.  If not, see https://www.gnu.org/licenses/.
 </copyright>
 <escp2InkGroup name="f360_ultrachrome_k3v">
 <InkList translate="text" name="ultra3photo" text="Photo Black">
diff --git a/src/xml/escp2/inks/nx100.xml b/src/xml/escp2/inks/nx100.xml
index 6dd412a..210f3f4 100644
--- a/src/xml/escp2/inks/nx100.xml
+++ b/src/xml/escp2/inks/nx100.xml
@@ -17,8 +17,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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.
+ *   along with this program.  If not, see https://www.gnu.org/licenses/.
 </copyright>
 <escp2InkGroup name="nx100">
 <InkList translate="text" name="None" text="EPSON Standard Inks">
diff --git a/src/xml/escp2/inks/photo_gen0.xml b/src/xml/escp2/inks/photo_gen0.xml
index e4dcd4c..9785fc2 100644
--- a/src/xml/escp2/inks/photo_gen0.xml
+++ b/src/xml/escp2/inks/photo_gen0.xml
@@ -17,8 +17,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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.
+ *   along with this program.  If not, see https://www.gnu.org/licenses/.
 </copyright>
 <escp2InkGroup name="photo_gen0">
 <InkList translate="text" name="None" text="EPSON Standard Inks">
diff --git a/src/xml/escp2/inks/photo_gen1.xml b/src/xml/escp2/inks/photo_gen1.xml
index be7c6ba..6d3e083 100644
--- a/src/xml/escp2/inks/photo_gen1.xml
+++ b/src/xml/escp2/inks/photo_gen1.xml
@@ -17,8 +17,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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.
+ *   along with this program.  If not, see https://www.gnu.org/licenses/.
 </copyright>
 <escp2InkGroup name="photo_gen1">
 <InkList translate="text" name="None" text="EPSON Standard Inks">
diff --git a/src/xml/escp2/inks/photo_gen2.xml b/src/xml/escp2/inks/photo_gen2.xml
index 1d2efc7..e582bbd 100644
--- a/src/xml/escp2/inks/photo_gen2.xml
+++ b/src/xml/escp2/inks/photo_gen2.xml
@@ -17,8 +17,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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.
+ *   along with this program.  If not, see https://www.gnu.org/licenses/.
 </copyright>
 <escp2InkGroup name="photo_gen2">
 <InkList translate="text" name="None" text="EPSON Standard Inks">
diff --git a/src/xml/escp2/inks/photo_gen3.xml b/src/xml/escp2/inks/photo_gen3.xml
index e899b4b..1d974e4 100644
--- a/src/xml/escp2/inks/photo_gen3.xml
+++ b/src/xml/escp2/inks/photo_gen3.xml
@@ -17,8 +17,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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.
+ *   along with this program.  If not, see https://www.gnu.org/licenses/.
 </copyright>
 <escp2InkGroup name="photo_gen3">
 <InkList translate="text" name="None" text="EPSON Standard Inks">
diff --git a/src/xml/escp2/inks/photo_gen3_4.xml b/src/xml/escp2/inks/photo_gen3_4.xml
index 1b83402..bf155b9 100644
--- a/src/xml/escp2/inks/photo_gen3_4.xml
+++ b/src/xml/escp2/inks/photo_gen3_4.xml
@@ -17,8 +17,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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.
+ *   along with this program.  If not, see https://www.gnu.org/licenses/.
 </copyright>
 <escp2InkGroup name="photo_gen3_4">
 <InkList translate="text" name="None" text="EPSON Standard Inks">
diff --git a/src/xml/escp2/inks/photo_gen4.xml b/src/xml/escp2/inks/photo_gen4.xml
index 2283184..1e69f81 100644
--- a/src/xml/escp2/inks/photo_gen4.xml
+++ b/src/xml/escp2/inks/photo_gen4.xml
@@ -17,8 +17,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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.
+ *   along with this program.  If not, see https://www.gnu.org/licenses/.
 </copyright>
 <escp2InkGroup name="photo_gen3">
 <InkList translate="text" name="None" text="EPSON Standard Inks">
diff --git a/src/xml/escp2/inks/photo_pigment.xml b/src/xml/escp2/inks/photo_pigment.xml
index f63cb69..3140ed5 100644
--- a/src/xml/escp2/inks/photo_pigment.xml
+++ b/src/xml/escp2/inks/photo_pigment.xml
@@ -17,8 +17,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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.
+ *   along with this program.  If not, see https://www.gnu.org/licenses/.
 </copyright>
 <escp2InkGroup name="photo_pigment">
 <InkList translate="text" name="None" text="EPSON Standard Inks">
diff --git a/src/xml/escp2/inks/picturemate_4.xml b/src/xml/escp2/inks/picturemate_4.xml
index 602992c..5d368bd 100644
--- a/src/xml/escp2/inks/picturemate_4.xml
+++ b/src/xml/escp2/inks/picturemate_4.xml
@@ -17,8 +17,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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.
+ *   along with this program.  If not, see https://www.gnu.org/licenses/.
 </copyright>
 <escp2InkGroup name="picturemate_4">
 <InkList translate="text" name="picturemate_4" text="Standard">
diff --git a/src/xml/escp2/inks/picturemate_6.xml b/src/xml/escp2/inks/picturemate_6.xml
index 418de94..7ddf02e 100644
--- a/src/xml/escp2/inks/picturemate_6.xml
+++ b/src/xml/escp2/inks/picturemate_6.xml
@@ -17,8 +17,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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.
+ *   along with this program.  If not, see https://www.gnu.org/licenses/.
 </copyright>
 <escp2InkGroup name="picturemate_6">
 <InkList translate="text" name="picturemate_6" text="Standard">
diff --git a/src/xml/escp2/inks/pro_gen1.xml b/src/xml/escp2/inks/pro_gen1.xml
index d1a2760..84f48e3 100644
--- a/src/xml/escp2/inks/pro_gen1.xml
+++ b/src/xml/escp2/inks/pro_gen1.xml
@@ -17,8 +17,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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.
+ *   along with this program.  If not, see https://www.gnu.org/licenses/.
 </copyright>
 <escp2InkGroup name="pro_gen1">
 <InkList translate="text" name="None" text="EPSON Standard Inks">
diff --git a/src/xml/escp2/inks/pro_gen2.xml b/src/xml/escp2/inks/pro_gen2.xml
index f005b6c..04eb4bd 100644
--- a/src/xml/escp2/inks/pro_gen2.xml
+++ b/src/xml/escp2/inks/pro_gen2.xml
@@ -17,8 +17,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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.
+ *   along with this program.  If not, see https://www.gnu.org/licenses/.
 </copyright>
 <escp2InkGroup name="pro_gen2">
 <InkList translate="text" name="None" text="EPSON Standard Inks">
diff --git a/src/xml/escp2/inks/pro_pigment.xml b/src/xml/escp2/inks/pro_pigment.xml
index 340688c..57e7f0a 100644
--- a/src/xml/escp2/inks/pro_pigment.xml
+++ b/src/xml/escp2/inks/pro_pigment.xml
@@ -17,8 +17,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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.
+ *   along with this program.  If not, see https://www.gnu.org/licenses/.
 </copyright>
 <escp2InkGroup name="pro_pigment">
 <InkList translate="text" name="None" text="EPSON Standard Inks">
diff --git a/src/xml/escp2/inks/pro_ultrachrome.xml b/src/xml/escp2/inks/pro_ultrachrome.xml
index 637e58c..188bbe1 100644
--- a/src/xml/escp2/inks/pro_ultrachrome.xml
+++ b/src/xml/escp2/inks/pro_ultrachrome.xml
@@ -17,8 +17,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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.
+ *   along with this program.  If not, see https://www.gnu.org/licenses/.
 </copyright>
 <escp2InkGroup name="pro_ultrachrome">
 <InkList translate="text" name="ultraphoto" text="UltraChrome Photo Black">
diff --git a/src/xml/escp2/inks/pro_ultrachrome_k3.xml b/src/xml/escp2/inks/pro_ultrachrome_k3.xml
index 74e76be..708cd43 100644
--- a/src/xml/escp2/inks/pro_ultrachrome_k3.xml
+++ b/src/xml/escp2/inks/pro_ultrachrome_k3.xml
@@ -17,8 +17,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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.
+ *   along with this program.  If not, see https://www.gnu.org/licenses/.
 </copyright>
 <escp2InkGroup name="pro_ultrachrome_k3">
 <InkList translate="text" name="ultra3photo" text="Photo Black">
diff --git a/src/xml/escp2/inks/pro_ultrachrome_k34.xml b/src/xml/escp2/inks/pro_ultrachrome_k34.xml
index 7077f4c..d14e899 100644
--- a/src/xml/escp2/inks/pro_ultrachrome_k34.xml
+++ b/src/xml/escp2/inks/pro_ultrachrome_k34.xml
@@ -17,8 +17,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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.
+ *   along with this program.  If not, see https://www.gnu.org/licenses/.
 </copyright>
 <escp2InkGroup name="pro_ultrachrome_k3">
 <InkList translate="text" name="ultra3photo" text="Photo Black">
diff --git a/src/xml/escp2/inks/pro_ultrachrome_k3v.xml b/src/xml/escp2/inks/pro_ultrachrome_k3v.xml
index 8a7f6a9..3f8168d 100644
--- a/src/xml/escp2/inks/pro_ultrachrome_k3v.xml
+++ b/src/xml/escp2/inks/pro_ultrachrome_k3v.xml
@@ -17,8 +17,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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.
+ *   along with this program.  If not, see https://www.gnu.org/licenses/.
 </copyright>
 <escp2InkGroup name="pro_ultrachrome_k3v">
 <InkList translate="text" name="ultra3photo" text="Photo Black">
diff --git a/src/xml/escp2/inks/pro_ultrachrome_k3v10.xml b/src/xml/escp2/inks/pro_ultrachrome_k3v10.xml
index 6677137..69fc258 100644
--- a/src/xml/escp2/inks/pro_ultrachrome_k3v10.xml
+++ b/src/xml/escp2/inks/pro_ultrachrome_k3v10.xml
@@ -17,8 +17,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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.
+ *   along with this program.  If not, see https://www.gnu.org/licenses/.
 </copyright>
 <escp2InkGroup name="pro_ultrachrome_k3v">
 <InkList translate="text" name="ultra3photo" text="Photo Black">
diff --git a/src/xml/escp2/inks/pro_ultrachrome_k3v10a.xml b/src/xml/escp2/inks/pro_ultrachrome_k3v10a.xml
index 990f8a0..51913c3 100644
--- a/src/xml/escp2/inks/pro_ultrachrome_k3v10a.xml
+++ b/src/xml/escp2/inks/pro_ultrachrome_k3v10a.xml
@@ -17,8 +17,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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.
+ *   along with this program.  If not, see https://www.gnu.org/licenses/.
 </copyright>
 <escp2InkGroup name="pro_ultrachrome_k3v10a">
 <InkList translate="text" name="ultra3photo" text="Photo Black">
diff --git a/src/xml/escp2/inks/pro_ultrachrome_k3v10b.xml b/src/xml/escp2/inks/pro_ultrachrome_k3v10b.xml
index f643cd4..499cd6a 100644
--- a/src/xml/escp2/inks/pro_ultrachrome_k3v10b.xml
+++ b/src/xml/escp2/inks/pro_ultrachrome_k3v10b.xml
@@ -17,8 +17,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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.
+ *   along with this program.  If not, see https://www.gnu.org/licenses/.
 </copyright>
 <escp2InkGroup name="pro_ultrachrome_k3v10b">
 <InkList translate="text" name="ultra3photo" text="Photo Black">
diff --git a/src/xml/escp2/inks/pro_ultrachrome_k3v4.xml b/src/xml/escp2/inks/pro_ultrachrome_k3v4.xml
index df84750..a9a0ec9 100644
--- a/src/xml/escp2/inks/pro_ultrachrome_k3v4.xml
+++ b/src/xml/escp2/inks/pro_ultrachrome_k3v4.xml
@@ -17,8 +17,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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.
+ *   along with this program.  If not, see https://www.gnu.org/licenses/.
 </copyright>
 <escp2InkGroup name="pro_ultrachrome_k3v4">
 <InkList translate="text" name="ultra3photo" text="Photo Black">
diff --git a/src/xml/escp2/inks/standard.xml b/src/xml/escp2/inks/standard.xml
index 9b13905..9c2005a 100644
--- a/src/xml/escp2/inks/standard.xml
+++ b/src/xml/escp2/inks/standard.xml
@@ -17,8 +17,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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.
+ *   along with this program.  If not, see https://www.gnu.org/licenses/.
 </copyright>
 <escp2InkGroup name="standard">
 <InkList translate="text" name="None" text="EPSON Standard Inks">
diff --git a/src/xml/escp2/inks/standard_gen0.xml b/src/xml/escp2/inks/standard_gen0.xml
index 5b7ee5d..43a41e0 100644
--- a/src/xml/escp2/inks/standard_gen0.xml
+++ b/src/xml/escp2/inks/standard_gen0.xml
@@ -17,8 +17,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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.
+ *   along with this program.  If not, see https://www.gnu.org/licenses/.
 </copyright>
 <escp2InkGroup name="standard_gen0">
 <InkList translate="text" name="None" text="EPSON Standard Inks">
diff --git a/src/xml/escp2/inks/sx445.xml b/src/xml/escp2/inks/sx445.xml
index 7abb32f..424d023 100644
--- a/src/xml/escp2/inks/sx445.xml
+++ b/src/xml/escp2/inks/sx445.xml
@@ -17,8 +17,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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.
+ *   along with this program.  If not, see https://www.gnu.org/licenses/.
 </copyright>
 <escp2InkGroup name="nx100">
 <InkList translate="text" name="None" text="EPSON Standard Inks">
diff --git a/src/xml/escp2/inks/ultrachrome.xml b/src/xml/escp2/inks/ultrachrome.xml
index 1c180cf..6068b4b 100644
--- a/src/xml/escp2/inks/ultrachrome.xml
+++ b/src/xml/escp2/inks/ultrachrome.xml
@@ -17,8 +17,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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.
+ *   along with this program.  If not, see https://www.gnu.org/licenses/.
 </copyright>
 <escp2InkGroup name="ultrachrome">
 <InkList translate="text" name="ultraphoto" text="UltraChrome Photo Black">
diff --git a/src/xml/escp2/inks/wf40.xml b/src/xml/escp2/inks/wf40.xml
index 177fdc9..804c1b9 100644
--- a/src/xml/escp2/inks/wf40.xml
+++ b/src/xml/escp2/inks/wf40.xml
@@ -17,8 +17,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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.
+ *   along with this program.  If not, see https://www.gnu.org/licenses/.
 </copyright>
 <escp2InkGroup name="wf40">
 <InkList translate="text" name="None" text="EPSON Standard Inks">
diff --git a/src/xml/escp2/inks/wf500.xml b/src/xml/escp2/inks/wf500.xml
index 073f632..f6bb29c 100644
--- a/src/xml/escp2/inks/wf500.xml
+++ b/src/xml/escp2/inks/wf500.xml
@@ -17,8 +17,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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.
+ *   along with this program.  If not, see https://www.gnu.org/licenses/.
 </copyright>
 <escp2InkGroup name="wf500">
 <InkList translate="text" name="None" text="EPSON Standard Inks">
diff --git a/src/xml/escp2/inks/x80.xml b/src/xml/escp2/inks/x80.xml
index 80ce8e8..2d4397a 100644
--- a/src/xml/escp2/inks/x80.xml
+++ b/src/xml/escp2/inks/x80.xml
@@ -17,8 +17,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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.
+ *   along with this program.  If not, see https://www.gnu.org/licenses/.
 </copyright>
 <escp2InkGroup name="x80">
 <InkList translate="text" name="None" text="EPSON Standard Inks">
diff --git a/src/xml/escp2/inks/xp100.xml b/src/xml/escp2/inks/xp100.xml
index 0c41f0f..2d802f8 100644
--- a/src/xml/escp2/inks/xp100.xml
+++ b/src/xml/escp2/inks/xp100.xml
@@ -17,8 +17,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   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-1287, USA.
+ *   along with this program.  If not, see https://www.gnu.org/licenses/.
 </copyright>
 <escp2InkGroup name="xp100">
 <InkList translate="text" name="None" text="EPSON Standard Inks">
author	Didier Raboud <odyx@debian.org>	2018-09-25 08:33:05 +0200
committer	Didier Raboud <odyx@debian.org>	2018-09-25 08:33:05 +0200
commit	e50542121e724e851fc5d6c68bb773f80c0bc12c (patch)
tree	655c3f6331a6e8fd8b09ceb4da8f5896484ae16a /src/xml/escp2/inks
parent	9dd97a029bf391c42b1dc76f2f7c5e386bb8f466 (diff)