Imported Upstream version 5.2.3

17 files changed, 1625 insertions, 108 deletions

diff --git a/src/xml/escp2/inks/Makefile.am b/src/xml/escp2/inks/Makefile.am
index cbf259d..5095c6a 100644
--- a/src/xml/escp2/inks/Makefile.am
+++ b/src/xml/escp2/inks/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.6 2008/10/24 00:37:14 rleigh Exp $
+## $Id: Makefile.am,v 1.7 2008/12/07 20:03:09 rlk Exp $
 ## Copyright (C) 2008 Robert Krawitz
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -26,6 +26,7 @@ include $(top_srcdir)/scripts/global.mk
 pkgxmldatadir = $(pkgdatadir)/@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@/xml/escp2/inks
 
 pkgxmldata_DATA =				\
+	artisan.xml				\
 	b500.xml				\
 	c120.xml				\
 	c64.xml					\
diff --git a/src/xml/escp2/inks/Makefile.in b/src/xml/escp2/inks/Makefile.in
index a6b3a94..904de98 100644
--- a/src/xml/escp2/inks/Makefile.in
+++ b/src/xml/escp2/inks/Makefile.in
@@ -274,6 +274,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS
 GUTENPRINTUI_LIBS = $(top_builddir)/src/gutenprintui/libgutenprintui.la
 pkgxmldatadir = $(pkgdatadir)/@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@/xml/escp2/inks
 pkgxmldata_DATA = \
+	artisan.xml				\
 	b500.xml				\
 	c120.xml				\
 	c64.xml					\
diff --git a/src/xml/escp2/inks/artisan.xml b/src/xml/escp2/inks/artisan.xml
new file mode 100644
index 0000000..791f6e1
--- /dev/null
+++ b/src/xml/escp2/inks/artisan.xml
@@ -0,0 +1,285 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:InkGroup name="artisan">
+<InkList translate="text" name="None" text="EPSON Standard Inks">
+ <Shades>
+  <shade count="1">1.000000</shade>
+  <shade count="2">1.000000 0.350000</shade>
+  <shade count="2">1.000000 0.330000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+ </Shades>
+
+ <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK">
+  <Channels>
+   <channel name="artisan_black" index="0">
+    <subchannel color="0" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="artisan_photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="artisan_photo_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="artisan_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhotoCMY" text="Five Color Photo Composite" InkID="CcMmYK">
+  <Channels>
+   <channel name="artisan_photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="artisan_photo_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="artisan_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
+  <Channels>
+   <channel name="artisan_black" index="0">
+    <subchannel color="0" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="artisan_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="artisan_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="artisan_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="RGB" text="Three Color Composite" InkID="CMYK">
+  <Channels>
+   <channel name="artisan_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="artisan_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="artisan_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="artisan_cyan" index="0">
+    <subchannel color="2" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="artisan_magenta" index="1">
+    <subchannel color="1" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="artisan_yellow" index="2">
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="artisan_black" index="0">
+    <subchannel color="0" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="artisan_cyan" index="1">
+    <subchannel color="2" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="artisan_magenta" index="2">
+    <subchannel color="1" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="artisan_yellow" index="3">
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmY" text="Five Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="artisan_cyan" index="0">
+    <subchannel color="2" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_artisan_cyan" index="1">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="artisan_magenta" index="2">
+    <subchannel color="1" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_artisan_magenta" index="3">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="artisan_yellow" index="4">
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmYK" text="Six Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="artisan_black" index="0">
+    <subchannel color="0" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="artisan_cyan" index="1">
+    <subchannel color="2" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_artisan_cyan" index="2">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="artisan_magenta" index="3">
+    <subchannel color="1" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_artisan_magenta" index="4">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="artisan_yellow" index="5">
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+</escp2:InkGroup>
+</gutenprint>
diff --git a/src/xml/escp2/inputslots/Makefile.am b/src/xml/escp2/inputslots/Makefile.am
index 2b5d35e..68b80b6 100644
--- a/src/xml/escp2/inputslots/Makefile.am
+++ b/src/xml/escp2/inputslots/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.3 2008/10/24 00:37:14 rleigh Exp $
+## $Id: Makefile.am,v 1.5 2008/12/10 00:44:12 rlk Exp $
 ## Copyright (C) 2008 Robert Krawitz
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -26,6 +26,7 @@ include $(top_srcdir)/scripts/global.mk
 pkgxmldatadir = $(pkgdatadir)/@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@/xml/escp2/inputslots
 
 pkgxmldata_DATA =				\
+	artisan.xml				\
 	b500.xml				\
 	cd_cutter_roll_feed.xml			\
 	cd_roll_feed.xml			\
@@ -34,6 +35,7 @@ pkgxmldata_DATA =				\
 	pro_roll_feed.xml			\
 	r1800.xml				\
 	r2400.xml				\
+	rx680.xml				\
 	rx700.xml				\
 	spro5000.xml				\
 	standard_roll_feed.xml
diff --git a/src/xml/escp2/inputslots/Makefile.in b/src/xml/escp2/inputslots/Makefile.in
index 6663e4f..4d7e430 100644
--- a/src/xml/escp2/inputslots/Makefile.in
+++ b/src/xml/escp2/inputslots/Makefile.in
@@ -274,6 +274,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS
 GUTENPRINTUI_LIBS = $(top_builddir)/src/gutenprintui/libgutenprintui.la
 pkgxmldatadir = $(pkgdatadir)/@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@/xml/escp2/inputslots
 pkgxmldata_DATA = \
+	artisan.xml				\
 	b500.xml				\
 	cd_cutter_roll_feed.xml			\
 	cd_roll_feed.xml			\
@@ -282,6 +283,7 @@ pkgxmldata_DATA = \
 	pro_roll_feed.xml			\
 	r1800.xml				\
 	r2400.xml				\
+	rx680.xml				\
 	rx700.xml				\
 	spro5000.xml				\
 	standard_roll_feed.xml
diff --git a/src/xml/escp2/inputslots/artisan.xml b/src/xml/escp2/inputslots/artisan.xml
new file mode 100644
index 0000000..cefc25f
--- /dev/null
+++ b/src/xml/escp2/inputslots/artisan.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:InputSlots name="artisan">
+
+ <slot translate="text" name="LowerFront" text="Lower Front Tray">
+  <Duplex><Tumble/></Duplex>
+  <InitSequence>PP\003\000\000\001\001</InitSequence>
+ </slot>
+
+ <slot translate="text" name="UpperFront" text="Upper Front Tray">
+  <Duplex><Tumble/></Duplex>
+  <InitSequence>PP\003\000\000\001\002</InitSequence>
+ </slot>
+
+ <slot translate="text" name="CD" text="Print to CD">
+  <CD/>
+  <InitSequence>PP\003\000\000\002\001</InitSequence>
+ </slot>
+</escp2:InputSlots>
+</gutenprint>
diff --git a/src/xml/escp2/inputslots/rx680.xml b/src/xml/escp2/inputslots/rx680.xml
new file mode 100644
index 0000000..64bf344
--- /dev/null
+++ b/src/xml/escp2/inputslots/rx680.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:InputSlots name="rx680">
+
+ <slot translate="text" name="Rear" text="Rear Tray">
+  <Duplex><Tumble/></Duplex>
+  <InitSequence>PP\003\000\000\001\000</InitSequence>
+ </slot>
+
+ <slot translate="text" name="Front" text="Front Tray">
+  <Duplex><Tumble/></Duplex>
+  <InitSequence>PP\003\000\000\001\001</InitSequence>
+ </slot>
+
+ <slot translate="text" name="CD" text="Print to CD">
+  <CD/>
+  <InitSequence>PP\003\000\000\002\001</InitSequence>
+ </slot>
+</escp2:InputSlots>
+</gutenprint>
diff --git a/src/xml/escp2/media/Makefile.am b/src/xml/escp2/media/Makefile.am
index 245751f..731a904 100644
--- a/src/xml/escp2/media/Makefile.am
+++ b/src/xml/escp2/media/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.9 2008/10/24 00:37:14 rleigh Exp $
+## $Id: Makefile.am,v 1.10 2008/12/20 02:51:54 rlk Exp $
 ## Copyright (C) 2008 Robert Krawitz
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -42,6 +42,7 @@ pkgxmldata_DATA =				\
 	f360_photo7_japan.xml			\
 	f360_ultrachrome.xml			\
 	f360_ultrachrome_k3.xml			\
+	nx100.xml				\
 	photo_gen0.xml				\
 	photo_gen1.xml				\
 	photo_gen2.xml				\
diff --git a/src/xml/escp2/media/Makefile.in b/src/xml/escp2/media/Makefile.in
index 85487c4..f955a7d 100644
--- a/src/xml/escp2/media/Makefile.in
+++ b/src/xml/escp2/media/Makefile.in
@@ -290,6 +290,7 @@ pkgxmldata_DATA = \
 	f360_photo7_japan.xml			\
 	f360_ultrachrome.xml			\
 	f360_ultrachrome_k3.xml			\
+	nx100.xml				\
 	photo_gen0.xml				\
 	photo_gen1.xml				\
 	photo_gen2.xml				\
diff --git a/src/xml/escp2/media/nx100.xml b/src/xml/escp2/media/nx100.xml
new file mode 100644
index 0000000..e52e1bc
--- /dev/null
+++ b/src/xml/escp2/media/nx100.xml
@@ -0,0 +1,980 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:papers name="c120">
+<feature name="PlatenGap"/>
+<feature name="PaperMedia"/>
+<feature name="PrintMethod"/>
+<Curves>
+ <namedParam name="hue_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="-6" upper-bound="6">
+	0	0	0	-0.02	-0.04	-0.08	-0.12	-0.16
+	-0.2	-0.24	-0.28	-0.32	-0.36	-0.37	-0.38	-0.39
+	-0.4	-0.45	-0.5	-0.52	-0.52	-0.5	-0.45	-0.4
+	-0.35	-0.27	-0.15	-0.06	0	0	0	0
+	0	0	-0.03	-0.06	-0.09	-0.13	-0.17	-0.21
+	-0.25	-0.22	-0.19	-0.16	-0.13	-0.1	-0.07	-0.03
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="lum_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	0.63	0.64	0.66	0.69	0.73	0.78	0.82	0.85
+	0.85	0.82	0.78	0.78	0.79	0.8	0.82	0.85
+	0.87	0.9	0.94	0.97	1	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1	1	0.99	0.98	0.97	0.95	0.93
+	0.9	0.76	0.68	0.65	0.64	0.63	0.63	0.63
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="sat_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	1.2	1.2	1.3	1.5	1.7	1.9	2	2
+	2	2	2	2	2	2	2	2
+	2	1.8	1.6	1.4	1.2	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1.15	1.4	1.7	2	2.3	2.4	2.4
+	2.4	2.4	2.4	2.3	2	1.7	1.4	1.15
+   </sequence>
+  </curve>
+ </namedParam>
+</Curves>
+<paper translate="text" name="Plain" text="Plain Paper" class="plain">
+ <parameter type="integer" name="PaperMedia">0</parameter>
+ <parameter type="integer" name="PrintMethod">0x30</parameter>
+
+ <resolution name="360x120sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="Postcard" text="Postcard" class="plain">
+ <parameter type="integer" name="PaperMedia">5</parameter>
+ <parameter type="integer" name="PrintMethod">0x30</parameter>
+
+ <resolution name="360x120sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="GlossyFilm" text="Glossy Film" class="photo">
+ <parameter type="integer" name="PaperMedia">7</parameter>
+ <parameter type="integer" name="PrintMethod">0x51</parameter>
+
+ <resolution name="360x120sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="Transparency" text="Transparencies" class="transparency">
+ <parameter type="integer" name="PaperMedia">9</parameter>
+ <parameter type="integer" name="PrintMethod">0x51</parameter>
+
+ <resolution name="360x120sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="Envelope" text="Envelopes" class="plain">
+ <parameter type="integer" name="PaperMedia">37</parameter>
+ <parameter type="integer" name="PrintMethod">0x30</parameter>
+
+ <resolution name="360x120sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="BackFilm" text="Back Light Film" class="transparency">
+ <parameter type="integer" name="PaperMedia">10</parameter>
+ <parameter type="integer" name="PrintMethod">0x51</parameter>
+
+ <resolution name="360x120sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="Matte" text="Matte Paper" class="good">
+ <parameter type="integer" name="PaperMedia">0</parameter>
+ <parameter type="integer" name="PrintMethod">0x51</parameter>
+
+ <resolution name="360x120sw">
+  <parameter type="integer" name="PrintMethod">0x31</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x31</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x31</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.850000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.975000</parameter>
+  <parameter type="float" name="YellowBalance">0.975000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="MatteHeavy" text="Matte Paper Heavyweight" class="good">
+ <parameter type="integer" name="PaperMedia">5</parameter>
+ <parameter type="integer" name="PrintMethod">0x51</parameter>
+
+ <resolution name="360x120sw">
+  <parameter type="integer" name="PrintMethod">0x31</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x31</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x31</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.850000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.975000</parameter>
+  <parameter type="float" name="YellowBalance">0.975000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="Inkjet" text="Inkjet Paper" class="good">
+ <parameter type="integer" name="PaperMedia">1</parameter>
+ <parameter type="integer" name="PrintMethod">0x30</parameter>
+
+ <resolution name="360x120sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.850000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="Coated" text="Photo Quality Inkjet Paper" class="good">
+ <parameter type="integer" name="PaperMedia">3</parameter>
+ <parameter type="integer" name="PrintMethod">0x30</parameter>
+
+ <resolution name="360x120sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.850000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="Photo" text="Photo Paper" class="photo">
+ <parameter type="integer" name="PaperMedia">6</parameter>
+ <parameter type="integer" name="PrintMethod">0x51</parameter>
+
+ <resolution name="360x120sw">
+  <parameter type="integer" name="PrintMethod">0x31</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x31</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x31</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.850000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.800000</parameter>
+  <parameter type="float" name="YellowBalance">0.800000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="GlossyPhoto" text="Premium Glossy Photo Paper" class="premium">
+ <parameter type="integer" name="PaperMedia">11</parameter>
+ <parameter type="integer" name="PrintMethod">0x51</parameter>
+
+ <resolution name="360x120sw">
+  <parameter type="integer" name="PrintMethod">0x31</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x31</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x31</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.800000</parameter>
+  <parameter type="float" name="YellowBalance">0.800000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="Semigloss" text="Premium Semigloss Photo Paper" class="premium">
+ <parameter type="integer" name="PaperMedia">12</parameter>
+ <parameter type="integer" name="PrintMethod">0x51</parameter>
+
+ <resolution name="360x120sw">
+  <parameter type="integer" name="PrintMethod">0x31</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x31</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x31</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.800000</parameter>
+  <parameter type="float" name="YellowBalance">0.800000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="Luster" text="Premium Luster Photo Paper" class="premium">
+ <parameter type="integer" name="PaperMedia">13</parameter>
+ <parameter type="integer" name="PrintMethod">0x51</parameter>
+
+ <resolution name="360x120sw">
+  <parameter type="integer" name="PrintMethod">0x31</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x31</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x31</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.800000</parameter>
+  <parameter type="float" name="YellowBalance">0.800000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper" class="photo">
+ <parameter type="integer" name="PaperMedia">19</parameter>
+ <parameter type="integer" name="PrintMethod">0x51</parameter>
+
+ <resolution name="360x120sw">
+  <parameter type="integer" name="PrintMethod">0x31</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x31</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x31</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="ColorLife" text="ColorLife Paper" class="premium">
+ <parameter type="integer" name="PaperMedia">22</parameter>
+ <parameter type="integer" name="PrintMethod">0x51</parameter>
+
+ <resolution name="360x120sw">
+  <parameter type="integer" name="PrintMethod">0x31</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x31</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x31</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="Other" text="Other" class="plain">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+</escp2:papers>
+</gutenprint>
diff --git a/src/xml/escp2/model/Makefile.am b/src/xml/escp2/model/Makefile.am
index f8780ee..97d744a 100644
--- a/src/xml/escp2/model/Makefile.am
+++ b/src/xml/escp2/model/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.13 2008/11/15 00:41:48 rlk Exp $
+## $Id: Makefile.am,v 1.14 2008/12/10 00:44:12 rlk Exp $
 ## Copyright (C) 2008 Robert Krawitz
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -122,7 +122,8 @@ pkgxmldata_DATA =				\
 	model_93.xml				\
 	model_94.xml				\
 	model_95.xml				\
-	model_96.xml
+	model_96.xml				\
+	model_97.xml
 
 xml-stamp: $(pkgxmldata_DATA) Makefile.am
 	-rm -f $@ $@.tmp
diff --git a/src/xml/escp2/model/Makefile.in b/src/xml/escp2/model/Makefile.in
index 1fb6be9..6070456 100644
--- a/src/xml/escp2/model/Makefile.in
+++ b/src/xml/escp2/model/Makefile.in
@@ -370,7 +370,8 @@ pkgxmldata_DATA = \
 	model_93.xml				\
 	model_94.xml				\
 	model_95.xml				\
-	model_96.xml
+	model_96.xml				\
+	model_97.xml
 
 CLEANFILES = xmli18n-tmp.h xml-stamp xml-stamp.tmp
 EXTRA_DIST = $(pkgxmldata_DATA)
diff --git a/src/xml/escp2/model/model_87.xml b/src/xml/escp2/model/model_87.xml
index ef7b36b..ded92ec 100644
--- a/src/xml/escp2/model/model_87.xml
+++ b/src/xml/escp2/model/model_87.xml
@@ -57,10 +57,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <minimumMediaSize>144 144</minimumMediaSize>
  <maximumMediaSize>612 86400</maximumMediaSize>
  <maximumImageableArea>612 86400</maximumImageableArea>
- <margins interleave="soft" media="sheet">9 9 27 27</margins>
- <margins interleave="printer" media="sheet">9 9 27 27</margins>
+ <margins interleave="soft" media="sheet">9 9 0 0</margins>
+ <margins interleave="printer" media="sheet">9 9 0 0</margins>
  <margins interleave="soft" media="roll">9 9 0 0</margins>
  <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <margins duplex="duplex">-32768 -32768 27 27</margins>
  <AlignmentChoices>4 15 0 0</AlignmentChoices>
  <ChannelNames>
   <ChannelName translate="name" name="Black"/>
diff --git a/src/xml/escp2/model/model_94.xml b/src/xml/escp2/model/model_94.xml
index 7ebaf17..534cfe2 100644
--- a/src/xml/escp2/model/model_94.xml
+++ b/src/xml/escp2/model/model_94.xml
@@ -28,7 +28,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <mediaSizes src="escp2/mediasizes/standard.xml"/>
  <verticalBorderlessSequence>US\003\000\000\000\002</verticalBorderlessSequence>
  <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
- <preinitRemoteSequence>SN\001\000\000</preinitRemoteSequence>
+ <preinitRemoteSequence>JS\014\000\000GUTENPRINT\000SN\001\000\000</preinitRemoteSequence>
  <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
  <commandSet>2000</commandSet>
  <borderless>Yes</borderless>
@@ -63,8 +63,8 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <extraVerticalFeed>10</extraVerticalFeed>
  <separationRows>1</separationRows>
  <zeroMarginOffset>80</zeroMarginOffset>
+ <initialVerticalOffset>-180</initialVerticalOffset>
  <microLeftMargin>42</microLeftMargin>
- <initialVerticalOffset>0</initialVerticalOffset>
  <minHorizontalAlignment>1</minHorizontalAlignment>
  <baseHorizontalAlignment>28800</baseHorizontalAlignment>
  <bidirectionalAutoUpperLimit>16588800</bidirectionalAutoUpperLimit>
@@ -89,83 +89,50 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <resolution translate="text" name="360x120sw" text="360 x 120 DPI Economy">
    <physicalResolution>360 120</physicalResolution>
    <parameter type="float" name="escp2_density">4.000000</parameter>
-   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
    <parameter type="integer" name="escp2_base_res">360</parameter>
    <parameter type="integer" name="escp2_bits">2</parameter>
-   <parameter type="float" name="DropSize1">0.250000</parameter>
-   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize1">0.200000</parameter>
+   <parameter type="float" name="DropSize2">0.350000</parameter>
    <parameter type="float" name="DropSize3">1.000000</parameter>
   </resolution>
   <resolution translate="text" name="360sw" text="360 DPI">
    <physicalResolution>360 360</physicalResolution>
    <parameter type="float" name="escp2_density">2.000000</parameter>
-   <parameter type="integer" name="escp2_ink_type">17</parameter>
-   <parameter type="integer" name="escp2_base_res">360</parameter>
-   <parameter type="integer" name="escp2_bits">2</parameter>
-   <parameter type="float" name="DropSize1">0.250000</parameter>
-   <parameter type="float" name="DropSize2">0.500000</parameter>
-   <parameter type="float" name="DropSize3">1.000000</parameter>
-  </resolution>
-  <resolution translate="text" name="360hq" text="360 DPI Enhanced">
-   <physicalResolution>360 360</physicalResolution>
-   <verticalPasses>2</verticalPasses>
-   <parameter type="float" name="escp2_density">2.000000</parameter>
-   <parameter type="integer" name="escp2_ink_type">17</parameter>
-   <parameter type="integer" name="escp2_base_res">360</parameter>
-   <parameter type="integer" name="escp2_bits">2</parameter>
-   <parameter type="float" name="DropSize1">0.250000</parameter>
-   <parameter type="float" name="DropSize2">0.500000</parameter>
-   <parameter type="float" name="DropSize3">1.000000</parameter>
-  </resolution>
-  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
-   <physicalResolution>720 360</physicalResolution>
-   <parameter type="float" name="escp2_density">1.560000</parameter>
-   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
    <parameter type="integer" name="escp2_base_res">360</parameter>
    <parameter type="integer" name="escp2_bits">2</parameter>
    <parameter type="float" name="DropSize1">0.200000</parameter>
-   <parameter type="float" name="DropSize2">0.330000</parameter>
+   <parameter type="float" name="DropSize2">0.350000</parameter>
    <parameter type="float" name="DropSize3">1.000000</parameter>
   </resolution>
-  <resolution translate="text" name="720x360hq" text="720 x 360 DPI Enhanced">
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
    <physicalResolution>720 360</physicalResolution>
-   <verticalPasses>2</verticalPasses>
    <parameter type="float" name="escp2_density">1.560000</parameter>
-   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
    <parameter type="integer" name="escp2_base_res">360</parameter>
    <parameter type="integer" name="escp2_bits">2</parameter>
-   <parameter type="float" name="DropSize1">0.200000</parameter>
-   <parameter type="float" name="DropSize2">0.330000</parameter>
+   <parameter type="float" name="DropSize1">0.300000</parameter>
+   <parameter type="float" name="DropSize2">0.660000</parameter>
    <parameter type="float" name="DropSize3">1.000000</parameter>
   </resolution>
   <resolution translate="text" name="720sw" text="720 DPI">
    <physicalResolution>720 720</physicalResolution>
    <parameter type="float" name="escp2_density">0.780000</parameter>
-   <parameter type="integer" name="escp2_ink_type">18</parameter>
-   <parameter type="integer" name="escp2_base_res">360</parameter>
-   <parameter type="integer" name="escp2_bits">2</parameter>
-   <parameter type="float" name="DropSize1">0.200000</parameter>
-   <parameter type="float" name="DropSize2">0.330000</parameter>
-   <parameter type="float" name="DropSize3">1.000000</parameter>
-  </resolution>
-  <resolution translate="text" name="720hq" text="720 DPI High Quality">
-   <physicalResolution>720 720</physicalResolution>
-   <verticalPasses>2</verticalPasses>
-   <parameter type="float" name="escp2_density">0.780000</parameter>
-   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
    <parameter type="integer" name="escp2_base_res">360</parameter>
    <parameter type="integer" name="escp2_bits">2</parameter>
-   <parameter type="float" name="DropSize1">0.200000</parameter>
-   <parameter type="float" name="DropSize2">0.330000</parameter>
+   <parameter type="float" name="DropSize1">0.300000</parameter>
+   <parameter type="float" name="DropSize2">0.550000</parameter>
    <parameter type="float" name="DropSize3">1.000000</parameter>
   </resolution>
   <resolution translate="text" name="1440x720sw" text="1440 x 720 DPI">
    <physicalResolution>1440 720</physicalResolution>
-   <parameter type="float" name="escp2_density">0.512000</parameter>
-   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="float" name="escp2_density">0.778000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
    <parameter type="integer" name="escp2_base_res">360</parameter>
    <parameter type="integer" name="escp2_bits">2</parameter>
-   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize1">0.380000</parameter>
    <parameter type="float" name="DropSize2">0.500000</parameter>
    <parameter type="float" name="DropSize3">1.000000</parameter>
   </resolution>
@@ -173,7 +140,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    <physicalResolution>2880 1440</physicalResolution>
    <printedResolution>1440 1440</printedResolution>
    <parameter type="float" name="escp2_density">0.512000</parameter>
-   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
    <parameter type="integer" name="escp2_base_res">360</parameter>
    <parameter type="integer" name="escp2_bits">2</parameter>
    <parameter type="float" name="DropSize1">0.500000</parameter>
@@ -182,7 +149,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <resolution translate="text" name="2880x1440sw" text="2880 x 1440 DPI">
    <physicalResolution>2880 1440</physicalResolution>
    <parameter type="float" name="escp2_density">0.512</parameter>
-   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
    <parameter type="integer" name="escp2_base_res">360</parameter>
    <parameter type="integer" name="escp2_bits">2</parameter>
    <parameter type="float" name="DropSize1">1.000000</parameter>
@@ -190,7 +157,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <resolution translate="text" name="5760x1440sw" text="5760 x 1440 DPI">
    <physicalResolution>5760 1440</physicalResolution>
    <parameter type="float" name="escp2_density">0.256000</parameter>
-   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
    <parameter type="integer" name="escp2_base_res">360</parameter>
    <parameter type="integer" name="escp2_bits">2</parameter>
    <parameter type="float" name="DropSize1">1.000000</parameter>
@@ -198,7 +165,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <resolution translate="text" name="2880x2880sw" text="2880 x 2880 DPI">
    <physicalResolution>2880 2880</physicalResolution>
    <parameter type="float" name="escp2_density">0.256000</parameter>
-   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
    <parameter type="integer" name="escp2_base_res">360</parameter>
    <parameter type="integer" name="escp2_bits">2</parameter>
    <parameter type="float" name="DropSize1">1.000000</parameter>
@@ -206,7 +173,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <resolution translate="text" name="5760x2880sw" text="5760 x 2880 DPI">
    <physicalResolution>5760 2880</physicalResolution>
    <parameter type="float" name="escp2_density">0.128000</parameter>
-   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
    <parameter type="integer" name="escp2_base_res">360</parameter>
    <parameter type="integer" name="escp2_bits">2</parameter>
    <parameter type="float" name="DropSize1">1.000000</parameter>
diff --git a/src/xml/escp2/model/model_96.xml b/src/xml/escp2/model/model_96.xml
index 469a82f..dac4c6e 100644
--- a/src/xml/escp2/model/model_96.xml
+++ b/src/xml/escp2/model/model_96.xml
@@ -22,9 +22,9 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
 </copyright>
 <escp2:model id="96">
  <media src="escp2/media/claria.xml"/>
- <inputSlots src="escp2/inputslots/cd_roll_feed.xml"/>
+ <inputSlots src="escp2/inputslots/artisan.xml"/>
  <qualityPresets src="escp2/qualitypresets/v2880.xml"/>
- <inkGroup src="escp2/inks/claria.xml"/>
+ <inkGroup src="escp2/inks/artisan.xml"/>
  <mediaSizes src="escp2/mediasizes/standard.xml"/>
  <verticalBorderlessSequence>US\003\000\000\000\002</verticalBorderlessSequence>
  <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
@@ -62,9 +62,9 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <margins interleave="printer" media="sheet">9 9 0 9</margins>
  <margins interleave="soft" media="roll">9 9 0 0</margins>
  <margins interleave="printer" media="roll">9 9 0 0</margins>
- <CDOffset>204 189</CDOffset>
+ <margins duplex="duplex">9 9 27 27</margins>
+ <CDOffset>204 184</CDOffset>
  <CDMediaSize>595 842</CDMediaSize>
- <extraBottom>24</extraBottom>
  <AlignmentChoices>4 15 0 0</AlignmentChoices>
  <ChannelNames>
   <ChannelName translate="name" name="Yellow"/>
@@ -75,75 +75,66 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <ChannelName translate="name" name="Cyan"/>
  </ChannelNames>
  <resolutions>
-  <resolution translate="text" name="360x90sw" text="360 x 90 DPI Fast Economy">
-   <physicalResolution>360 90</physicalResolution>
-   <parameter type="float" name="escp2_density">4.000000</parameter>
-   <parameter type="integer" name="escp2_ink_type">51</parameter>
-   <parameter type="integer" name="escp2_base_res">360</parameter>
-   <parameter type="integer" name="escp2_bits">2</parameter>
-   <parameter type="float" name="DropSize1">0.125000</parameter>
-   <parameter type="float" name="DropSize2">0.420000</parameter>
-   <parameter type="float" name="DropSize3">1.000000</parameter>
-  </resolution>
   <resolution translate="text" name="360x180sw" text="360 x 180 DPI Draft">
    <physicalResolution>360 180</physicalResolution>
    <parameter type="float" name="escp2_density">4.000000</parameter>
-   <parameter type="integer" name="escp2_ink_type">51</parameter>
+   <parameter type="integer" name="escp2_ink_type">49</parameter>
    <parameter type="integer" name="escp2_base_res">360</parameter>
    <parameter type="integer" name="escp2_bits">2</parameter>
-   <parameter type="float" name="DropSize1">0.125000</parameter>
-   <parameter type="float" name="DropSize2">0.420000</parameter>
+   <parameter type="float" name="DropSize1">0.360000</parameter>
+   <parameter type="float" name="DropSize2">0.600000</parameter>
    <parameter type="float" name="DropSize3">1.000000</parameter>
   </resolution>
   <resolution translate="text" name="360sw" text="360 DPI">
    <physicalResolution>360 360</physicalResolution>
    <parameter type="float" name="escp2_density">4.000000</parameter>
-   <parameter type="integer" name="escp2_ink_type">51</parameter>
+   <parameter type="integer" name="escp2_ink_type">49</parameter>
    <parameter type="integer" name="escp2_base_res">360</parameter>
    <parameter type="integer" name="escp2_bits">2</parameter>
-   <parameter type="float" name="DropSize1">0.125000</parameter>
-   <parameter type="float" name="DropSize2">0.420000</parameter>
+   <parameter type="float" name="DropSize1">0.360000</parameter>
+   <parameter type="float" name="DropSize2">0.600000</parameter>
    <parameter type="float" name="DropSize3">1.000000</parameter>
   </resolution>
   <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
    <physicalResolution>720 360</physicalResolution>
-   <parameter type="float" name="escp2_density">3.520000</parameter>
-   <parameter type="integer" name="escp2_ink_type">36</parameter>
+   <verticalPasses>4</verticalPasses>
+   <parameter type="float" name="escp2_density">2.450000</parameter>
+   <parameter type="integer" name="escp2_ink_type">33</parameter>
    <parameter type="integer" name="escp2_base_res">720</parameter>
    <parameter type="integer" name="escp2_bits">2</parameter>
-   <parameter type="float" name="DropSize1">0.125000</parameter>
-   <parameter type="float" name="DropSize2">0.420000</parameter>
+   <parameter type="float" name="DropSize1">0.160000</parameter>
+   <parameter type="float" name="DropSize2">0.580000</parameter>
    <parameter type="float" name="DropSize3">1.000000</parameter>
   </resolution>
   <resolution translate="text" name="720sw" text="720 DPI">
    <physicalResolution>720 720</physicalResolution>
-   <parameter type="float" name="escp2_density">1.760000</parameter>
-   <parameter type="integer" name="escp2_ink_type">36</parameter>
+   <parameter type="float" name="escp2_density">1.224000</parameter>
+   <parameter type="integer" name="escp2_ink_type">33</parameter>
    <parameter type="integer" name="escp2_base_res">720</parameter>
    <parameter type="integer" name="escp2_bits">2</parameter>
-   <parameter type="float" name="DropSize1">0.125000</parameter>
-   <parameter type="float" name="DropSize2">0.420000</parameter>
+   <parameter type="float" name="DropSize1">0.130000</parameter>
+   <parameter type="float" name="DropSize2">0.580000</parameter>
    <parameter type="float" name="DropSize3">1.000000</parameter>
   </resolution>
   <resolution translate="text" name="1440x720sw" text="1440 x 720 DPI">
    <physicalResolution>1440 720</physicalResolution>
-   <parameter type="float" name="escp2_density">0.880000</parameter>
-   <parameter type="integer" name="escp2_ink_type">36</parameter>
+   <parameter type="float" name="escp2_density">0.612000</parameter>
+   <parameter type="integer" name="escp2_ink_type">33</parameter>
    <parameter type="integer" name="escp2_base_res">720</parameter>
    <parameter type="integer" name="escp2_bits">2</parameter>
-   <parameter type="float" name="DropSize1">0.125000</parameter>
-   <parameter type="float" name="DropSize2">0.420000</parameter>
+   <parameter type="float" name="DropSize1">0.130000</parameter>
+   <parameter type="float" name="DropSize2">0.580000</parameter>
    <parameter type="float" name="DropSize3">1.000000</parameter>
   </resolution>
   <resolution translate="text" name="1440x1440ov" text="1440 x 1440 DPI">
    <physicalResolution>2880 1440</physicalResolution>
    <printedResolution>1440 1440</printedResolution>
-   <parameter type="float" name="escp2_density">0.440000</parameter>
-   <parameter type="integer" name="escp2_ink_type">36</parameter>
+   <parameter type="float" name="escp2_density">1.1770000</parameter>
+   <parameter type="integer" name="escp2_ink_type">37</parameter>
    <parameter type="integer" name="escp2_base_res">720</parameter>
    <parameter type="integer" name="escp2_bits">2</parameter>
-   <parameter type="float" name="DropSize1">0.125000</parameter>
-   <parameter type="float" name="DropSize2">0.420000</parameter>
+   <parameter type="float" name="DropSize1">0.500000</parameter>
+   <parameter type="float" name="DropSize2">0.600000</parameter>
    <parameter type="float" name="DropSize3">1.000000</parameter>
   </resolution>
   <resolution translate="text" name="2880x1440sw" text="2880 x 1440 DPI">
@@ -152,8 +143,8 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    <parameter type="integer" name="escp2_ink_type">37</parameter>
    <parameter type="integer" name="escp2_base_res">720</parameter>
    <parameter type="integer" name="escp2_bits">2</parameter>
-   <parameter type="float" name="DropSize1">0.338000</parameter>
-   <parameter type="float" name="DropSize2">0.400000</parameter>
+   <parameter type="float" name="DropSize1">0.500000</parameter>
+   <parameter type="float" name="DropSize2">0.600000</parameter>
    <parameter type="float" name="DropSize3">1.000000</parameter>
   </resolution>
   <resolution translate="text" name="5760x1440sw" text="5760 x 1440 DPI">
diff --git a/src/xml/escp2/model/model_97.xml b/src/xml/escp2/model/model_97.xml
new file mode 100644
index 0000000..9323c2f
--- /dev/null
+++ b/src/xml/escp2/model/model_97.xml
@@ -0,0 +1,188 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:model id="97">
+ <media src="escp2/media/claria.xml"/>
+ <inputSlots src="escp2/inputslots/rx680.xml"/>
+ <qualityPresets src="escp2/qualitypresets/v2880.xml"/>
+ <inkGroup src="escp2/inks/claria.xml"/>
+ <mediaSizes src="escp2/mediasizes/standard.xml"/>
+ <verticalBorderlessSequence>US\003\000\000\000\002</verticalBorderlessSequence>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <preinitRemoteSequence>SN\001\000\000</preinitRemoteSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>2000</commandSet>
+ <borderless>Yes</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Portrait</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>90</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>4</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>6</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>360 90</minimumResolution>
+ <maximumResolution>5760 2880</maximumResolution>
+ <extraVerticalFeed>10</extraVerticalFeed>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>16588800</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>612 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 9</margins>
+ <margins interleave="printer" media="sheet">9 9 0 9</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <margins duplex="duplex">9 9 27 27</margins>
+ <CDOffset>204 189</CDOffset>
+ <CDMediaSize>595 842</CDMediaSize>
+ <AlignmentChoices>4 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Yellow"/>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Light Cyan"/>
+  <ChannelName translate="name" name="Light Magenta"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Cyan"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x90sw" text="360 x 90 DPI Fast Economy">
+   <physicalResolution>360 90</physicalResolution>
+   <parameter type="float" name="escp2_density">4.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">51</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.125000</parameter>
+   <parameter type="float" name="DropSize2">0.420000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x180sw" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <parameter type="float" name="escp2_density">4.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">49</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.360000</parameter>
+   <parameter type="float" name="DropSize2">0.600000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">4.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">49</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.360000</parameter>
+   <parameter type="float" name="DropSize2">0.600000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <verticalPasses>4</verticalPasses>
+   <parameter type="float" name="escp2_density">2.450000</parameter>
+   <parameter type="integer" name="escp2_ink_type">33</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.160000</parameter>
+   <parameter type="float" name="DropSize2">0.580000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">1.224000</parameter>
+   <parameter type="integer" name="escp2_ink_type">33</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.130000</parameter>
+   <parameter type="float" name="DropSize2">0.580000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720sw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.612000</parameter>
+   <parameter type="integer" name="escp2_ink_type">33</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.130000</parameter>
+   <parameter type="float" name="DropSize2">0.580000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x1440ov" text="1440 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <printedResolution>1440 1440</printedResolution>
+   <parameter type="float" name="escp2_density">1.1770000</parameter>
+   <parameter type="integer" name="escp2_ink_type">37</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.500000</parameter>
+   <parameter type="float" name="DropSize2">0.600000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x1440sw" text="2880 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.586000</parameter>
+   <parameter type="integer" name="escp2_ink_type">37</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.500000</parameter>
+   <parameter type="float" name="DropSize2">0.600000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="5760x1440sw" text="5760 x 1440 DPI">
+   <physicalResolution>5760 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.733000</parameter>
+   <parameter type="integer" name="escp2_ink_type">37</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.833000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x2880sw" text="2880 x 2880 DPI">
+   <physicalResolution>2880 2880</physicalResolution>
+   <parameter type="float" name="escp2_density">0.733000</parameter>
+   <parameter type="integer" name="escp2_ink_type">37</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.833000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="5760x2880sw" text="5760 x 2880 DPI">
+   <physicalResolution>5760 2880</physicalResolution>
+   <parameter type="float" name="escp2_density">0.440000</parameter>
+   <parameter type="integer" name="escp2_ink_type">37</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/printers.xml b/src/xml/printers.xml
index f75ce13..d04e97a 100644
--- a/src/xml/printers.xml
+++ b/src/xml/printers.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <!--
-   "$Id: printers.xml,v 1.22 2008/11/15 00:41:48 rlk Exp $"
+   "$Id: printers.xml,v 1.28 2008/12/21 10:49:50 faust3 Exp $"
 
    XML description of printers known to libgutenprint
    You can add additional printers here, but the underlying driver has
@@ -134,6 +134,7 @@
       <printer translate="name" name="Canon PIXMA iP4200" driver="bjc-PIXMA-iP4200" manufacturer="Canon" model="3004200" parameters="PIXMA_iP4200_params" />
       <printer translate="name" name="Canon PIXMA iP4300" driver="bjc-PIXMA-iP4300" manufacturer="Canon" model="3004200" parameters="PIXMA_iP4300_params" />
       <printer translate="name" name="Canon PIXMA iP4500" driver="bjc-PIXMA-iP4500" manufacturer="Canon" model="3004500" parameters="PIXMA_iP4300_params" />
+      <printer translate="name" name="Canon PIXMA iP4600" driver="bjc-PIXMA-iP4600" manufacturer="Canon" model="3004600" parameters="PIXMA_iP4300_params" />
       <printer translate="name" name="Canon PIXMA iP5000" driver="bjc-PIXMA-iP5000" manufacturer="Canon" model="3004000" parameters="PIXMA_iP4000_params" />
       <printer translate="name" name="Canon PIXMA iP5200" driver="bjc-PIXMA-iP5200" manufacturer="Canon" model="3004200" parameters="PIXMA_iP4000_params" />
       <printer translate="name" name="Canon PIXMA iP5300" driver="bjc-PIXMA-iP5300" manufacturer="Canon" model="3005300" parameters="PIXMA_iP4000_params" />
@@ -146,6 +147,7 @@
       <printer translate="name" name="Canon PIXMA MP160" driver="bjc-MULTIPASS-MP160" manufacturer="Canon" model="5000150" parameters="PIXMA_iP4000_params" />
       <printer translate="name" name="Canon PIXMA MP170" driver="bjc-MULTIPASS-MP170" manufacturer="Canon" model="5000150" parameters="PIXMA_iP4000_params" />
       <printer translate="name" name="Canon PIXMA MP180" driver="bjc-MULTIPASS-MP180" manufacturer="Canon" model="5000150" parameters="PIXMA_iP4000_params" />
+      <printer translate="name" name="Canon PIXMA MP220" driver="bjc-MULTIPASS-MP220" manufacturer="Canon" model="5000150" parameters="PIXMA_iP4000_params" />
       <printer translate="name" name="Canon PIXMA MP500" driver="bjc-MULTIPASS-MP500" manufacturer="Canon" model="3004200" parameters="PIXMA_iP4000_params" />
       <printer translate="name" name="Canon PIXMA MP520" driver="bjc-MULTIPASS-MP520" manufacturer="Canon" model="5000520" parameters="PIXMA_iP4000_params" />
       <printer translate="name" name="Canon PIXMA MP610" driver="bjc-MULTIPASS-MP610" manufacturer="Canon" model="3005300" parameters="PIXMA_iP4000_params" />
@@ -357,9 +359,9 @@
       <printer translate="name" name="Epson Stylus Photo RX620" driver="escp2-rx620" manufacturer="Epson" model="84" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Photo RX630" driver="escp2-rx630" manufacturer="Epson" model="84" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Photo RX640" driver="escp2-rx640" manufacturer="Epson" model="81" parameters="claria_params" />
-      <printer translate="name" name="Epson Stylus Photo RX680" driver="escp2-rx680" manufacturer="Epson" model="81" parameters="claria_params" />
-      <printer translate="name" name="Epson Stylus Photo RX685" driver="escp2-rx685" manufacturer="Epson" model="81" parameters="claria_params" />
-      <printer translate="name" name="Epson Stylus Photo RX690" driver="escp2-rx690" manufacturer="Epson" model="81" parameters="claria_params" />
+      <printer translate="name" name="Epson Stylus Photo RX680" driver="escp2-rx680" manufacturer="Epson" model="97" parameters="claria_params" />
+      <printer translate="name" name="Epson Stylus Photo RX685" driver="escp2-rx685" manufacturer="Epson" model="97" parameters="claria_params" />
+      <printer translate="name" name="Epson Stylus Photo RX690" driver="escp2-rx690" manufacturer="Epson" model="97" parameters="claria_params" />
       <printer translate="name" name="Epson Stylus Photo RX700" driver="escp2-rx700" manufacturer="Epson" model="70" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Photo TX700W" driver="escp2-tx700w" manufacturer="Epson" model="96" parameters="claria_params" />
       <printer translate="name" name="Epson Stylus Photo TX800W" driver="escp2-tx800w" manufacturer="Epson" model="96" parameters="claria_params" />
@@ -396,7 +398,7 @@
       <printer translate="name" name="Epson Stylus CX4600" driver="escp2-cx4600" manufacturer="Epson" model="65" parameters="cx3500_params" />
       <printer translate="name" name="Epson Stylus CX4700" driver="escp2-cx4700" manufacturer="Epson" model="95" parameters="cx3500_params" />
       <printer translate="name" name="Epson Stylus CX4800" driver="escp2-cx4800" manufacturer="Epson" model="95" parameters="cx3500_params" />
-      <printer translate="name" name="Epson Stylus CX4900" driver="escp2-cx4900" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX4900" driver="escp2-cx4900" manufacturer="Epson" model="95" parameters="cx3500_params" />
       <printer translate="name" name="Epson Stylus CX5000" driver="escp2-cx5000" manufacturer="Epson" model="65" parameters="cx3500_params" />
       <printer translate="name" name="Epson Stylus CX5000F" driver="escp2-cx5000f" manufacturer="Epson" model="65" parameters="cx3500_params" />
       <printer translate="name" name="Epson Stylus CX5100" driver="escp2-cx5100" manufacturer="Epson" model="55" parameters="cx3500_params" />
@@ -442,20 +444,28 @@
       <printer translate="name" name="Epson Stylus DX8450" driver="escp2-dx8450" manufacturer="Epson" model="65" parameters="cx3500_params" />
       <printer translate="name" name="Epson Stylus DX9400F" driver="escp2-dx9400f" manufacturer="Epson" model="65" parameters="cx3500_params" />
       <printer translate="name" name="Epson Stylus NX100" driver="escp2-nx100" manufacturer="Epson" model="94" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus NX105" driver="escp2-nx105" manufacturer="Epson" model="94" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus NX200" driver="escp2-nx200" manufacturer="Epson" model="93" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus NX300" driver="escp2-nx300" manufacturer="Epson" model="94" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus NX400" driver="escp2-nx400" manufacturer="Epson" model="93" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus PX700FW" driver="escp2-px700fw" manufacturer="Epson" model="96" parameters="claria_params" />
       <printer translate="name" name="Epson Stylus PX800FW" driver="escp2-px800fw" manufacturer="Epson" model="96" parameters="claria_params" />
-      <printer translate="name" name="Epson Stylus S20" driver="escp2-s20" manufacturer="Epson" model="94" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus S20" driver="escp2-s20" manufacturer="Epson" model="66" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus SX100" driver="escp2-sx100" manufacturer="Epson" model="94" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus SX105" driver="escp2-sx105" manufacturer="Epson" model="94" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus SX200" driver="escp2-sx200" manufacturer="Epson" model="93" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus SX205" driver="escp2-sx205" manufacturer="Epson" model="93" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus SX400" driver="escp2-sx400" manufacturer="Epson" model="93" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus SX405" driver="escp2-sx405" manufacturer="Epson" model="93" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus T20" driver="escp2-t20" manufacturer="Epson" model="94" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus T20" driver="escp2-t20" manufacturer="Epson" model="66" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus TX100" driver="escp2-tx100" manufacturer="Epson" model="94" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus TX101" driver="escp2-tx101" manufacturer="Epson" model="94" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus TX102" driver="escp2-tx102" manufacturer="Epson" model="94" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus TX103" driver="escp2-tx103" manufacturer="Epson" model="94" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus TX104" driver="escp2-tx104" manufacturer="Epson" model="94" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus TX105" driver="escp2-tx105" manufacturer="Epson" model="94" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus TX106" driver="escp2-tx106" manufacturer="Epson" model="94" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus TX109" driver="escp2-tx109" manufacturer="Epson" model="94" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus TX200" driver="escp2-tx200" manufacturer="Epson" model="93" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus TX400" driver="escp2-tx400" manufacturer="Epson" model="93" parameters="standard_params" />
       <printer translate="name" name="Epson PictureMate" driver="escp2-picmate" manufacturer="Epson" model="73" parameters="standard_params" />
@@ -501,8 +511,10 @@
       <printer translate="name" name="Epson MC 7000" driver="escp2-mc7000" manufacturer="Epson" model="29" parameters="pro_5500_params" />
       <printer translate="name" name="Epson MC 9000" driver="escp2-mc9000" manufacturer="Epson" model="31" parameters="pro_5500_params" />
       <printer translate="name" name="Epson MC 10000" driver="escp2-mc10000" manufacturer="Epson" model="41" parameters="standard_params" />
+      <printer translate="name" name="Epson ME 300" driver="escp2-me300" manufacturer="Epson" model="94" parameters="standard_params" />
       <printer translate="name" name="Epson ME Office 70" driver="escp2-meof70" manufacturer="Epson" model="85" parameters="standard_params" />
       <printer translate="name" name="Epson ME Office 80W" driver="escp2-meof80w" manufacturer="Epson" model="92" parameters="standard_params" />
+      <printer translate="name" name="Epson ME Office 360" driver="escp2-meof360" manufacturer="Epson" model="94" parameters="standard_params" />
       <printer translate="name" name="Epson ME Office 700FW" driver="escp2-meof700fw" manufacturer="Epson" model="92" parameters="standard_params" />
       <printer translate="name" name="Epson MJ 930C" driver="escp2-mj930c" manufacturer="Epson" model="4" parameters="standard_params" />
       <printer translate="name" name="Epson MJ 5100C" driver="escp2-mj5100c" manufacturer="Epson" model="39" parameters="standard_params" />
@@ -542,6 +554,7 @@
       <printer translate="name" name="Epson PM A820" driver="escp2-pma820" manufacturer="Epson" model="81" parameters="claria_params" />
       <printer translate="name" name="Epson PM A890" driver="escp2-pma890" manufacturer="Epson" model="76" parameters="standard_params" />
       <printer translate="name" name="Epson PM A900" driver="escp2-pma900" manufacturer="Epson" model="70" parameters="standard_params" />
+      <printer translate="name" name="Epson PM A940" driver="escp2-pma940" manufacturer="Epson" model="97" parameters="standard_params" />
       <printer translate="name" name="Epson PM A950" driver="escp2-pma950" manufacturer="Epson" model="70" parameters="standard_params" />
       <printer translate="name" name="Epson PM D600" driver="escp2-pmd600" manufacturer="Epson" model="77" parameters="standard_params" />
       <printer translate="name" name="Epson PM D750" driver="escp2-pmd750" manufacturer="Epson" model="63" parameters="standard_params" />
@@ -555,12 +568,14 @@
       <printer translate="name" name="Epson PM G800" driver="escp2-pmg800" manufacturer="Epson" model="68" parameters="standard_params" />
       <printer translate="name" name="Epson PM G820" driver="escp2-pmg820" manufacturer="Epson" model="68" parameters="standard_params" />
       <printer translate="name" name="Epson PM G850" driver="escp2-pmg850" manufacturer="Epson" model="81" parameters="claria_params" />
+      <printer translate="name" name="Epson PM T960" driver="escp2-pmt960" manufacturer="Epson" model="97" parameters="standard_params" />
       <printer translate="name" name="Epson PM G4500" driver="escp2-pmg4500" manufacturer="Epson" model="82" parameters="standard_params" />
       <printer translate="name" name="Epson PX A650" driver="escp2-pxa650" manufacturer="Epson" model="95" parameters="cx3500_params" />
       <printer translate="name" name="Epson Offirio PX B300" driver="escp2-pxb300" manufacturer="Epson" model="87" parameters="standard_params" />
       <printer translate="name" name="Epson Offirio PX B500" driver="escp2-pxb500" manufacturer="Epson" model="87" parameters="standard_params" />
       <printer translate="name" name="Epson PX 101" driver="escp2-px101" manufacturer="Epson" model="85" parameters="standard_params" />
       <printer translate="name" name="Epson PX 201" driver="escp2-px201" manufacturer="Epson" model="92" parameters="standard_params" />
+      <printer translate="name" name="Epson PX 401A" driver="escp2-px401a" manufacturer="Epson" model="94" parameters="standard_params" />
       <printer translate="name" name="Epson PX 601F" driver="escp2-px601f" manufacturer="Epson" model="92" parameters="standard_params" />
       <printer translate="name" name="Epson PX G900" driver="escp2-pxg900" manufacturer="Epson" model="64" parameters="standard_params" />
       <printer translate="name" name="Epson PX G920" driver="escp2-pxg920" manufacturer="Epson" model="64" parameters="standard_params" />