Imported Upstream version 5.2.7

author: Roger Leigh <rleigh@debian.org> 2011-05-03 10:28:02 +0100
committer: Roger Leigh <rleigh@debian.org> 2011-05-03 10:28:02 +0100
commit: 15578e218035547ca17e25ef351fbe56bc55a4ae (patch)
tree: 06a97de2b9f0d9e04ee05d5ff806ef7c53a2003e /src/xml/escp2/model
parent: 4bc88c4aa9026d5c679008a4dbbb8ec4d9a901bd (diff)
21 files changed, 1665 insertions, 331 deletions
diff --git a/src/xml/escp2/model/Makefile.am b/src/xml/escp2/model/Makefile.am
index efb63a0..44427f2 100644
--- a/src/xml/escp2/model/Makefile.am
+++ b/src/xml/escp2/model/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.21 2010/08/11 00:26:09 rlk Exp $
+## $Id: Makefile.am,v 1.27 2011/03/05 18:49:13 rlk Exp $
 ## Copyright (C) 2008 Robert Krawitz
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -133,7 +133,15 @@ pkgxmldata_DATA =				\
 	model_104.xml				\
 	model_105.xml				\
 	model_106.xml				\
-	model_107.xml
+	model_107.xml				\
+	model_108.xml				\
+	model_109.xml				\
+	model_110.xml				\
+	model_111.xml				\
+	model_112.xml				\
+	model_113.xml				\
+	model_114.xml				\
+	model_115.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 edd8d3f..aa4c874 100644
--- a/src/xml/escp2/model/Makefile.in
+++ b/src/xml/escp2/model/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -21,8 +22,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -57,6 +59,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -64,9 +67,23 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(pkgxmldatadir)"
-pkgxmldataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(pkgxmldata_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -186,6 +203,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
@@ -386,7 +404,15 @@ pkgxmldata_DATA = \
 	model_104.xml				\
 	model_105.xml				\
 	model_106.xml				\
-	model_107.xml
+	model_107.xml				\
+	model_108.xml				\
+	model_109.xml				\
+	model_110.xml				\
+	model_111.xml				\
+	model_112.xml				\
+	model_113.xml				\
+	model_114.xml				\
+	model_115.xml
 
 CLEANFILES = xmli18n-tmp.h xml-stamp xml-stamp.tmp
 EXTRA_DIST = $(pkgxmldata_DATA)
@@ -397,14 +423,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/xml/escp2/model/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/xml/escp2/model/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/xml/escp2/model/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu src/xml/escp2/model/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -422,6 +448,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -431,20 +458,23 @@ clean-libtool:
 install-pkgxmldataDATA: $(pkgxmldata_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(pkgxmldatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgxmldatadir)"
-	@list='$(pkgxmldata_DATA)'; for p in $$list; do \
+	@list='$(pkgxmldata_DATA)'; test -n "$(pkgxmldatadir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(pkgxmldataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgxmldatadir)/$$f'"; \
-	  $(pkgxmldataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgxmldatadir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgxmldatadir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgxmldatadir)" || exit $$?; \
 	done
 
 uninstall-pkgxmldataDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(pkgxmldata_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(pkgxmldatadir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(pkgxmldatadir)/$$f"; \
-	done
+	@list='$(pkgxmldata_DATA)'; test -n "$(pkgxmldatadir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(pkgxmldatadir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(pkgxmldatadir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -468,13 +498,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -509,6 +543,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -527,6 +562,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -535,18 +572,28 @@ install-data-am: install-pkgxmldataDATA
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -607,6 +654,7 @@ xml-stamp: $(pkgxmldata_DATA) Makefile.am
 all-local: xml-stamp
 
 dist-hook: xml-stamp
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/src/xml/escp2/model/model_102.xml b/src/xml/escp2/model/model_102.xml
index 1e433b5..393c19b 100644
--- a/src/xml/escp2/model/model_102.xml
+++ b/src/xml/escp2/model/model_102.xml
@@ -45,7 +45,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <baseSeparation>360</baseSeparation>
  <resolutionScale>14400</resolutionScale>
  <minimumResolution>360 180</minimumResolution>
- <maximumResolution>2880 1440</maximumResolution>
+ <maximumResolution>2880 2880</maximumResolution>
  <separationRows>1</separationRows>
  <zeroMarginOffset>43</zeroMarginOffset>
  <microLeftMargin>5</microLeftMargin>
@@ -60,76 +60,86 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <margins interleave="soft" media="roll">9 9 0 0</margins>
  <margins interleave="printer" media="roll">9 9 0 0</margins>
  <AlignmentChoices>3 15 0 0</AlignmentChoices>
- <ChannelNames>
-  <ChannelName translate="name" name="Light Light Black"/>
-  <ChannelName translate="name" name="Vivid Light Magenta"/>
-  <ChannelName translate="name" name="Light Cyan"/>
-  <ChannelName translate="name" name="Light Black"/>
-  <ChannelName translate="name" name="Black"/>
-  <ChannelName translate="name" name="Cyan"/>
-  <ChannelName translate="name" name="Vivid Magenta"/>
-  <ChannelName translate="name" name="Yellow"/>
- </ChannelNames>
  <resolutions>
   <resolution translate="text" name="360x180dpi" text="360 x 180 DPI Draft">
    <physicalResolution>360 180</physicalResolution>
    <printerWeave command="\033(i\001\000\000"/>
-   <parameter type="float" name="escp2_density">2.300000</parameter>
+   <parameter type="float" name="escp2_density">10.000000</parameter>
    <parameter type="integer" name="escp2_ink_type">17</parameter>
    <parameter type="integer" name="escp2_base_res">2880</parameter>
    <parameter type="integer" name="escp2_bits">2</parameter>
-   <parameter type="float" name="DropSize1">0.160000</parameter>
-   <parameter type="float" name="DropSize2">0.400000</parameter>
+   <parameter type="float" name="DropSize1">0.290000</parameter>
+   <parameter type="float" name="DropSize2">0.630000</parameter>
    <parameter type="float" name="DropSize3">1.000000</parameter>
   </resolution>
   <resolution translate="text" name="360pro" text="360 DPI">
    <physicalResolution>360 360</physicalResolution>
    <printerWeave command="\033(i\001\000\001"/>
-   <parameter type="float" name="escp2_density">1.150000</parameter>
+   <parameter type="float" name="escp2_density">5.000000</parameter>
    <parameter type="integer" name="escp2_ink_type">17</parameter>
    <parameter type="integer" name="escp2_base_res">2880</parameter>
    <parameter type="integer" name="escp2_bits">2</parameter>
-   <parameter type="float" name="DropSize1">0.160000</parameter>
-   <parameter type="float" name="DropSize2">0.400000</parameter>
+   <parameter type="float" name="DropSize1">0.290000</parameter>
+   <parameter type="float" name="DropSize2">0.630000</parameter>
    <parameter type="float" name="DropSize3">1.000000</parameter>
   </resolution>
   <resolution translate="text" name="720x360mw" text="720 x 360 DPI">
    <physicalResolution>720 360</physicalResolution>
    <printerWeave command="\033(i\001\000\001"/>
-   <parameter type="float" name="escp2_density">0.580000</parameter>
+   <parameter type="float" name="escp2_density">2.520000</parameter>
    <parameter type="integer" name="escp2_ink_type">17</parameter>
    <parameter type="integer" name="escp2_base_res">2880</parameter>
    <parameter type="integer" name="escp2_bits">2</parameter>
-   <parameter type="float" name="DropSize1">0.160000</parameter>
-   <parameter type="float" name="DropSize2">0.400000</parameter>
+   <parameter type="float" name="DropSize1">0.290000</parameter>
+   <parameter type="float" name="DropSize2">0.630000</parameter>
    <parameter type="float" name="DropSize3">1.000000</parameter>
   </resolution>
   <resolution translate="text" name="720mw" text="720 DPI">
    <physicalResolution>720 720</physicalResolution>
    <printerWeave command="\033(i\001\000\001"/>
-   <parameter type="float" name="escp2_density">0.766000</parameter>
-   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="float" name="escp2_density">1.260000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
    <parameter type="integer" name="escp2_base_res">2880</parameter>
    <parameter type="integer" name="escp2_bits">2</parameter>
-   <parameter type="float" name="DropSize1">0.200000</parameter>
-   <parameter type="float" name="DropSize2">0.450000</parameter>
+   <parameter type="float" name="DropSize1">0.290000</parameter>
+   <parameter type="float" name="DropSize2">0.630000</parameter>
    <parameter type="float" name="DropSize3">1.000000</parameter>
   </resolution>
   <resolution translate="text" name="1440x720mw" text="1440 x 720 DPI">
    <physicalResolution>1440 720</physicalResolution>
    <printerWeave command="\033(i\001\000\001"/>
-   <parameter type="float" name="escp2_density">0.388000</parameter>
+   <parameter type="float" name="escp2_density">0.891000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.275000</parameter>
+   <parameter type="float" name="DropSize2">0.450000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x1440mw" text="1440 x 1440 DPI">
+   <physicalResolution>1440 1440</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.446000</parameter>
    <parameter type="integer" name="escp2_ink_type">16</parameter>
    <parameter type="integer" name="escp2_base_res">2880</parameter>
    <parameter type="integer" name="escp2_bits">2</parameter>
-   <parameter type="float" name="DropSize1">0.200000</parameter>
+   <parameter type="float" name="DropSize1">0.275000</parameter>
    <parameter type="float" name="DropSize2">0.450000</parameter>
    <parameter type="float" name="DropSize3">1.000000</parameter>
   </resolution>
   <resolution translate="text" name="2880x1440mw" text="2880 x 1440 DPI">
    <physicalResolution>2880 1440</physicalResolution>
    <printerWeave command="\033(i\001\000\001"/>
-   <parameter type="float" name="escp2_density">0.479000</parameter>
+   <parameter type="float" name="escp2_density">0.775000</parameter>
+   <parameter type="integer" name="escp2_ink_type">5</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x2880mw" text="2880 x 2880 DPI">
+   <physicalResolution>2880 2880</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.388000</parameter>
    <parameter type="integer" name="escp2_ink_type">5</parameter>
    <parameter type="integer" name="escp2_base_res">2880</parameter>
    <parameter type="integer" name="escp2_bits">1</parameter>
diff --git a/src/xml/escp2/model/model_103.xml b/src/xml/escp2/model/model_103.xml
index cf7c331..c6a1016 100644
--- a/src/xml/escp2/model/model_103.xml
+++ b/src/xml/escp2/model/model_103.xml
@@ -22,15 +22,14 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
 </copyright>
 <escp2:model id="103">
  <media src="escp2/media/pro_ultrachrome_k3.xml"/>
- <inputSlots src="escp2/inputslots/pro_roll_feed.xml"/>
+ <inputSlots src="escp2/inputslots/pro_cutter_roll_feed.xml"/>
  <qualityPresets src="escp2/qualitypresets/standard.xml"/>
  <inkGroup src="escp2/inks/pro_ultrachrome_k3.xml"/>
  <printerWeaves src="escp2/weaves/pro7600.xml"/>
- <verticalBorderlessSequence>SN\003\000\000\011\001</verticalBorderlessSequence>
  <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
  <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
  <commandSet>Pro</commandSet>
- <borderless>Yes</borderless>
+ <borderless>HorizontalOnly</borderless>
  <supportsVariableDropsizes/>
  <hasFastGraymode/>
  <sendZeroAdvance/>
@@ -42,18 +41,18 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <FirstNozzle>0</FirstNozzle>
   <NozzleSeparation>1</NozzleSeparation>
  </headConfiguration>
- <physicalChannels>7</physicalChannels>
+ <physicalChannels>8</physicalChannels>
  <baseSeparation>360</baseSeparation>
  <resolutionScale>14400</resolutionScale>
  <minimumResolution>360 180</minimumResolution>
- <maximumResolution>2880 1440</maximumResolution>
+ <maximumResolution>2880 2880</maximumResolution>
  <separationRows>1</separationRows>
- <zeroMarginOffset>80</zeroMarginOffset>
- <microLeftMargin>42</microLeftMargin>
+ <zeroMarginOffset>43</zeroMarginOffset>
+ <microLeftMargin>5</microLeftMargin>
  <minHorizontalAlignment>1</minHorizontalAlignment>
  <baseHorizontalAlignment>28800</baseHorizontalAlignment>
  <bidirectionalAutoUpperLimit>2073600</bidirectionalAutoUpperLimit>
- <minimumMediaSize>504 504</minimumMediaSize>
+ <minimumMediaSize>144 144</minimumMediaSize>
  <maximumMediaSize>1728 86400</maximumMediaSize>
  <maximumImageableArea>1728 86400</maximumImageableArea>
  <margins interleave="soft" media="sheet">9 9 9 40</margins>
@@ -61,74 +60,86 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <margins interleave="soft" media="roll">9 9 0 0</margins>
  <margins interleave="printer" media="roll">9 9 0 0</margins>
  <AlignmentChoices>3 15 0 0</AlignmentChoices>
- <ChannelNames>
-  <ChannelName translate="name" name="Black"/>
-  <ChannelName translate="name" name="Cyan"/>
-  <ChannelName translate="name" name="Magenta"/>
-  <ChannelName translate="name" name="Yellow"/>
-  <ChannelName translate="name" name="Light Cyan"/>
-  <ChannelName translate="name" name="Light Magenta"/>
- </ChannelNames>
  <resolutions>
   <resolution translate="text" name="360x180dpi" text="360 x 180 DPI Draft">
    <physicalResolution>360 180</physicalResolution>
    <printerWeave command="\033(i\001\000\000"/>
-   <parameter type="float" name="escp2_density">2.300000</parameter>
+   <parameter type="float" name="escp2_density">10.000000</parameter>
    <parameter type="integer" name="escp2_ink_type">17</parameter>
    <parameter type="integer" name="escp2_base_res">2880</parameter>
    <parameter type="integer" name="escp2_bits">2</parameter>
-   <parameter type="float" name="DropSize1">0.160000</parameter>
-   <parameter type="float" name="DropSize2">0.400000</parameter>
+   <parameter type="float" name="DropSize1">0.290000</parameter>
+   <parameter type="float" name="DropSize2">0.630000</parameter>
    <parameter type="float" name="DropSize3">1.000000</parameter>
   </resolution>
   <resolution translate="text" name="360pro" text="360 DPI">
    <physicalResolution>360 360</physicalResolution>
    <printerWeave command="\033(i\001\000\001"/>
-   <parameter type="float" name="escp2_density">1.150000</parameter>
+   <parameter type="float" name="escp2_density">5.000000</parameter>
    <parameter type="integer" name="escp2_ink_type">17</parameter>
    <parameter type="integer" name="escp2_base_res">2880</parameter>
    <parameter type="integer" name="escp2_bits">2</parameter>
-   <parameter type="float" name="DropSize1">0.160000</parameter>
-   <parameter type="float" name="DropSize2">0.400000</parameter>
+   <parameter type="float" name="DropSize1">0.290000</parameter>
+   <parameter type="float" name="DropSize2">0.630000</parameter>
    <parameter type="float" name="DropSize3">1.000000</parameter>
   </resolution>
   <resolution translate="text" name="720x360mw" text="720 x 360 DPI">
    <physicalResolution>720 360</physicalResolution>
    <printerWeave command="\033(i\001\000\001"/>
-   <parameter type="float" name="escp2_density">0.580000</parameter>
+   <parameter type="float" name="escp2_density">2.520000</parameter>
    <parameter type="integer" name="escp2_ink_type">17</parameter>
    <parameter type="integer" name="escp2_base_res">2880</parameter>
    <parameter type="integer" name="escp2_bits">2</parameter>
-   <parameter type="float" name="DropSize1">0.160000</parameter>
-   <parameter type="float" name="DropSize2">0.400000</parameter>
+   <parameter type="float" name="DropSize1">0.290000</parameter>
+   <parameter type="float" name="DropSize2">0.630000</parameter>
    <parameter type="float" name="DropSize3">1.000000</parameter>
   </resolution>
   <resolution translate="text" name="720mw" text="720 DPI">
    <physicalResolution>720 720</physicalResolution>
    <printerWeave command="\033(i\001\000\001"/>
-   <parameter type="float" name="escp2_density">0.766000</parameter>
-   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="float" name="escp2_density">1.260000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
    <parameter type="integer" name="escp2_base_res">2880</parameter>
    <parameter type="integer" name="escp2_bits">2</parameter>
-   <parameter type="float" name="DropSize1">0.200000</parameter>
-   <parameter type="float" name="DropSize2">0.450000</parameter>
+   <parameter type="float" name="DropSize1">0.290000</parameter>
+   <parameter type="float" name="DropSize2">0.630000</parameter>
    <parameter type="float" name="DropSize3">1.000000</parameter>
   </resolution>
   <resolution translate="text" name="1440x720mw" text="1440 x 720 DPI">
    <physicalResolution>1440 720</physicalResolution>
    <printerWeave command="\033(i\001\000\001"/>
-   <parameter type="float" name="escp2_density">0.388000</parameter>
+   <parameter type="float" name="escp2_density">0.891000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.275000</parameter>
+   <parameter type="float" name="DropSize2">0.450000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x1440mw" text="1440 x 1440 DPI">
+   <physicalResolution>1440 1440</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.446000</parameter>
    <parameter type="integer" name="escp2_ink_type">16</parameter>
    <parameter type="integer" name="escp2_base_res">2880</parameter>
    <parameter type="integer" name="escp2_bits">2</parameter>
-   <parameter type="float" name="DropSize1">0.200000</parameter>
+   <parameter type="float" name="DropSize1">0.275000</parameter>
    <parameter type="float" name="DropSize2">0.450000</parameter>
    <parameter type="float" name="DropSize3">1.000000</parameter>
   </resolution>
   <resolution translate="text" name="2880x1440mw" text="2880 x 1440 DPI">
    <physicalResolution>2880 1440</physicalResolution>
    <printerWeave command="\033(i\001\000\001"/>
-   <parameter type="float" name="escp2_density">0.479000</parameter>
+   <parameter type="float" name="escp2_density">0.775000</parameter>
+   <parameter type="integer" name="escp2_ink_type">5</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x2880mw" text="2880 x 2880 DPI">
+   <physicalResolution>2880 2880</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.388000</parameter>
    <parameter type="integer" name="escp2_ink_type">5</parameter>
    <parameter type="integer" name="escp2_base_res">2880</parameter>
    <parameter type="integer" name="escp2_bits">1</parameter>
diff --git a/src/xml/escp2/model/model_104.xml b/src/xml/escp2/model/model_104.xml
index ba3a2a5..996bac0 100644
--- a/src/xml/escp2/model/model_104.xml
+++ b/src/xml/escp2/model/model_104.xml
@@ -22,15 +22,14 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
 </copyright>
 <escp2:model id="104">
  <media src="escp2/media/pro_ultrachrome_k3.xml"/>
- <inputSlots src="escp2/inputslots/pro_roll_feed.xml"/>
+ <inputSlots src="escp2/inputslots/pro_cutter_roll_feed.xml"/>
  <qualityPresets src="escp2/qualitypresets/standard.xml"/>
  <inkGroup src="escp2/inks/pro_ultrachrome_k3.xml"/>
  <printerWeaves src="escp2/weaves/pro7600.xml"/>
- <verticalBorderlessSequence>SN\003\000\000\011\001</verticalBorderlessSequence>
  <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
  <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
  <commandSet>Pro</commandSet>
- <borderless>Yes</borderless>
+ <borderless>HorizontalOnly</borderless>
  <supportsVariableDropsizes/>
  <hasFastGraymode/>
  <sendZeroAdvance/>
@@ -42,18 +41,18 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <FirstNozzle>0</FirstNozzle>
   <NozzleSeparation>1</NozzleSeparation>
  </headConfiguration>
- <physicalChannels>7</physicalChannels>
+ <physicalChannels>8</physicalChannels>
  <baseSeparation>360</baseSeparation>
  <resolutionScale>14400</resolutionScale>
  <minimumResolution>360 180</minimumResolution>
- <maximumResolution>2880 1440</maximumResolution>
+ <maximumResolution>2880 2880</maximumResolution>
  <separationRows>1</separationRows>
- <zeroMarginOffset>80</zeroMarginOffset>
- <microLeftMargin>42</microLeftMargin>
+ <zeroMarginOffset>43</zeroMarginOffset>
+ <microLeftMargin>5</microLeftMargin>
  <minHorizontalAlignment>1</minHorizontalAlignment>
  <baseHorizontalAlignment>28800</baseHorizontalAlignment>
  <bidirectionalAutoUpperLimit>2073600</bidirectionalAutoUpperLimit>
- <minimumMediaSize>504 504</minimumMediaSize>
+ <minimumMediaSize>144 144</minimumMediaSize>
  <maximumMediaSize>3168 86400</maximumMediaSize>
  <maximumImageableArea>3168 86400</maximumImageableArea>
  <margins interleave="soft" media="sheet">9 9 9 40</margins>
@@ -61,74 +60,86 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <margins interleave="soft" media="roll">9 9 0 0</margins>
  <margins interleave="printer" media="roll">9 9 0 0</margins>
  <AlignmentChoices>3 15 0 0</AlignmentChoices>
- <ChannelNames>
-  <ChannelName translate="name" name="Black"/>
-  <ChannelName translate="name" name="Cyan"/>
-  <ChannelName translate="name" name="Magenta"/>
-  <ChannelName translate="name" name="Yellow"/>
-  <ChannelName translate="name" name="Light Cyan"/>
-  <ChannelName translate="name" name="Light Magenta"/>
- </ChannelNames>
  <resolutions>
   <resolution translate="text" name="360x180dpi" text="360 x 180 DPI Draft">
    <physicalResolution>360 180</physicalResolution>
    <printerWeave command="\033(i\001\000\000"/>
-   <parameter type="float" name="escp2_density">2.300000</parameter>
+   <parameter type="float" name="escp2_density">10.000000</parameter>
    <parameter type="integer" name="escp2_ink_type">17</parameter>
    <parameter type="integer" name="escp2_base_res">2880</parameter>
    <parameter type="integer" name="escp2_bits">2</parameter>
-   <parameter type="float" name="DropSize1">0.160000</parameter>
-   <parameter type="float" name="DropSize2">0.400000</parameter>
+   <parameter type="float" name="DropSize1">0.290000</parameter>
+   <parameter type="float" name="DropSize2">0.630000</parameter>
    <parameter type="float" name="DropSize3">1.000000</parameter>
   </resolution>
   <resolution translate="text" name="360pro" text="360 DPI">
    <physicalResolution>360 360</physicalResolution>
    <printerWeave command="\033(i\001\000\001"/>
-   <parameter type="float" name="escp2_density">1.150000</parameter>
+   <parameter type="float" name="escp2_density">5.000000</parameter>
    <parameter type="integer" name="escp2_ink_type">17</parameter>
    <parameter type="integer" name="escp2_base_res">2880</parameter>
    <parameter type="integer" name="escp2_bits">2</parameter>
-   <parameter type="float" name="DropSize1">0.160000</parameter>
-   <parameter type="float" name="DropSize2">0.400000</parameter>
+   <parameter type="float" name="DropSize1">0.290000</parameter>
+   <parameter type="float" name="DropSize2">0.630000</parameter>
    <parameter type="float" name="DropSize3">1.000000</parameter>
   </resolution>
   <resolution translate="text" name="720x360mw" text="720 x 360 DPI">
    <physicalResolution>720 360</physicalResolution>
    <printerWeave command="\033(i\001\000\001"/>
-   <parameter type="float" name="escp2_density">0.580000</parameter>
+   <parameter type="float" name="escp2_density">2.520000</parameter>
    <parameter type="integer" name="escp2_ink_type">17</parameter>
    <parameter type="integer" name="escp2_base_res">2880</parameter>
    <parameter type="integer" name="escp2_bits">2</parameter>
-   <parameter type="float" name="DropSize1">0.160000</parameter>
-   <parameter type="float" name="DropSize2">0.400000</parameter>
+   <parameter type="float" name="DropSize1">0.290000</parameter>
+   <parameter type="float" name="DropSize2">0.630000</parameter>
    <parameter type="float" name="DropSize3">1.000000</parameter>
   </resolution>
   <resolution translate="text" name="720mw" text="720 DPI">
    <physicalResolution>720 720</physicalResolution>
    <printerWeave command="\033(i\001\000\001"/>
-   <parameter type="float" name="escp2_density">0.766000</parameter>
-   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="float" name="escp2_density">1.260000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
    <parameter type="integer" name="escp2_base_res">2880</parameter>
    <parameter type="integer" name="escp2_bits">2</parameter>
-   <parameter type="float" name="DropSize1">0.200000</parameter>
-   <parameter type="float" name="DropSize2">0.450000</parameter>
+   <parameter type="float" name="DropSize1">0.290000</parameter>
+   <parameter type="float" name="DropSize2">0.630000</parameter>
    <parameter type="float" name="DropSize3">1.000000</parameter>
   </resolution>
   <resolution translate="text" name="1440x720mw" text="1440 x 720 DPI">
    <physicalResolution>1440 720</physicalResolution>
    <printerWeave command="\033(i\001\000\001"/>
-   <parameter type="float" name="escp2_density">0.388000</parameter>
+   <parameter type="float" name="escp2_density">0.891000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.275000</parameter>
+   <parameter type="float" name="DropSize2">0.450000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x1440mw" text="1440 x 1440 DPI">
+   <physicalResolution>1440 1440</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.446000</parameter>
    <parameter type="integer" name="escp2_ink_type">16</parameter>
    <parameter type="integer" name="escp2_base_res">2880</parameter>
    <parameter type="integer" name="escp2_bits">2</parameter>
-   <parameter type="float" name="DropSize1">0.200000</parameter>
+   <parameter type="float" name="DropSize1">0.275000</parameter>
    <parameter type="float" name="DropSize2">0.450000</parameter>
    <parameter type="float" name="DropSize3">1.000000</parameter>
   </resolution>
   <resolution translate="text" name="2880x1440mw" text="2880 x 1440 DPI">
    <physicalResolution>2880 1440</physicalResolution>
    <printerWeave command="\033(i\001\000\001"/>
-   <parameter type="float" name="escp2_density">0.479000</parameter>
+   <parameter type="float" name="escp2_density">0.775000</parameter>
+   <parameter type="integer" name="escp2_ink_type">5</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x2880mw" text="2880 x 2880 DPI">
+   <physicalResolution>2880 2880</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.388000</parameter>
    <parameter type="integer" name="escp2_ink_type">5</parameter>
    <parameter type="integer" name="escp2_base_res">2880</parameter>
    <parameter type="integer" name="escp2_bits">1</parameter>
diff --git a/src/xml/escp2/model/model_105.xml b/src/xml/escp2/model/model_105.xml
index d89b881..551c2e4 100644
--- a/src/xml/escp2/model/model_105.xml
+++ b/src/xml/escp2/model/model_105.xml
@@ -22,15 +22,14 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
 </copyright>
 <escp2:model id="105">
  <media src="escp2/media/pro_ultrachrome_k3.xml"/>
- <inputSlots src="escp2/inputslots/pro_roll_feed.xml"/>
+ <inputSlots src="escp2/inputslots/pro_cutter_roll_feed.xml"/>
  <qualityPresets src="escp2/qualitypresets/standard.xml"/>
  <inkGroup src="escp2/inks/pro_ultrachrome_k3.xml"/>
  <printerWeaves src="escp2/weaves/pro7600.xml"/>
- <verticalBorderlessSequence>SN\003\000\000\011\001</verticalBorderlessSequence>
  <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
  <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
  <commandSet>Pro</commandSet>
- <borderless>Yes</borderless>
+ <borderless>HorizontalOnly</borderless>
  <supportsVariableDropsizes/>
  <hasFastGraymode/>
  <sendZeroAdvance/>
@@ -42,18 +41,18 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <FirstNozzle>0</FirstNozzle>
   <NozzleSeparation>1</NozzleSeparation>
  </headConfiguration>
- <physicalChannels>7</physicalChannels>
+ <physicalChannels>8</physicalChannels>
  <baseSeparation>360</baseSeparation>
  <resolutionScale>14400</resolutionScale>
  <minimumResolution>360 180</minimumResolution>
- <maximumResolution>2880 1440</maximumResolution>
+ <maximumResolution>2880 2880</maximumResolution>
  <separationRows>1</separationRows>
- <zeroMarginOffset>80</zeroMarginOffset>
- <microLeftMargin>42</microLeftMargin>
+ <zeroMarginOffset>43</zeroMarginOffset>
+ <microLeftMargin>5</microLeftMargin>
  <minHorizontalAlignment>1</minHorizontalAlignment>
  <baseHorizontalAlignment>28800</baseHorizontalAlignment>
  <bidirectionalAutoUpperLimit>2073600</bidirectionalAutoUpperLimit>
- <minimumMediaSize>504 504</minimumMediaSize>
+ <minimumMediaSize>144 144</minimumMediaSize>
  <maximumMediaSize>4608 86400</maximumMediaSize>
  <maximumImageableArea>4608 86400</maximumImageableArea>
  <margins interleave="soft" media="sheet">9 9 9 40</margins>
@@ -61,76 +60,86 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <margins interleave="soft" media="roll">9 9 0 0</margins>
  <margins interleave="printer" media="roll">9 9 0 0</margins>
  <AlignmentChoices>3 15 0 0</AlignmentChoices>
- <ChannelNames>
-  <ChannelName translate="name" name="Light Light Black"/>
-  <ChannelName translate="name" name="Light Magenta"/>
-  <ChannelName translate="name" name="Light Cyan"/>
-  <ChannelName translate="name" name="Light Black"/>
-  <ChannelName translate="name" name="Black"/>
-  <ChannelName translate="name" name="Cyan"/>
-  <ChannelName translate="name" name="Magenta"/>
-  <ChannelName translate="name" name="Yellow"/>
- </ChannelNames>
  <resolutions>
   <resolution translate="text" name="360x180dpi" text="360 x 180 DPI Draft">
    <physicalResolution>360 180</physicalResolution>
    <printerWeave command="\033(i\001\000\000"/>
-   <parameter type="float" name="escp2_density">2.300000</parameter>
+   <parameter type="float" name="escp2_density">10.000000</parameter>
    <parameter type="integer" name="escp2_ink_type">17</parameter>
    <parameter type="integer" name="escp2_base_res">2880</parameter>
    <parameter type="integer" name="escp2_bits">2</parameter>
-   <parameter type="float" name="DropSize1">0.160000</parameter>
-   <parameter type="float" name="DropSize2">0.400000</parameter>
+   <parameter type="float" name="DropSize1">0.290000</parameter>
+   <parameter type="float" name="DropSize2">0.630000</parameter>
    <parameter type="float" name="DropSize3">1.000000</parameter>
   </resolution>
   <resolution translate="text" name="360pro" text="360 DPI">
    <physicalResolution>360 360</physicalResolution>
    <printerWeave command="\033(i\001\000\001"/>
-   <parameter type="float" name="escp2_density">1.150000</parameter>
+   <parameter type="float" name="escp2_density">5.000000</parameter>
    <parameter type="integer" name="escp2_ink_type">17</parameter>
    <parameter type="integer" name="escp2_base_res">2880</parameter>
    <parameter type="integer" name="escp2_bits">2</parameter>
-   <parameter type="float" name="DropSize1">0.160000</parameter>
-   <parameter type="float" name="DropSize2">0.400000</parameter>
+   <parameter type="float" name="DropSize1">0.290000</parameter>
+   <parameter type="float" name="DropSize2">0.630000</parameter>
    <parameter type="float" name="DropSize3">1.000000</parameter>
   </resolution>
   <resolution translate="text" name="720x360mw" text="720 x 360 DPI">
    <physicalResolution>720 360</physicalResolution>
    <printerWeave command="\033(i\001\000\001"/>
-   <parameter type="float" name="escp2_density">0.580000</parameter>
+   <parameter type="float" name="escp2_density">2.520000</parameter>
    <parameter type="integer" name="escp2_ink_type">17</parameter>
    <parameter type="integer" name="escp2_base_res">2880</parameter>
    <parameter type="integer" name="escp2_bits">2</parameter>
-   <parameter type="float" name="DropSize1">0.160000</parameter>
-   <parameter type="float" name="DropSize2">0.400000</parameter>
+   <parameter type="float" name="DropSize1">0.290000</parameter>
+   <parameter type="float" name="DropSize2">0.630000</parameter>
    <parameter type="float" name="DropSize3">1.000000</parameter>
   </resolution>
   <resolution translate="text" name="720mw" text="720 DPI">
    <physicalResolution>720 720</physicalResolution>
    <printerWeave command="\033(i\001\000\001"/>
-   <parameter type="float" name="escp2_density">0.766000</parameter>
-   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="float" name="escp2_density">1.260000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
    <parameter type="integer" name="escp2_base_res">2880</parameter>
    <parameter type="integer" name="escp2_bits">2</parameter>
-   <parameter type="float" name="DropSize1">0.200000</parameter>
-   <parameter type="float" name="DropSize2">0.450000</parameter>
+   <parameter type="float" name="DropSize1">0.290000</parameter>
+   <parameter type="float" name="DropSize2">0.630000</parameter>
    <parameter type="float" name="DropSize3">1.000000</parameter>
   </resolution>
   <resolution translate="text" name="1440x720mw" text="1440 x 720 DPI">
    <physicalResolution>1440 720</physicalResolution>
    <printerWeave command="\033(i\001\000\001"/>
-   <parameter type="float" name="escp2_density">0.388000</parameter>
+   <parameter type="float" name="escp2_density">0.891000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.275000</parameter>
+   <parameter type="float" name="DropSize2">0.450000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x1440mw" text="1440 x 1440 DPI">
+   <physicalResolution>1440 1440</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.446000</parameter>
    <parameter type="integer" name="escp2_ink_type">16</parameter>
    <parameter type="integer" name="escp2_base_res">2880</parameter>
    <parameter type="integer" name="escp2_bits">2</parameter>
-   <parameter type="float" name="DropSize1">0.200000</parameter>
+   <parameter type="float" name="DropSize1">0.275000</parameter>
    <parameter type="float" name="DropSize2">0.450000</parameter>
    <parameter type="float" name="DropSize3">1.000000</parameter>
   </resolution>
   <resolution translate="text" name="2880x1440mw" text="2880 x 1440 DPI">
    <physicalResolution>2880 1440</physicalResolution>
    <printerWeave command="\033(i\001\000\001"/>
-   <parameter type="float" name="escp2_density">0.479000</parameter>
+   <parameter type="float" name="escp2_density">0.775000</parameter>
+   <parameter type="integer" name="escp2_ink_type">5</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x2880mw" text="2880 x 2880 DPI">
+   <physicalResolution>2880 2880</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.388000</parameter>
    <parameter type="integer" name="escp2_ink_type">5</parameter>
    <parameter type="integer" name="escp2_base_res">2880</parameter>
    <parameter type="integer" name="escp2_bits">1</parameter>
diff --git a/src/xml/escp2/model/model_106.xml b/src/xml/escp2/model/model_106.xml
index 65a3c65..92bd2d4 100644
--- a/src/xml/escp2/model/model_106.xml
+++ b/src/xml/escp2/model/model_106.xml
@@ -22,15 +22,14 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
 </copyright>
 <escp2:model id="106">
  <media src="escp2/media/pro_ultrachrome_k3.xml"/>
- <inputSlots src="escp2/inputslots/pro_roll_feed.xml"/>
+ <inputSlots src="escp2/inputslots/pro_cutter_roll_feed.xml"/>
  <qualityPresets src="escp2/qualitypresets/standard.xml"/>
  <inkGroup src="escp2/inks/pro_ultrachrome_k3.xml"/>
  <printerWeaves src="escp2/weaves/pro7600.xml"/>
- <verticalBorderlessSequence>SN\003\000\000\011\001</verticalBorderlessSequence>
  <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
  <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
  <commandSet>Pro</commandSet>
- <borderless>Yes</borderless>
+ <borderless>HorizontalOnly</borderless>
  <supportsVariableDropsizes/>
  <hasFastGraymode/>
  <sendZeroAdvance/>
@@ -42,18 +41,18 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <FirstNozzle>0</FirstNozzle>
   <NozzleSeparation>1</NozzleSeparation>
  </headConfiguration>
- <physicalChannels>7</physicalChannels>
+ <physicalChannels>8</physicalChannels>
  <baseSeparation>360</baseSeparation>
  <resolutionScale>14400</resolutionScale>
  <minimumResolution>360 180</minimumResolution>
- <maximumResolution>2880 1440</maximumResolution>
+ <maximumResolution>2880 2880</maximumResolution>
  <separationRows>1</separationRows>
- <zeroMarginOffset>80</zeroMarginOffset>
- <microLeftMargin>42</microLeftMargin>
+ <zeroMarginOffset>43</zeroMarginOffset>
+ <microLeftMargin>5</microLeftMargin>
  <minHorizontalAlignment>1</minHorizontalAlignment>
  <baseHorizontalAlignment>28800</baseHorizontalAlignment>
  <bidirectionalAutoUpperLimit>2073600</bidirectionalAutoUpperLimit>
- <minimumMediaSize>504 504</minimumMediaSize>
+ <minimumMediaSize>144 144</minimumMediaSize>
  <maximumMediaSize>1224 86400</maximumMediaSize>
  <maximumImageableArea>1224 86400</maximumImageableArea>
  <margins interleave="soft" media="sheet">9 9 9 40</margins>
@@ -61,74 +60,86 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <margins interleave="soft" media="roll">9 9 0 0</margins>
  <margins interleave="printer" media="roll">9 9 0 0</margins>
  <AlignmentChoices>3 15 0 0</AlignmentChoices>
- <ChannelNames>
-  <ChannelName translate="name" name="Black"/>
-  <ChannelName translate="name" name="Cyan"/>
-  <ChannelName translate="name" name="Magenta"/>
-  <ChannelName translate="name" name="Yellow"/>
-  <ChannelName translate="name" name="Light Cyan"/>
-  <ChannelName translate="name" name="Light Magenta"/>
- </ChannelNames>
  <resolutions>
   <resolution translate="text" name="360x180dpi" text="360 x 180 DPI Draft">
    <physicalResolution>360 180</physicalResolution>
    <printerWeave command="\033(i\001\000\000"/>
-   <parameter type="float" name="escp2_density">2.300000</parameter>
+   <parameter type="float" name="escp2_density">10.000000</parameter>
    <parameter type="integer" name="escp2_ink_type">17</parameter>
    <parameter type="integer" name="escp2_base_res">2880</parameter>
    <parameter type="integer" name="escp2_bits">2</parameter>
-   <parameter type="float" name="DropSize1">0.160000</parameter>
-   <parameter type="float" name="DropSize2">0.400000</parameter>
+   <parameter type="float" name="DropSize1">0.290000</parameter>
+   <parameter type="float" name="DropSize2">0.630000</parameter>
    <parameter type="float" name="DropSize3">1.000000</parameter>
   </resolution>
   <resolution translate="text" name="360pro" text="360 DPI">
    <physicalResolution>360 360</physicalResolution>
    <printerWeave command="\033(i\001\000\001"/>
-   <parameter type="float" name="escp2_density">1.150000</parameter>
+   <parameter type="float" name="escp2_density">5.000000</parameter>
    <parameter type="integer" name="escp2_ink_type">17</parameter>
    <parameter type="integer" name="escp2_base_res">2880</parameter>
    <parameter type="integer" name="escp2_bits">2</parameter>
-   <parameter type="float" name="DropSize1">0.160000</parameter>
-   <parameter type="float" name="DropSize2">0.400000</parameter>
+   <parameter type="float" name="DropSize1">0.290000</parameter>
+   <parameter type="float" name="DropSize2">0.630000</parameter>
    <parameter type="float" name="DropSize3">1.000000</parameter>
   </resolution>
   <resolution translate="text" name="720x360mw" text="720 x 360 DPI">
    <physicalResolution>720 360</physicalResolution>
    <printerWeave command="\033(i\001\000\001"/>
-   <parameter type="float" name="escp2_density">0.580000</parameter>
+   <parameter type="float" name="escp2_density">2.520000</parameter>
    <parameter type="integer" name="escp2_ink_type">17</parameter>
    <parameter type="integer" name="escp2_base_res">2880</parameter>
    <parameter type="integer" name="escp2_bits">2</parameter>
-   <parameter type="float" name="DropSize1">0.160000</parameter>
-   <parameter type="float" name="DropSize2">0.400000</parameter>
+   <parameter type="float" name="DropSize1">0.290000</parameter>
+   <parameter type="float" name="DropSize2">0.630000</parameter>
    <parameter type="float" name="DropSize3">1.000000</parameter>
   </resolution>
   <resolution translate="text" name="720mw" text="720 DPI">
    <physicalResolution>720 720</physicalResolution>
    <printerWeave command="\033(i\001\000\001"/>
-   <parameter type="float" name="escp2_density">0.766000</parameter>
-   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="float" name="escp2_density">1.260000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
    <parameter type="integer" name="escp2_base_res">2880</parameter>
    <parameter type="integer" name="escp2_bits">2</parameter>
-   <parameter type="float" name="DropSize1">0.200000</parameter>
-   <parameter type="float" name="DropSize2">0.450000</parameter>
+   <parameter type="float" name="DropSize1">0.290000</parameter>
+   <parameter type="float" name="DropSize2">0.630000</parameter>
    <parameter type="float" name="DropSize3">1.000000</parameter>
   </resolution>
   <resolution translate="text" name="1440x720mw" text="1440 x 720 DPI">
    <physicalResolution>1440 720</physicalResolution>
    <printerWeave command="\033(i\001\000\001"/>
-   <parameter type="float" name="escp2_density">0.388000</parameter>
+   <parameter type="float" name="escp2_density">0.891000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.275000</parameter>
+   <parameter type="float" name="DropSize2">0.450000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x1440mw" text="1440 x 1440 DPI">
+   <physicalResolution>1440 1440</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.446000</parameter>
    <parameter type="integer" name="escp2_ink_type">16</parameter>
    <parameter type="integer" name="escp2_base_res">2880</parameter>
    <parameter type="integer" name="escp2_bits">2</parameter>
-   <parameter type="float" name="DropSize1">0.200000</parameter>
+   <parameter type="float" name="DropSize1">0.275000</parameter>
    <parameter type="float" name="DropSize2">0.450000</parameter>
    <parameter type="float" name="DropSize3">1.000000</parameter>
   </resolution>
   <resolution translate="text" name="2880x1440mw" text="2880 x 1440 DPI">
    <physicalResolution>2880 1440</physicalResolution>
    <printerWeave command="\033(i\001\000\001"/>
-   <parameter type="float" name="escp2_density">0.479000</parameter>
+   <parameter type="float" name="escp2_density">0.775000</parameter>
+   <parameter type="integer" name="escp2_ink_type">5</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x2880mw" text="2880 x 2880 DPI">
+   <physicalResolution>2880 2880</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.388000</parameter>
    <parameter type="integer" name="escp2_ink_type">5</parameter>
    <parameter type="integer" name="escp2_base_res">2880</parameter>
    <parameter type="integer" name="escp2_bits">1</parameter>
diff --git a/src/xml/escp2/model/model_107.xml b/src/xml/escp2/model/model_107.xml
index 00ac63b..ee6047b 100644
--- a/src/xml/escp2/model/model_107.xml
+++ b/src/xml/escp2/model/model_107.xml
@@ -19,14 +19,13 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, write to the Free Software
  *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *************    file was modified by Sergey Y.  from R2880 to be used for Pro3880
 </copyright>
 <escp2:model id="107">
- <media src="escp2/media/pro3880_ultrachrome_k3v.xml"/>
+ <media src="escp2/media/pro_ultrachrome_k3v.xml"/>
  <inputSlots src="escp2/inputslots/pro3880.xml"/>
- <qualityPresets src="escp2/qualitypresets/v2880.xml"/>
- <inkGroup src="escp2/inks/f360_ultrachrome_k3v.xml"/>
- <mediaSizes src="escp2/mediasizes/standard.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/pro_ultrachrome_k3v.xml"/>
+ <printerWeaves src="escp2/weaves/pro7600.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>
@@ -37,97 +36,113 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <hasFastGraymode/>
  <sendZeroAdvance/>
  <supportsD4Mode/>
- <hasInterchangeableInkCartridges/>
  <preferredEnvelopeOrientation>Portrait</preferredEnvelopeOrientation>
  <headConfiguration type="default">
-  <Nozzles>180</Nozzles>
+  <Nozzles>1</Nozzles>
   <MinNozzles>1</MinNozzles>
   <FirstNozzle>0</FirstNozzle>
-  <NozzleSeparation>2</NozzleSeparation>
+  <NozzleSeparation>1</NozzleSeparation>
  </headConfiguration>
- <physicalChannels>8</physicalChannels>
+ <physicalChannels>9</physicalChannels>
  <baseSeparation>360</baseSeparation>
  <resolutionScale>14400</resolutionScale>
  <minimumResolution>360 180</minimumResolution>
- <maximumResolution>2880 1440</maximumResolution>
- <extraVerticalFeed>10</extraVerticalFeed>
+ <maximumResolution>2880 2880</maximumResolution>
  <separationRows>1</separationRows>
- <zeroMarginOffset>50</zeroMarginOffset>
- <microLeftMargin>42</microLeftMargin>
+ <zeroMarginOffset>43</zeroMarginOffset>
+ <microLeftMargin>5</microLeftMargin>
  <minHorizontalAlignment>1</minHorizontalAlignment>
- <baseHorizontalAlignment>180</baseHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
  <bidirectionalAutoUpperLimit>2073600</bidirectionalAutoUpperLimit>
  <minimumMediaSize>144 144</minimumMediaSize>
  <maximumMediaSize>1224 86400</maximumMediaSize>
  <maximumImageableArea>1224 86400</maximumImageableArea>
- <margins interleave="soft" media="sheet">9 9 0 0</margins>
- <margins interleave="printer" media="sheet">9 9 0 0</margins>
- <AlignmentChoices>4 15 0 0</AlignmentChoices>
- <ChannelNames>
-  <ChannelName translate="name" name="Light Light Black"/>
-  <ChannelName translate="name" name="Vivid Light Magenta"/>
-  <ChannelName translate="name" name="Light Cyan"/>
-  <ChannelName translate="name" name="Light Black"/>
-  <ChannelName translate="name" name="Black"/>
-  <ChannelName translate="name" name="Cyan"/>
-  <ChannelName translate="name" name="Vivid Magenta"/>
-  <ChannelName translate="name" name="Yellow"/>
- </ChannelNames>
+ <margins interleave="soft" media="sheet">9 9 9 40</margins>
+ <margins interleave="printer" media="sheet">9 9 9 40</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <AlignmentChoices>3 15 0 0</AlignmentChoices>
  <resolutions>
   <resolution translate="text" name="360x180dpi" text="360 x 180 DPI Draft">
    <physicalResolution>360 180</physicalResolution>
-   <parameter type="float" name="escp2_density">2.300000</parameter>
-   <parameter type="integer" name="escp2_ink_type">16</parameter>
-   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">10.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
    <parameter type="integer" name="escp2_bits">2</parameter>
-   <parameter type="float" name="DropSize1">1.000000</parameter>
+   <parameter type="float" name="DropSize1">0.290000</parameter>
+   <parameter type="float" name="DropSize2">0.630000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
   </resolution>
-  <resolution translate="text" name="360dpi" text="360 DPI">
+  <resolution translate="text" name="360pro" text="360 DPI">
    <physicalResolution>360 360</physicalResolution>
-   <parameter type="float" name="escp2_density">1.150000</parameter>
-   <parameter type="integer" name="escp2_ink_type">16</parameter>
-   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">5.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
    <parameter type="integer" name="escp2_bits">2</parameter>
-   <parameter type="float" name="DropSize1">1.000000</parameter>
+   <parameter type="float" name="DropSize1">0.290000</parameter>
+   <parameter type="float" name="DropSize2">0.630000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
   </resolution>
-  <resolution translate="text" name="720x360dpi" text="720 x 360 DPI">
+  <resolution translate="text" name="720x360mw" text="720 x 360 DPI">
    <physicalResolution>720 360</physicalResolution>
-   <printerWeave command="\033(i\003\000\001\000\000"/>
-   <parameter type="float" name="escp2_density">0.580000</parameter>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">2.520000</parameter>
    <parameter type="integer" name="escp2_ink_type">17</parameter>
-   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
    <parameter type="integer" name="escp2_bits">2</parameter>
-   <parameter type="float" name="DropSize1">0.180000</parameter>
-   <parameter type="float" name="DropSize2">0.440000</parameter>
+   <parameter type="float" name="DropSize1">0.290000</parameter>
+   <parameter type="float" name="DropSize2">0.630000</parameter>
    <parameter type="float" name="DropSize3">1.000000</parameter>
   </resolution>
-  <resolution translate="text" name="720dpi" text="720 DPI">	  
+  <resolution translate="text" name="720mw" text="720 DPI">
    <physicalResolution>720 720</physicalResolution>
-   <printerWeave command="\033(i\003\000\001\000\000"/>
-   <parameter type="float" name="escp2_density">0.775000</parameter>
-   <parameter type="integer" name="escp2_ink_type">18</parameter>
-   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">1.260000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
    <parameter type="integer" name="escp2_bits">2</parameter>
-   <parameter type="float" name="DropSize1">0.180000</parameter>
-   <parameter type="float" name="DropSize2">0.440000</parameter>
+   <parameter type="float" name="DropSize1">0.290000</parameter>
+   <parameter type="float" name="DropSize2">0.630000</parameter>
    <parameter type="float" name="DropSize3">1.000000</parameter>
   </resolution>
-  <resolution translate="text" name="1440x720dpi" text="1440 x 720 DPI">
+  <resolution translate="text" name="1440x720mw" text="1440 x 720 DPI">
    <physicalResolution>1440 720</physicalResolution>
-   <printerWeave command="\033(i\003\000\001\000\000"/>
-   <parameter type="float" name="escp2_density">0.575000</parameter>
-   <parameter type="integer" name="escp2_ink_type">18</parameter>
-   <parameter type="integer" name="escp2_base_res">1440</parameter>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.891000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
    <parameter type="integer" name="escp2_bits">2</parameter>
-   <parameter type="float" name="DropSize1">0.180000</parameter>
-   <parameter type="float" name="DropSize2">0.440000</parameter>
+   <parameter type="float" name="DropSize1">0.275000</parameter>
+   <parameter type="float" name="DropSize2">0.450000</parameter>
    <parameter type="float" name="DropSize3">1.000000</parameter>
   </resolution>
-  <resolution translate="text" name="2880x1440dpi" text="2880 x 1440 DPI">
+  <resolution translate="text" name="1440x1440mw" text="1440 x 1440 DPI">
+   <physicalResolution>1440 1440</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.446000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.275000</parameter>
+   <parameter type="float" name="DropSize2">0.450000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x1440mw" text="2880 x 1440 DPI">
    <physicalResolution>2880 1440</physicalResolution>
-   <printerWeave command="\033(i\003\000\001\000\000"/>
-   <parameter type="float" name="escp2_density">0.875000</parameter>
-   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.775000</parameter>
+   <parameter type="integer" name="escp2_ink_type">5</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x2880mw" text="2880 x 2880 DPI">
+   <physicalResolution>2880 2880</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.388000</parameter>
+   <parameter type="integer" name="escp2_ink_type">5</parameter>
    <parameter type="integer" name="escp2_base_res">2880</parameter>
    <parameter type="integer" name="escp2_bits">1</parameter>
    <parameter type="float" name="DropSize1">1.000000</parameter>
diff --git a/src/xml/escp2/model/model_108.xml b/src/xml/escp2/model/model_108.xml
new file mode 100644
index 0000000..1f5d5a1
--- /dev/null
+++ b/src/xml/escp2/model/model_108.xml
@@ -0,0 +1,163 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:model id="108">
+ <media src="escp2/media/pro_ultrachrome_k3.xml"/>
+ <inputSlots src="escp2/inputslots/pro3880.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/pro_ultrachrome_k3.xml"/>
+ <printerWeaves src="escp2/weaves/pro7600.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>Pro</commandSet>
+ <borderless>Yes</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <hasInterchangeableInkCartridges/>
+ <preferredEnvelopeOrientation>Portrait</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>1</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>9</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>360 180</minimumResolution>
+ <maximumResolution>2880 2880</maximumResolution>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>43</zeroMarginOffset>
+ <microLeftMargin>5</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>2073600</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>1224 86400</maximumMediaSize>
+ <maximumImageableArea>1224 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 9 40</margins>
+ <margins interleave="printer" media="sheet">9 9 9 40</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <AlignmentChoices>3 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Light Light Black"/>
+  <ChannelName translate="name" name="Light Magenta"/>
+  <ChannelName translate="name" name="Light Cyan"/>
+  <ChannelName translate="name" name="Light Black"/>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x180dpi" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">10.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.290000</parameter>
+   <parameter type="float" name="DropSize2">0.630000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360pro" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">5.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.290000</parameter>
+   <parameter type="float" name="DropSize2">0.630000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360mw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">2.520000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.290000</parameter>
+   <parameter type="float" name="DropSize2">0.630000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720mw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">1.260000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.290000</parameter>
+   <parameter type="float" name="DropSize2">0.630000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720mw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.891000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.275000</parameter>
+   <parameter type="float" name="DropSize2">0.450000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x1440mw" text="1440 x 1440 DPI">
+   <physicalResolution>1440 1440</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.446000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.275000</parameter>
+   <parameter type="float" name="DropSize2">0.450000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x1440mw" text="2880 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.775000</parameter>
+   <parameter type="integer" name="escp2_ink_type">5</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x2880mw" text="2880 x 2880 DPI">
+   <physicalResolution>2880 2880</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.388000</parameter>
+   <parameter type="integer" name="escp2_ink_type">5</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_109.xml b/src/xml/escp2/model/model_109.xml
new file mode 100644
index 0000000..768e8f9
--- /dev/null
+++ b/src/xml/escp2/model/model_109.xml
@@ -0,0 +1,150 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:model id="109">
+ <media src="escp2/media/pro_ultrachrome_k3v.xml"/>
+ <inputSlots src="escp2/inputslots/pro_cutter_roll_feed.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/pro_ultrachrome_k3v4.xml"/>
+ <printerWeaves src="escp2/weaves/pro7600.xml"/>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>Pro</commandSet>
+ <borderless>HorizontalOnly</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>1</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>8</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>360 180</minimumResolution>
+ <maximumResolution>2880 2880</maximumResolution>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>43</zeroMarginOffset>
+ <microLeftMargin>5</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>2073600</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>1728 86400</maximumMediaSize>
+ <maximumImageableArea>1728 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 9 40</margins>
+ <margins interleave="printer" media="sheet">9 9 9 40</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <AlignmentChoices>3 15 0 0</AlignmentChoices>
+ <resolutions>
+  <resolution translate="text" name="360x180dpi" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">10.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.290000</parameter>
+   <parameter type="float" name="DropSize2">0.630000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360pro" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">5.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.290000</parameter>
+   <parameter type="float" name="DropSize2">0.630000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360mw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">2.520000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.290000</parameter>
+   <parameter type="float" name="DropSize2">0.630000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720mw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">1.260000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.290000</parameter>
+   <parameter type="float" name="DropSize2">0.630000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720mw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.891000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.275000</parameter>
+   <parameter type="float" name="DropSize2">0.450000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x1440mw" text="1440 x 1440 DPI">
+   <physicalResolution>1440 1440</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.446000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.275000</parameter>
+   <parameter type="float" name="DropSize2">0.450000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x1440mw" text="2880 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.775000</parameter>
+   <parameter type="integer" name="escp2_ink_type">5</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x2880mw" text="2880 x 2880 DPI">
+   <physicalResolution>2880 2880</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.388000</parameter>
+   <parameter type="integer" name="escp2_ink_type">5</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_110.xml b/src/xml/escp2/model/model_110.xml
new file mode 100644
index 0000000..15d06c9
--- /dev/null
+++ b/src/xml/escp2/model/model_110.xml
@@ -0,0 +1,150 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:model id="110">
+ <media src="escp2/media/pro_ultrachrome_k3v.xml"/>
+ <inputSlots src="escp2/inputslots/pro_cutter_roll_feed.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/pro_ultrachrome_k3v4.xml"/>
+ <printerWeaves src="escp2/weaves/pro7600.xml"/>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>Pro</commandSet>
+ <borderless>HorizontalOnly</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>1</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>8</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>360 180</minimumResolution>
+ <maximumResolution>2880 2880</maximumResolution>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>43</zeroMarginOffset>
+ <microLeftMargin>5</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>2073600</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>3168 86400</maximumMediaSize>
+ <maximumImageableArea>3168 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 9 40</margins>
+ <margins interleave="printer" media="sheet">9 9 9 40</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <AlignmentChoices>3 15 0 0</AlignmentChoices>
+ <resolutions>
+  <resolution translate="text" name="360x180dpi" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">10.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.290000</parameter>
+   <parameter type="float" name="DropSize2">0.630000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360pro" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">5.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.290000</parameter>
+   <parameter type="float" name="DropSize2">0.630000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360mw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">2.520000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.290000</parameter>
+   <parameter type="float" name="DropSize2">0.630000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720mw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">1.260000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.290000</parameter>
+   <parameter type="float" name="DropSize2">0.630000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720mw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.891000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.275000</parameter>
+   <parameter type="float" name="DropSize2">0.450000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x1440mw" text="1440 x 1440 DPI">
+   <physicalResolution>1440 1440</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.446000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.275000</parameter>
+   <parameter type="float" name="DropSize2">0.450000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x1440mw" text="2880 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.775000</parameter>
+   <parameter type="integer" name="escp2_ink_type">5</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x2880mw" text="2880 x 2880 DPI">
+   <physicalResolution>2880 2880</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.388000</parameter>
+   <parameter type="integer" name="escp2_ink_type">5</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_111.xml b/src/xml/escp2/model/model_111.xml
new file mode 100644
index 0000000..5736029
--- /dev/null
+++ b/src/xml/escp2/model/model_111.xml
@@ -0,0 +1,137 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:model id="111">
+ <media src="escp2/media/pro_ultrachrome_k3.xml"/>
+ <inputSlots src="escp2/inputslots/pro_roll_feed.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/pro_ultrachrome_k34.xml"/>
+ <printerWeaves src="escp2/weaves/pro7600.xml"/>
+ <verticalBorderlessSequence>SN\003\000\000\011\001</verticalBorderlessSequence>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>Pro</commandSet>
+ <borderless>Yes</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>1</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>7</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>360 180</minimumResolution>
+ <maximumResolution>2880 1440</maximumResolution>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>2073600</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>504 504</minimumMediaSize>
+ <maximumMediaSize>1224 86400</maximumMediaSize>
+ <maximumImageableArea>1224 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 9 40</margins>
+ <margins interleave="printer" media="sheet">9 9 9 40</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <AlignmentChoices>3 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x180dpi" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.160000</parameter>
+   <parameter type="float" name="DropSize2">0.400000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360pro" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">1.150000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.160000</parameter>
+   <parameter type="float" name="DropSize2">0.400000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360mw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.580000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.160000</parameter>
+   <parameter type="float" name="DropSize2">0.400000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720mw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.766000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.200000</parameter>
+   <parameter type="float" name="DropSize2">0.450000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720mw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.388000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.200000</parameter>
+   <parameter type="float" name="DropSize2">0.450000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x1440mw" text="2880 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.479000</parameter>
+   <parameter type="integer" name="escp2_ink_type">5</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_112.xml b/src/xml/escp2/model/model_112.xml
new file mode 100644
index 0000000..fa3b364
--- /dev/null
+++ b/src/xml/escp2/model/model_112.xml
@@ -0,0 +1,139 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:model id="112">
+ <media src="escp2/media/pro_ultrachrome.xml"/>
+ <inputSlots src="escp2/inputslots/pro_roll_feed.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/pro_ultrachrome.xml"/>
+ <printerWeaves src="escp2/weaves/pro7600.xml"/>
+ <verticalBorderlessSequence>SN\003\000\000\011\001</verticalBorderlessSequence>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>Pro</commandSet>
+ <borderless>Yes</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>1</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>7</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>360 180</minimumResolution>
+ <maximumResolution>2880 1440</maximumResolution>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>2073600</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>1224 86400</maximumMediaSize>
+ <maximumImageableArea>1224 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 9 40</margins>
+ <margins interleave="printer" media="sheet">9 9 9 40</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <AlignmentChoices>3 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+  <ChannelName translate="name" name="Light Cyan"/>
+  <ChannelName translate="name" name="Light Magenta"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x180dpi" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.160000</parameter>
+   <parameter type="float" name="DropSize2">0.400000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360pro" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">1.150000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.160000</parameter>
+   <parameter type="float" name="DropSize2">0.400000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360mw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.580000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.160000</parameter>
+   <parameter type="float" name="DropSize2">0.400000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720mw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.766000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.200000</parameter>
+   <parameter type="float" name="DropSize2">0.450000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720mw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.388000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.200000</parameter>
+   <parameter type="float" name="DropSize2">0.450000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x1440mw" text="2880 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.479000</parameter>
+   <parameter type="integer" name="escp2_ink_type">5</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_113.xml b/src/xml/escp2/model/model_113.xml
new file mode 100644
index 0000000..c1c5202
--- /dev/null
+++ b/src/xml/escp2/model/model_113.xml
@@ -0,0 +1,139 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:model id="113">
+ <media src="escp2/media/pro_ultrachrome.xml"/>
+ <inputSlots src="escp2/inputslots/pro_roll_feed.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/pro_ultrachrome.xml"/>
+ <printerWeaves src="escp2/weaves/pro7600.xml"/>
+ <verticalBorderlessSequence>SN\003\000\000\011\001</verticalBorderlessSequence>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>Pro</commandSet>
+ <borderless>Yes</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>1</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>7</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>360 180</minimumResolution>
+ <maximumResolution>2880 1440</maximumResolution>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>2073600</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>4608 86400</maximumMediaSize>
+ <maximumImageableArea>4608 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 9 40</margins>
+ <margins interleave="printer" media="sheet">9 9 9 40</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <AlignmentChoices>3 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+  <ChannelName translate="name" name="Light Cyan"/>
+  <ChannelName translate="name" name="Light Magenta"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x180dpi" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.160000</parameter>
+   <parameter type="float" name="DropSize2">0.400000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360pro" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">1.150000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.160000</parameter>
+   <parameter type="float" name="DropSize2">0.400000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360mw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.580000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.160000</parameter>
+   <parameter type="float" name="DropSize2">0.400000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720mw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.766000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.200000</parameter>
+   <parameter type="float" name="DropSize2">0.450000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720mw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.388000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.200000</parameter>
+   <parameter type="float" name="DropSize2">0.450000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x1440mw" text="2880 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.479000</parameter>
+   <parameter type="integer" name="escp2_ink_type">5</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_114.xml b/src/xml/escp2/model/model_114.xml
new file mode 100644
index 0000000..96e04c6
--- /dev/null
+++ b/src/xml/escp2/model/model_114.xml
@@ -0,0 +1,139 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:model id="114">
+ <media src="escp2/media/pro_ultrachrome.xml"/>
+ <inputSlots src="escp2/inputslots/pro_roll_feed.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/pro_ultrachrome.xml"/>
+ <printerWeaves src="escp2/weaves/pro7600.xml"/>
+ <verticalBorderlessSequence>SN\003\000\000\011\001</verticalBorderlessSequence>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>Pro</commandSet>
+ <borderless>Yes</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>1</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>7</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>360 180</minimumResolution>
+ <maximumResolution>2880 1440</maximumResolution>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>2073600</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>1224 86400</maximumMediaSize>
+ <maximumImageableArea>1224 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 9 40</margins>
+ <margins interleave="printer" media="sheet">9 9 9 40</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <AlignmentChoices>3 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+  <ChannelName translate="name" name="Light Cyan"/>
+  <ChannelName translate="name" name="Light Magenta"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x180dpi" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.160000</parameter>
+   <parameter type="float" name="DropSize2">0.400000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360pro" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">1.150000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.160000</parameter>
+   <parameter type="float" name="DropSize2">0.400000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360mw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.580000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.160000</parameter>
+   <parameter type="float" name="DropSize2">0.400000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720mw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.766000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.200000</parameter>
+   <parameter type="float" name="DropSize2">0.450000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720mw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.388000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.200000</parameter>
+   <parameter type="float" name="DropSize2">0.450000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x1440mw" text="2880 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.479000</parameter>
+   <parameter type="integer" name="escp2_ink_type">5</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_115.xml b/src/xml/escp2/model/model_115.xml
new file mode 100644
index 0000000..bd5c3e1
--- /dev/null
+++ b/src/xml/escp2/model/model_115.xml
@@ -0,0 +1,164 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:model id="115">
+ <media src="escp2/media/f360_ultrachrome_k3v.xml"/>
+ <inputSlots src="escp2/inputslots/r2880.xml"/>
+ <qualityPresets src="escp2/qualitypresets/v2880.xml"/>
+ <inkGroup src="escp2/inks/f360_ultrachrome_k3v_2.xml"/>
+ <mediaSizes src="escp2/mediasizes/standard.xml"/>
+ <verticalBorderlessSequence>US\003\000\000\000\002</verticalBorderlessSequence>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <preinitRemoteSequence>SN\001\000\000</preinitRemoteSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>2000</commandSet>
+ <borderless>Full</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <hasInterchangeableInkCartridges/>
+ <preferredEnvelopeOrientation>Portrait</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>180</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>2</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>9</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>360 180</minimumResolution>
+ <maximumResolution>5760 2880</maximumResolution>
+ <extraVerticalFeed>10</extraVerticalFeed>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>96</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>180</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>2073600</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>936 86400</maximumMediaSize>
+ <maximumImageableArea>936 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 0</margins>
+ <margins interleave="printer" media="sheet">9 9 0 0</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <CDOffset>221 262</CDOffset>
+ <CDMediaSize>595 842</CDMediaSize>
+ <AlignmentChoices>4 15 0 0</AlignmentChoices>
+ <ChannelNames>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x180sw" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <parameter type="float" name="escp2_density">3.270000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.630000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">3.110000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.180000</parameter>
+   <parameter type="float" name="DropSize2">0.440000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">1.550000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.180000</parameter>
+   <parameter type="float" name="DropSize2">0.440000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720sw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.775000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.180000</parameter>
+   <parameter type="float" name="DropSize2">0.440000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x1440ov" text="1440 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <printedResolution>1440 1440</printedResolution>
+   <parameter type="float" name="escp2_density">0.387000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.180000</parameter>
+   <parameter type="float" name="DropSize2">0.440000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x1440sw" text="2880 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.420000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.410000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="5760x1440sw" text="5760 x 1440 DPI">
+   <physicalResolution>5760 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.513000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x2880sw" text="2880 x 2880 DPI">
+   <physicalResolution>2880 2880</physicalResolution>
+   <parameter type="float" name="escp2_density">0.513000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="5760x2880sw" text="5760 x 2880 DPI">
+   <physicalResolution>5760 2880</physicalResolution>
+   <parameter type="float" name="escp2_density">0.255000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_48.xml b/src/xml/escp2/model/model_48.xml
index 7ae84d7..402e28d 100644
--- a/src/xml/escp2/model/model_48.xml
+++ b/src/xml/escp2/model/model_48.xml
@@ -53,7 +53,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <minHorizontalAlignment>1</minHorizontalAlignment>
  <baseHorizontalAlignment>28800</baseHorizontalAlignment>
  <bidirectionalAutoUpperLimit>2073600</bidirectionalAutoUpperLimit>
- <minimumMediaSize>504 504</minimumMediaSize>
+ <minimumMediaSize>144 144</minimumMediaSize>
  <maximumMediaSize>1728 86400</maximumMediaSize>
  <maximumImageableArea>1728 86400</maximumImageableArea>
  <margins interleave="soft" media="sheet">9 9 9 40</margins>
diff --git a/src/xml/escp2/model/model_49.xml b/src/xml/escp2/model/model_49.xml
index 41ebb87..0186d97 100644
--- a/src/xml/escp2/model/model_49.xml
+++ b/src/xml/escp2/model/model_49.xml
@@ -53,7 +53,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <minHorizontalAlignment>1</minHorizontalAlignment>
  <baseHorizontalAlignment>28800</baseHorizontalAlignment>
  <bidirectionalAutoUpperLimit>2073600</bidirectionalAutoUpperLimit>
- <minimumMediaSize>504 504</minimumMediaSize>
+ <minimumMediaSize>144 144</minimumMediaSize>
  <maximumMediaSize>3168 86400</maximumMediaSize>
  <maximumImageableArea>3168 86400</maximumImageableArea>
  <margins interleave="soft" media="sheet">9 9 9 40</margins>
diff --git a/src/xml/escp2/model/model_88.xml b/src/xml/escp2/model/model_88.xml
index 34f46fe..755938c 100644
--- a/src/xml/escp2/model/model_88.xml
+++ b/src/xml/escp2/model/model_88.xml
@@ -45,14 +45,14 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <baseSeparation>360</baseSeparation>
  <resolutionScale>14400</resolutionScale>
  <minimumResolution>360 180</minimumResolution>
- <maximumResolution>2880 1440</maximumResolution>
+ <maximumResolution>2880 2880</maximumResolution>
  <separationRows>1</separationRows>
  <zeroMarginOffset>43</zeroMarginOffset>
  <microLeftMargin>5</microLeftMargin>
  <minHorizontalAlignment>1</minHorizontalAlignment>
  <baseHorizontalAlignment>28800</baseHorizontalAlignment>
  <bidirectionalAutoUpperLimit>2073600</bidirectionalAutoUpperLimit>
- <minimumMediaSize>504 504</minimumMediaSize>
+ <minimumMediaSize>144 144</minimumMediaSize>
  <maximumMediaSize>4608 86400</maximumMediaSize>
  <maximumImageableArea>4608 86400</maximumImageableArea>
  <margins interleave="soft" media="sheet">9 9 9 40</margins>
@@ -60,76 +60,86 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <margins interleave="soft" media="roll">9 9 0 0</margins>
  <margins interleave="printer" media="roll">9 9 0 0</margins>
  <AlignmentChoices>3 15 0 0</AlignmentChoices>
- <ChannelNames>
-  <ChannelName translate="name" name="Light Light Black"/>
-  <ChannelName translate="name" name="Vivid Light Magenta"/>
-  <ChannelName translate="name" name="Light Cyan"/>
-  <ChannelName translate="name" name="Light Black"/>
-  <ChannelName translate="name" name="Black"/>
-  <ChannelName translate="name" name="Cyan"/>
-  <ChannelName translate="name" name="Vivid Magenta"/>
-  <ChannelName translate="name" name="Yellow"/>
- </ChannelNames>
  <resolutions>
   <resolution translate="text" name="360x180dpi" text="360 x 180 DPI Draft">
    <physicalResolution>360 180</physicalResolution>
    <printerWeave command="\033(i\001\000\000"/>
-   <parameter type="float" name="escp2_density">2.300000</parameter>
+   <parameter type="float" name="escp2_density">10.000000</parameter>
    <parameter type="integer" name="escp2_ink_type">17</parameter>
    <parameter type="integer" name="escp2_base_res">2880</parameter>
    <parameter type="integer" name="escp2_bits">2</parameter>
-   <parameter type="float" name="DropSize1">0.160000</parameter>
-   <parameter type="float" name="DropSize2">0.400000</parameter>
+   <parameter type="float" name="DropSize1">0.290000</parameter>
+   <parameter type="float" name="DropSize2">0.630000</parameter>
    <parameter type="float" name="DropSize3">1.000000</parameter>
   </resolution>
   <resolution translate="text" name="360pro" text="360 DPI">
    <physicalResolution>360 360</physicalResolution>
    <printerWeave command="\033(i\001\000\001"/>
-   <parameter type="float" name="escp2_density">1.150000</parameter>
+   <parameter type="float" name="escp2_density">5.000000</parameter>
    <parameter type="integer" name="escp2_ink_type">17</parameter>
    <parameter type="integer" name="escp2_base_res">2880</parameter>
    <parameter type="integer" name="escp2_bits">2</parameter>
-   <parameter type="float" name="DropSize1">0.160000</parameter>
-   <parameter type="float" name="DropSize2">0.400000</parameter>
+   <parameter type="float" name="DropSize1">0.290000</parameter>
+   <parameter type="float" name="DropSize2">0.630000</parameter>
    <parameter type="float" name="DropSize3">1.000000</parameter>
   </resolution>
   <resolution translate="text" name="720x360mw" text="720 x 360 DPI">
    <physicalResolution>720 360</physicalResolution>
    <printerWeave command="\033(i\001\000\001"/>
-   <parameter type="float" name="escp2_density">0.580000</parameter>
+   <parameter type="float" name="escp2_density">2.520000</parameter>
    <parameter type="integer" name="escp2_ink_type">17</parameter>
    <parameter type="integer" name="escp2_base_res">2880</parameter>
    <parameter type="integer" name="escp2_bits">2</parameter>
-   <parameter type="float" name="DropSize1">0.160000</parameter>
-   <parameter type="float" name="DropSize2">0.400000</parameter>
+   <parameter type="float" name="DropSize1">0.290000</parameter>
+   <parameter type="float" name="DropSize2">0.630000</parameter>
    <parameter type="float" name="DropSize3">1.000000</parameter>
   </resolution>
   <resolution translate="text" name="720mw" text="720 DPI">
    <physicalResolution>720 720</physicalResolution>
    <printerWeave command="\033(i\001\000\001"/>
-   <parameter type="float" name="escp2_density">0.766000</parameter>
-   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="float" name="escp2_density">1.260000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
    <parameter type="integer" name="escp2_base_res">2880</parameter>
    <parameter type="integer" name="escp2_bits">2</parameter>
-   <parameter type="float" name="DropSize1">0.200000</parameter>
-   <parameter type="float" name="DropSize2">0.450000</parameter>
+   <parameter type="float" name="DropSize1">0.290000</parameter>
+   <parameter type="float" name="DropSize2">0.630000</parameter>
    <parameter type="float" name="DropSize3">1.000000</parameter>
   </resolution>
   <resolution translate="text" name="1440x720mw" text="1440 x 720 DPI">
    <physicalResolution>1440 720</physicalResolution>
    <printerWeave command="\033(i\001\000\001"/>
-   <parameter type="float" name="escp2_density">0.388000</parameter>
+   <parameter type="float" name="escp2_density">0.891000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.275000</parameter>
+   <parameter type="float" name="DropSize2">0.450000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x1440mw" text="1440 x 1440 DPI">
+   <physicalResolution>1440 1440</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.446000</parameter>
    <parameter type="integer" name="escp2_ink_type">16</parameter>
    <parameter type="integer" name="escp2_base_res">2880</parameter>
    <parameter type="integer" name="escp2_bits">2</parameter>
-   <parameter type="float" name="DropSize1">0.200000</parameter>
+   <parameter type="float" name="DropSize1">0.275000</parameter>
    <parameter type="float" name="DropSize2">0.450000</parameter>
    <parameter type="float" name="DropSize3">1.000000</parameter>
   </resolution>
   <resolution translate="text" name="2880x1440mw" text="2880 x 1440 DPI">
    <physicalResolution>2880 1440</physicalResolution>
    <printerWeave command="\033(i\001\000\001"/>
-   <parameter type="float" name="escp2_density">0.479000</parameter>
+   <parameter type="float" name="escp2_density">0.775000</parameter>
+   <parameter type="integer" name="escp2_ink_type">5</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x2880mw" text="2880 x 2880 DPI">
+   <physicalResolution>2880 2880</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.388000</parameter>
    <parameter type="integer" name="escp2_ink_type">5</parameter>
    <parameter type="integer" name="escp2_base_res">2880</parameter>
    <parameter type="integer" name="escp2_bits">1</parameter>
diff --git a/src/xml/escp2/model/model_89.xml b/src/xml/escp2/model/model_89.xml
index adb40bb..9866e37 100644
--- a/src/xml/escp2/model/model_89.xml
+++ b/src/xml/escp2/model/model_89.xml
@@ -45,7 +45,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <baseSeparation>360</baseSeparation>
  <resolutionScale>14400</resolutionScale>
  <minimumResolution>360 180</minimumResolution>
- <maximumResolution>2880 1440</maximumResolution>
+ <maximumResolution>2880 2880</maximumResolution>
  <separationRows>1</separationRows>
  <zeroMarginOffset>43</zeroMarginOffset>
  <microLeftMargin>5</microLeftMargin>
@@ -53,83 +53,93 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <baseHorizontalAlignment>28800</baseHorizontalAlignment>
  <bidirectionalAutoUpperLimit>2073600</bidirectionalAutoUpperLimit>
  <minimumMediaSize>144 144</minimumMediaSize>
- <maximumMediaSize>1224 86400</maximumMediaSize>
- <maximumImageableArea>1224 86400</maximumImageableArea>
+ <maximumMediaSize>1728 86400</maximumMediaSize>
+ <maximumImageableArea>1728 86400</maximumImageableArea>
  <margins interleave="soft" media="sheet">9 9 9 40</margins>
  <margins interleave="printer" media="sheet">9 9 9 40</margins>
  <margins interleave="soft" media="roll">9 9 0 0</margins>
  <margins interleave="printer" media="roll">9 9 0 0</margins>
  <AlignmentChoices>3 15 0 0</AlignmentChoices>
- <ChannelNames>
-  <ChannelName translate="name" name="Light Light Black"/>
-  <ChannelName translate="name" name="Vivid Light Magenta"/>
-  <ChannelName translate="name" name="Light Cyan"/>
-  <ChannelName translate="name" name="Light Black"/>
-  <ChannelName translate="name" name="Black"/>
-  <ChannelName translate="name" name="Cyan"/>
-  <ChannelName translate="name" name="Vivid Magenta"/>
-  <ChannelName translate="name" name="Yellow"/>
- </ChannelNames>
  <resolutions>
   <resolution translate="text" name="360x180dpi" text="360 x 180 DPI Draft">
    <physicalResolution>360 180</physicalResolution>
    <printerWeave command="\033(i\001\000\000"/>
-   <parameter type="float" name="escp2_density">2.300000</parameter>
+   <parameter type="float" name="escp2_density">10.000000</parameter>
    <parameter type="integer" name="escp2_ink_type">17</parameter>
    <parameter type="integer" name="escp2_base_res">2880</parameter>
    <parameter type="integer" name="escp2_bits">2</parameter>
-   <parameter type="float" name="DropSize1">0.160000</parameter>
-   <parameter type="float" name="DropSize2">0.400000</parameter>
+   <parameter type="float" name="DropSize1">0.290000</parameter>
+   <parameter type="float" name="DropSize2">0.630000</parameter>
    <parameter type="float" name="DropSize3">1.000000</parameter>
   </resolution>
   <resolution translate="text" name="360pro" text="360 DPI">
    <physicalResolution>360 360</physicalResolution>
    <printerWeave command="\033(i\001\000\001"/>
-   <parameter type="float" name="escp2_density">1.150000</parameter>
+   <parameter type="float" name="escp2_density">5.000000</parameter>
    <parameter type="integer" name="escp2_ink_type">17</parameter>
    <parameter type="integer" name="escp2_base_res">2880</parameter>
    <parameter type="integer" name="escp2_bits">2</parameter>
-   <parameter type="float" name="DropSize1">0.160000</parameter>
-   <parameter type="float" name="DropSize2">0.400000</parameter>
+   <parameter type="float" name="DropSize1">0.290000</parameter>
+   <parameter type="float" name="DropSize2">0.630000</parameter>
    <parameter type="float" name="DropSize3">1.000000</parameter>
   </resolution>
   <resolution translate="text" name="720x360mw" text="720 x 360 DPI">
    <physicalResolution>720 360</physicalResolution>
    <printerWeave command="\033(i\001\000\001"/>
-   <parameter type="float" name="escp2_density">0.580000</parameter>
+   <parameter type="float" name="escp2_density">2.520000</parameter>
    <parameter type="integer" name="escp2_ink_type">17</parameter>
    <parameter type="integer" name="escp2_base_res">2880</parameter>
    <parameter type="integer" name="escp2_bits">2</parameter>
-   <parameter type="float" name="DropSize1">0.160000</parameter>
-   <parameter type="float" name="DropSize2">0.400000</parameter>
+   <parameter type="float" name="DropSize1">0.290000</parameter>
+   <parameter type="float" name="DropSize2">0.630000</parameter>
    <parameter type="float" name="DropSize3">1.000000</parameter>
   </resolution>
   <resolution translate="text" name="720mw" text="720 DPI">
    <physicalResolution>720 720</physicalResolution>
    <printerWeave command="\033(i\001\000\001"/>
-   <parameter type="float" name="escp2_density">0.766000</parameter>
-   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="float" name="escp2_density">1.260000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
    <parameter type="integer" name="escp2_base_res">2880</parameter>
    <parameter type="integer" name="escp2_bits">2</parameter>
-   <parameter type="float" name="DropSize1">0.200000</parameter>
-   <parameter type="float" name="DropSize2">0.450000</parameter>
+   <parameter type="float" name="DropSize1">0.290000</parameter>
+   <parameter type="float" name="DropSize2">0.630000</parameter>
    <parameter type="float" name="DropSize3">1.000000</parameter>
   </resolution>
   <resolution translate="text" name="1440x720mw" text="1440 x 720 DPI">
    <physicalResolution>1440 720</physicalResolution>
    <printerWeave command="\033(i\001\000\001"/>
-   <parameter type="float" name="escp2_density">0.388000</parameter>
+   <parameter type="float" name="escp2_density">0.891000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.275000</parameter>
+   <parameter type="float" name="DropSize2">0.450000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x1440mw" text="1440 x 1440 DPI">
+   <physicalResolution>1440 1440</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.446000</parameter>
    <parameter type="integer" name="escp2_ink_type">16</parameter>
    <parameter type="integer" name="escp2_base_res">2880</parameter>
    <parameter type="integer" name="escp2_bits">2</parameter>
-   <parameter type="float" name="DropSize1">0.200000</parameter>
+   <parameter type="float" name="DropSize1">0.275000</parameter>
    <parameter type="float" name="DropSize2">0.450000</parameter>
    <parameter type="float" name="DropSize3">1.000000</parameter>
   </resolution>
   <resolution translate="text" name="2880x1440mw" text="2880 x 1440 DPI">
    <physicalResolution>2880 1440</physicalResolution>
    <printerWeave command="\033(i\001\000\001"/>
-   <parameter type="float" name="escp2_density">0.479000</parameter>
+   <parameter type="float" name="escp2_density">0.775000</parameter>
+   <parameter type="integer" name="escp2_ink_type">5</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x2880mw" text="2880 x 2880 DPI">
+   <physicalResolution>2880 2880</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.388000</parameter>
    <parameter type="integer" name="escp2_ink_type">5</parameter>
    <parameter type="integer" name="escp2_base_res">2880</parameter>
    <parameter type="integer" name="escp2_bits">1</parameter>
diff --git a/src/xml/escp2/model/model_90.xml b/src/xml/escp2/model/model_90.xml
index bddd7fe..0a6962d 100644
--- a/src/xml/escp2/model/model_90.xml
+++ b/src/xml/escp2/model/model_90.xml
@@ -45,7 +45,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <baseSeparation>360</baseSeparation>
  <resolutionScale>14400</resolutionScale>
  <minimumResolution>360 180</minimumResolution>
- <maximumResolution>2880 1440</maximumResolution>
+ <maximumResolution>2880 2880</maximumResolution>
  <separationRows>1</separationRows>
  <zeroMarginOffset>43</zeroMarginOffset>
  <microLeftMargin>5</microLeftMargin>
@@ -53,83 +53,93 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <baseHorizontalAlignment>28800</baseHorizontalAlignment>
  <bidirectionalAutoUpperLimit>2073600</bidirectionalAutoUpperLimit>
  <minimumMediaSize>144 144</minimumMediaSize>
- <maximumMediaSize>1224 86400</maximumMediaSize>
- <maximumImageableArea>1224 86400</maximumImageableArea>
+ <maximumMediaSize>3168 86400</maximumMediaSize>
+ <maximumImageableArea>3168 86400</maximumImageableArea>
  <margins interleave="soft" media="sheet">9 9 9 40</margins>
  <margins interleave="printer" media="sheet">9 9 9 40</margins>
  <margins interleave="soft" media="roll">9 9 0 0</margins>
  <margins interleave="printer" media="roll">9 9 0 0</margins>
  <AlignmentChoices>3 15 0 0</AlignmentChoices>
- <ChannelNames>
-  <ChannelName translate="name" name="Light Light Black"/>
-  <ChannelName translate="name" name="Vivid Light Magenta"/>
-  <ChannelName translate="name" name="Light Cyan"/>
-  <ChannelName translate="name" name="Light Black"/>
-  <ChannelName translate="name" name="Black"/>
-  <ChannelName translate="name" name="Cyan"/>
-  <ChannelName translate="name" name="Vivid Magenta"/>
-  <ChannelName translate="name" name="Yellow"/>
- </ChannelNames>
  <resolutions>
   <resolution translate="text" name="360x180dpi" text="360 x 180 DPI Draft">
    <physicalResolution>360 180</physicalResolution>
    <printerWeave command="\033(i\001\000\000"/>
-   <parameter type="float" name="escp2_density">2.300000</parameter>
+   <parameter type="float" name="escp2_density">10.000000</parameter>
    <parameter type="integer" name="escp2_ink_type">17</parameter>
    <parameter type="integer" name="escp2_base_res">2880</parameter>
    <parameter type="integer" name="escp2_bits">2</parameter>
-   <parameter type="float" name="DropSize1">0.160000</parameter>
-   <parameter type="float" name="DropSize2">0.400000</parameter>
+   <parameter type="float" name="DropSize1">0.290000</parameter>
+   <parameter type="float" name="DropSize2">0.630000</parameter>
    <parameter type="float" name="DropSize3">1.000000</parameter>
   </resolution>
   <resolution translate="text" name="360pro" text="360 DPI">
    <physicalResolution>360 360</physicalResolution>
    <printerWeave command="\033(i\001\000\001"/>
-   <parameter type="float" name="escp2_density">1.150000</parameter>
+   <parameter type="float" name="escp2_density">5.000000</parameter>
    <parameter type="integer" name="escp2_ink_type">17</parameter>
    <parameter type="integer" name="escp2_base_res">2880</parameter>
    <parameter type="integer" name="escp2_bits">2</parameter>
-   <parameter type="float" name="DropSize1">0.160000</parameter>
-   <parameter type="float" name="DropSize2">0.400000</parameter>
+   <parameter type="float" name="DropSize1">0.290000</parameter>
+   <parameter type="float" name="DropSize2">0.630000</parameter>
    <parameter type="float" name="DropSize3">1.000000</parameter>
   </resolution>
   <resolution translate="text" name="720x360mw" text="720 x 360 DPI">
    <physicalResolution>720 360</physicalResolution>
    <printerWeave command="\033(i\001\000\001"/>
-   <parameter type="float" name="escp2_density">0.580000</parameter>
+   <parameter type="float" name="escp2_density">2.520000</parameter>
    <parameter type="integer" name="escp2_ink_type">17</parameter>
    <parameter type="integer" name="escp2_base_res">2880</parameter>
    <parameter type="integer" name="escp2_bits">2</parameter>
-   <parameter type="float" name="DropSize1">0.160000</parameter>
-   <parameter type="float" name="DropSize2">0.400000</parameter>
+   <parameter type="float" name="DropSize1">0.290000</parameter>
+   <parameter type="float" name="DropSize2">0.630000</parameter>
    <parameter type="float" name="DropSize3">1.000000</parameter>
   </resolution>
   <resolution translate="text" name="720mw" text="720 DPI">
    <physicalResolution>720 720</physicalResolution>
    <printerWeave command="\033(i\001\000\001"/>
-   <parameter type="float" name="escp2_density">0.766000</parameter>
-   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="float" name="escp2_density">1.260000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
    <parameter type="integer" name="escp2_base_res">2880</parameter>
    <parameter type="integer" name="escp2_bits">2</parameter>
-   <parameter type="float" name="DropSize1">0.200000</parameter>
-   <parameter type="float" name="DropSize2">0.450000</parameter>
+   <parameter type="float" name="DropSize1">0.290000</parameter>
+   <parameter type="float" name="DropSize2">0.630000</parameter>
    <parameter type="float" name="DropSize3">1.000000</parameter>
   </resolution>
   <resolution translate="text" name="1440x720mw" text="1440 x 720 DPI">
    <physicalResolution>1440 720</physicalResolution>
    <printerWeave command="\033(i\001\000\001"/>
-   <parameter type="float" name="escp2_density">0.388000</parameter>
+   <parameter type="float" name="escp2_density">0.891000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.275000</parameter>
+   <parameter type="float" name="DropSize2">0.450000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x1440mw" text="1440 x 1440 DPI">
+   <physicalResolution>1440 1440</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.446000</parameter>
    <parameter type="integer" name="escp2_ink_type">16</parameter>
    <parameter type="integer" name="escp2_base_res">2880</parameter>
    <parameter type="integer" name="escp2_bits">2</parameter>
-   <parameter type="float" name="DropSize1">0.200000</parameter>
+   <parameter type="float" name="DropSize1">0.275000</parameter>
    <parameter type="float" name="DropSize2">0.450000</parameter>
    <parameter type="float" name="DropSize3">1.000000</parameter>
   </resolution>
   <resolution translate="text" name="2880x1440mw" text="2880 x 1440 DPI">
    <physicalResolution>2880 1440</physicalResolution>
    <printerWeave command="\033(i\001\000\001"/>
-   <parameter type="float" name="escp2_density">0.479000</parameter>
+   <parameter type="float" name="escp2_density">0.775000</parameter>
+   <parameter type="integer" name="escp2_ink_type">5</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x2880mw" text="2880 x 2880 DPI">
+   <physicalResolution>2880 2880</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.388000</parameter>
    <parameter type="integer" name="escp2_ink_type">5</parameter>
    <parameter type="integer" name="escp2_base_res">2880</parameter>
    <parameter type="integer" name="escp2_bits">1</parameter>
author	Roger Leigh <rleigh@debian.org>	2011-05-03 10:28:02 +0100
committer	Roger Leigh <rleigh@debian.org>	2011-05-03 10:28:02 +0100
commit	15578e218035547ca17e25ef351fbe56bc55a4ae (patch)
tree	06a97de2b9f0d9e04ee05d5ff806ef7c53a2003e /src/xml/escp2/model
parent	4bc88c4aa9026d5c679008a4dbbb8ec4d9a901bd (diff)