Imported Upstream version 5.2.2

40 files changed, 606 insertions, 186 deletions

diff --git a/src/cups/test-rastertogutenprint.in b/src/cups/test-rastertogutenprint.in
index 8582037..40e7b49 100755
--- a/src/cups/test-rastertogutenprint.in
+++ b/src/cups/test-rastertogutenprint.in
@@ -2,13 +2,21 @@
 
 retval=0
 
+if [ -z "$srcdir" -o "$srcdir" = "." ] ; then
+    sdir=`pwd`
+elif [ -n "`echo $srcdir |grep '^/'`" ] ; then
+    sdir="$srcdir"
+else
+    sdir="`pwd`/$srcdir"
+fi
+
 if [ -z "$STP_DATA_PATH" ] ; then
-    STP_DATA_PATH=`pwd`/../xml
+    STP_DATA_PATH="$sdir/../xml"
     export STP_DATA_PATH
 fi
 
 if [ -z "$STP_MODULE_PATH" ] ; then
-    STP_MODULE_PATH=`pwd`/../main:`pwd`/../main/.libs
+    STP_MODULE_PATH="$sdir/../main:$sdir/../main/.libs"
     export STP_MODULE_PATH
 fi
 
@@ -79,7 +87,7 @@ pdftops="`type -p pdftops`"
 if [ -n "$pdftops" -a ! -x "$cupsdir/cgpdftoraster" ] ; then
     tfile=`mktemp`
     trap cleanup 1 2 3 6 14 15 30
-    $pdftops -f 24 -l 26 ../../doc/gutenprint-users-manual.pdf $tfile
+    $pdftops -f 24 -l 26 "$sdir/../../doc/gutenprint-users-manual.pdf" $tfile
 fi
 
 if [ -z "$verbose" ] ; then
@@ -208,11 +216,11 @@ if [ -d ppd/C ] ; then
 	    PPD=$f
 	    export PPD
 	    if [ -x "$cupsdir/cgpdftoraster" ] ; then
-		output="`($cupsdir/cgpdftoraster 1 1 1 1 $pages < ../../doc/gutenprint-users-manual.pdf 2>/dev/null | run_rastertogp | do_output) 2>&1`"
+		output="`($cupsdir/cgpdftoraster 1 1 1 1 $pages < $sdir/../../doc/gutenprint-users-manual.pdf 2>/dev/null | run_rastertogp | do_output) 2>&1`"
 	    elif [ -f "$tfile" ] ; then
 		output="`($cupsdir/pstops 1 1 1 1 \"$cupsargs\" < $tfile 2>/dev/null | $cupsdir/pstoraster 2>/dev/null | run_rastertogp | do_output) 2>&1`"
 	    elif [ -x "$cupsdir/pstoraster" ] ; then
-		output="`($cupsdir/pdftops 1 1 1 1 \"$pages$cupsargs\" < ../../doc/gutenprint-users-manual.pdf 2>/dev/null | $cupsdir/pstops 1 1 1 1 \"$pages$cupsargs\" 2>/dev/null | $cupsdir/pstoraster 2>/dev/null | run_rastertogp | do_output) 2>&1`"
+		output="`($cupsdir/pdftops 1 1 1 1 \"$pages$cupsargs\" < $sdir/../../doc/gutenprint-users-manual.pdf 2>/dev/null | $cupsdir/pstops 1 1 1 1 \"$pages$cupsargs\" 2>/dev/null | $cupsdir/pstoraster 2>/dev/null | run_rastertogp | do_output) 2>&1`"
 	    else
 		output="`($cupsdir/imagetoraster 1 1 1 1 \"$pages$cupsargs\" < calibrate.ppm 2>/dev/null | run_rastertogp | do_output) 2>&1`"
 	    fi
diff --git a/src/escputil/escputil.c b/src/escputil/escputil.c
index f4fa3c0..3d7b65d 100644
--- a/src/escputil/escputil.c
+++ b/src/escputil/escputil.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: escputil.c,v 1.96 2008/07/05 01:43:26 rlk Exp $"
+ * "$Id: escputil.c,v 1.97 2008/10/29 00:10:42 easysw Exp $"
  *
  *   Printer maintenance utility for EPSON Stylus (R) printers
  *
@@ -1252,9 +1252,9 @@ do_old_status(status_cmd_t cmd, const char *buf, const stp_printer_t *printer)
 		{
 		  color_list = stp_string_list_create_copy(desc.bounds.str);
 		  STP_DEBUG(fprintf(stderr,
-				    "Using color list from driver (%d %d)\n",
-				    stp_string_list_count(desc.bounds.str),
-				    stp_string_list_count(color_list)));
+				    "Using color list from driver (%ld %ld)\n",
+				    (long)stp_string_list_count(desc.bounds.str),
+				    (long)stp_string_list_count(color_list)));
 		  stp_parameter_description_destroy(&desc);
 		}
 	    }
@@ -1520,9 +1520,9 @@ do_extended_ink_info(int extended_output)
       if (printer)
 	{
 	  color_list = stp_string_list_create_copy(desc.bounds.str);
-	  STP_DEBUG(fprintf(stderr, "Using color list from driver (%d %d)\n",
-			    stp_string_list_count(desc.bounds.str),
-			    stp_string_list_count(color_list)));
+	  STP_DEBUG(fprintf(stderr, "Using color list from driver (%ld %ld)\n",
+			    (long)stp_string_list_count(desc.bounds.str),
+			    (long)stp_string_list_count(color_list)));
 	  stp_parameter_description_destroy(&desc);
 	}
       else
diff --git a/src/foomatic/Makefile.am b/src/foomatic/Makefile.am
index 0f8937c..cd24080 100644
--- a/src/foomatic/Makefile.am
+++ b/src/foomatic/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.51 2008/06/01 14:41:08 rlk Exp $
+## $Id: Makefile.am,v 1.52 2008/10/24 00:37:14 rleigh Exp $
 ## Copyright (C) 2000 Roger Leigh
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -95,7 +95,7 @@ clean-local:
 
 foomatic-data: foomatic-stamp
 
-foomatic-stamp: foomatic-generator foomatic-printermap $(noinst_PROGRAMS) mk_printerlist $(top_srcdir)/src/xml/xml-stamp
+foomatic-stamp: foomatic-generator foomatic-printermap $(noinst_PROGRAMS) mk_printerlist $(top_builddir)/src/xml/xml-stamp
 	-$(RM) -r foomatic-db
 	$(FOOMATIC_GENERATOR) -m $(srcdir)/foomatic-printermap -t $(srcdir)/foomatic-templates $(FOOMATIC_GENERATOR_EXTRA_OPTS) $(FOOMATIC_GENERATOR_FOOMATIC_3_OPTS)
 	$(FOOMATIC_GENERATOR) -s -m $(srcdir)/foomatic-printermap -t $(srcdir)/foomatic-templates $(FOOMATIC_GENERATOR_EXTRA_OPTS) $(FOOMATIC_GENERATOR_FOOMATIC_3_OPTS)
@@ -113,6 +113,8 @@ dist-hook:
 	  fi \
 	done
 
+$(top_builddir)/src/xml/xml-stamp:
+	cd $(top_builddir)/src/xml; $(MAKE) xml-stamp
 
 ## Clean
 
diff --git a/src/foomatic/Makefile.in b/src/foomatic/Makefile.in
index a192418..2267efe 100644
--- a/src/foomatic/Makefile.in
+++ b/src/foomatic/Makefile.in
@@ -644,7 +644,7 @@ clean-local:
 
 foomatic-data: foomatic-stamp
 
-foomatic-stamp: foomatic-generator foomatic-printermap $(noinst_PROGRAMS) mk_printerlist $(top_srcdir)/src/xml/xml-stamp
+foomatic-stamp: foomatic-generator foomatic-printermap $(noinst_PROGRAMS) mk_printerlist $(top_builddir)/src/xml/xml-stamp
 	-$(RM) -r foomatic-db
 	$(FOOMATIC_GENERATOR) -m $(srcdir)/foomatic-printermap -t $(srcdir)/foomatic-templates $(FOOMATIC_GENERATOR_EXTRA_OPTS) $(FOOMATIC_GENERATOR_FOOMATIC_3_OPTS)
 	$(FOOMATIC_GENERATOR) -s -m $(srcdir)/foomatic-printermap -t $(srcdir)/foomatic-templates $(FOOMATIC_GENERATOR_EXTRA_OPTS) $(FOOMATIC_GENERATOR_FOOMATIC_3_OPTS)
@@ -661,6 +661,9 @@ dist-hook:
 	    done \
 	  fi \
 	done
+
+$(top_builddir)/src/xml/xml-stamp:
+	cd $(top_builddir)/src/xml; $(MAKE) 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/foomatic/foomatic-printermap b/src/foomatic/foomatic-printermap
index 9778804..ea353f1 100644
--- a/src/foomatic/foomatic-printermap
+++ b/src/foomatic/foomatic-printermap
@@ -158,6 +158,9 @@
 #gptofoo escp2-cl760 printer/Epson-CL_760
 #gptofoo escp2-em900c printer/Epson-EM_900C
 #gptofoo escp2-em930c printer/Epson-EM_930C
+#gptofoo escp2-ep801a printer/Epson-EP_801A
+#gptofoo escp2-ep901a printer/Epson-EP_901A
+#gptofoo escp2-ep901f printer/Epson-EP_801F
 #gptofoo epson-epl-5200 printer/Epson-EPL-5200
 #gptofoo epson-epl-5200plus printer/Epson-EPL-5200plus
 #gptofoo epson-epl-5700 printer/Epson-EPL-5700
@@ -393,6 +396,7 @@
 #gptofoo escp2-dx4400 printer/Epson-Stylus_DX4400
 #gptofoo escp2-dx4450 printer/Epson-Stylus_DX4450
 #gptofoo escp2-dx4800 printer/Epson-Stylus_DX4800
+#gptofoo escp2-dx4850 printer/Epson-Stylus_DX4850
 #gptofoo escp2-dx7000f printer/Epson-Stylus_DX7000F
 #gptofoo escp2-dx7400 printer/Epson-Stylus_DX7400
 #gptofoo escp2-dx7450 printer/Epson-Stylus_DX7450
diff --git a/src/ghost/ijsgutenprint.c b/src/ghost/ijsgutenprint.c
index 9a75815..01c0a88 100644
--- a/src/ghost/ijsgutenprint.c
+++ b/src/ghost/ijsgutenprint.c
@@ -1,5 +1,5 @@
 /*
- *  $Id: ijsgutenprint.c,v 1.21 2008/07/05 03:43:26 rlk Exp $
+ *  $Id: ijsgutenprint.c,v 1.22 2008/11/02 22:21:49 rlk Exp $
  *
  *   IJS server for Gutenprint.
  *
@@ -824,7 +824,7 @@ gutenprint_set_cb (void *set_cb_data, IjsServerCtx *ctx, IjsJobId jobid,
 	  else if (strcmp(vbuf, "True") == 0 ||
 		   strcmp(vbuf, "true") == 0 ||
 		   strcmp(vbuf, "TRUE") == 0 ||
-		   strcmp(vbuf, "0") == 0)
+		   strcmp(vbuf, "1") == 0)
 	    stp_set_boolean_parameter(img->v, xkey, 1);
 	  else
 	    fprintf(stderr, "ERROR: ijsgutenprint: cannot parse %s boolean %s\n", xkey, vbuf);
diff --git a/src/gutenprintui2/Makefile.am b/src/gutenprintui2/Makefile.am
index 2f436fc..7a9fe7b 100644
--- a/src/gutenprintui2/Makefile.am
+++ b/src/gutenprintui2/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.7 2007/12/02 02:39:58 rlk Exp $
+## $Id: Makefile.am,v 1.8 2008/10/24 00:37:14 rleigh Exp $
 ## Copyright (C) 2000 Roger Leigh
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -91,9 +91,10 @@ $(srcdir)/typebuiltins.c: $(typebuiltins_extra_deps)
 			--vhead "GType\n@enum_name@_get_type (void)\n{\n  static GType etype = 0;\n  if (etype == 0) {\n    static const G@Type@Value values[] = {" \
 			--vprod "      { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
 			--vtail "      { 0, NULL, NULL }\n    };\n    etype = g_@type@_register_static (\"@EnumName@\", values);\n  }\n  return etype;\n}\n" \
-		$(stpui_public_h_sources) ) > $@
+		$(stpui_public_h_sources) ) > $@.tmp
+	mv $@.tmp $@
 
 
 ## Clean
 
-MAINTAINERCLEANFILES = Makefile.in typebuiltins.c printrcl.c printrcy.c printrcy.h
+MAINTAINERCLEANFILES = Makefile.in typebuiltins.c typebuiltins.c.tmp printrcl.c printrcy.c printrcy.h
diff --git a/src/gutenprintui2/Makefile.in b/src/gutenprintui2/Makefile.in
index 35e10e3..5265a0d 100644
--- a/src/gutenprintui2/Makefile.in
+++ b/src/gutenprintui2/Makefile.in
@@ -353,7 +353,7 @@ stpui_public_h_sources = \
 	../../include/gutenprintui2/gammacurve.h
 
 @MAINTAINER_MODE_TRUE@typebuiltins_extra_deps = Makefile
-MAINTAINERCLEANFILES = Makefile.in typebuiltins.c printrcl.c printrcy.c printrcy.h
+MAINTAINERCLEANFILES = Makefile.in typebuiltins.c typebuiltins.c.tmp printrcl.c printrcy.c printrcy.h
 all: all-am
 
 .SUFFIXES:
@@ -765,7 +765,8 @@ $(srcdir)/typebuiltins.c: $(typebuiltins_extra_deps)
 			--vhead "GType\n@enum_name@_get_type (void)\n{\n  static GType etype = 0;\n  if (etype == 0) {\n    static const G@Type@Value values[] = {" \
 			--vprod "      { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
 			--vtail "      { 0, NULL, NULL }\n    };\n    etype = g_@type@_register_static (\"@EnumName@\", values);\n  }\n  return etype;\n}\n" \
-		$(stpui_public_h_sources) ) > $@
+		$(stpui_public_h_sources) ) > $@.tmp
+	mv $@.tmp $@
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/src/main/channel.c b/src/main/channel.c
index 278d8e2..b31a4f6 100644
--- a/src/main/channel.c
+++ b/src/main/channel.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: channel.c,v 1.30 2008/08/20 11:49:45 rlk Exp $"
+ * "$Id: channel.c,v 1.31 2008/10/29 00:10:42 easysw Exp $"
  *
  *   Dither routine entrypoints
  *
@@ -610,7 +610,7 @@ stp_channel_initialize(stp_vars_t *v, stp_image_t *image,
   stp_dprintf(STP_DBG_INK, v, "   input_channels %d\n", cg->input_channels);
   stp_dprintf(STP_DBG_INK, v, "   aux_channels   %d\n", cg->aux_output_channels);
   stp_dprintf(STP_DBG_INK, v, "   gcr_channels   %d\n", cg->gcr_channels);
-  stp_dprintf(STP_DBG_INK, v, "   width          %d\n", (int) cg->width);
+  stp_dprintf(STP_DBG_INK, v, "   width          %ld\n", (long)cg->width);
   stp_dprintf(STP_DBG_INK, v, "   ink_limit      %d\n", cg->ink_limit);
   stp_dprintf(STP_DBG_INK, v, "   gloss_limit    %d\n", cg->gloss_limit);
   stp_dprintf(STP_DBG_INK, v, "   max_density    %d\n", cg->max_density);
diff --git a/src/main/curve.c b/src/main/curve.c
index e65900b..d2ec824 100644
--- a/src/main/curve.c
+++ b/src/main/curve.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: curve.c,v 1.53 2008/01/21 23:19:39 rlk Exp $"
+ * "$Id: curve.c,v 1.54 2008/10/29 00:10:42 easysw Exp $"
  *
  *   Print plug-in driver utility functions for the GIMP.
  *
@@ -617,8 +617,8 @@ stp_curve_set_data(stp_curve_t *curve, size_t count, const double *data)
       {
 	stp_deprintf(STP_DBG_CURVE_ERRORS,
 		     "stp_curve_set_data: datum out of bounds: "
-		     "%g (require %g <= x <= %g), n = %d\n",
-		     data[i], low, high, i);
+		     "%g (require %g <= x <= %g), n = %ld\n",
+		     data[i], low, high, (long)i);
 	return 0;
       }
   /* Allocate sequence; also accounts for WRAP_MODE */
@@ -646,7 +646,7 @@ stp_curve_set_data_points(stp_curve_t *curve, size_t count,
   if (count < 2)
     {
       stp_deprintf(STP_DBG_CURVE_ERRORS,
-		   "stp_curve_set_data_points: too few points %d\n", count);
+		   "stp_curve_set_data_points: too few points %ld\n", (long)count);
       return 0;
     }
   if (curve->wrap_mode == STP_CURVE_WRAP_AROUND)
@@ -654,8 +654,8 @@ stp_curve_set_data_points(stp_curve_t *curve, size_t count,
   if (real_count > curve_point_limit)
     {
       stp_deprintf(STP_DBG_CURVE_ERRORS,
-		   "stp_curve_set_data_points: too many points %d\n",
-		   real_count);
+		   "stp_curve_set_data_points: too many points %ld\n",
+		   (long)real_count);
       return 0;
     }
 
@@ -667,8 +667,8 @@ stp_curve_set_data_points(stp_curve_t *curve, size_t count,
 	{
 	  stp_deprintf(STP_DBG_CURVE_ERRORS,
 		       "stp_curve_set_data_points: datum out of bounds: "
-		       "%g (require %g <= x <= %g), n = %d\n",
-		       data[i].y, low, high, i);
+		       "%g (require %g <= x <= %g), n = %ld\n",
+		       data[i].y, low, high, (long)i);
 	  return 0;
 	}
       if (i == 0 && data[i].x != 0.0)
@@ -696,16 +696,16 @@ stp_curve_set_data_points(stp_curve_t *curve, size_t count,
 	{
 	  stp_deprintf(STP_DBG_CURVE_ERRORS,
 		       "stp_curve_set_data_points: horizontal position out of bounds: "
-		       "%g, n = %d\n",
-		       data[i].x, i);
+		       "%g, n = %ld\n",
+		       data[i].x, (long)i);
 	  return 0;
 	}
       if (data[i].x - .000001 < last_x)
 	{
 	  stp_deprintf(STP_DBG_CURVE_ERRORS,
 		       "stp_curve_set_data_points: horizontal position must "
-		       "exceed previous position by .000001: %g, %g, n = %d\n",
-		       data[i].x, last_x, i);
+		       "exceed previous position by .000001: %g, %g, n = %ld\n",
+		       data[i].x, last_x, (long)i);
 	  return 0;
 	}
       last_x = data[i].x;
@@ -1218,8 +1218,8 @@ stp_curve_resample(stp_curve_t *curve, size_t points)
 	      return 0;
 	    }
 	  stp_deprintf(STP_DBG_CURVE,
-		       "Filling slots at %d %d: %f %f  %f %f  %d\n",
-		       i,curpos, high, low, high_y, low_y, limit);
+		       "Filling slots at %ld %d: %f %f  %f %f  %ld\n",
+		       (long)i,curpos, high, low, high_y, low_y, (long)limit);
 	  x_delta = high - low;
 	  high *= (limit - 1);
 	  low *= (limit - 1);
@@ -1560,8 +1560,8 @@ stp_curve_create_from_xmltree(stp_mxml_node_t *curve)  /* The curve node */
 	  if ((seq_count % 2) != 0)
 	    {
 	      stp_deprintf(STP_DBG_CURVE_ERRORS,
-			   "stp_curve_create_from_xmltree: invalid data count %d\n",
-			   seq_count);
+			   "stp_curve_create_from_xmltree: invalid data count %ld\n",
+			   (long)seq_count);
 	      goto error;
 	    }
 	  if (stp_curve_set_data_points(ret, seq_count / 2,
diff --git a/src/main/escp2-channels.c b/src/main/escp2-channels.c
index 99c2664..b899c78 100644
--- a/src/main/escp2-channels.c
+++ b/src/main/escp2-channels.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: escp2-channels.c,v 1.86 2008/07/06 15:50:56 rlk Exp $"
+ * "$Id: escp2-channels.c,v 1.87 2008/10/29 00:10:42 easysw Exp $"
  *
  *   Print plug-in EPSON ESC/P2 driver for the GIMP.
  *
@@ -458,7 +458,7 @@ stpi_escp2_get_default_black_inkset(void)
 	  default_black_inkgroup->n_inklists < 1 ||
 	  default_black_inkgroup->inklists[0].n_inks < 1)
 	{
-	  stp_erprintf("Default black inkgroup: %x\n", (int) default_black_inkgroup);
+	  stp_erprintf("Default black inkgroup: %lx\n", (long) default_black_inkgroup);
 	  stp_erprintf("Unable to load default black ink definition!\n");
 	  stp_abort();
 	}
diff --git a/src/main/print-lexmark.c b/src/main/print-lexmark.c
index 1106fe7..e58828a 100644
--- a/src/main/print-lexmark.c
+++ b/src/main/print-lexmark.c
@@ -1,6 +1,6 @@
 
 /*
- * "$Id: print-lexmark.c,v 1.157 2008/07/24 00:15:33 rlk Exp $"
+ * "$Id: print-lexmark.c,v 1.158 2008/10/29 00:10:42 easysw Exp $"
  *
  *   Print plug-in Lexmark driver for the GIMP.
  *
@@ -980,7 +980,7 @@ lexmark_head_offset(int ydpi,                       /* i */
 {
   int i;
 
-  stp_deprintf(STP_DBG_LEXMARK, "  sizie %d,  size_v %d, size_v[0] %d\n", sizeof(*lineoff_buffer), sizeof(lineoff_buffer->v), sizeof(lineoff_buffer->v[0]));
+  stp_deprintf(STP_DBG_LEXMARK, "  sizie %d,  size_v %d, size_v[0] %d\n", (int)sizeof(*lineoff_buffer), (int)sizeof(lineoff_buffer->v), (int)sizeof(lineoff_buffer->v[0]));
   memcpy(lineoff_buffer, ink_parameter->head_offset, sizeof(*lineoff_buffer));
 
   for (i=0; i < (sizeof(lineoff_buffer->v) / sizeof(lineoff_buffer->v[0])); i++) {
diff --git a/src/main/print-weave.c b/src/main/print-weave.c
index d77e302..0207082 100644
--- a/src/main/print-weave.c
+++ b/src/main/print-weave.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-weave.c,v 1.71 2008/07/14 02:07:30 rlk Exp $"
+ * "$Id: print-weave.c,v 1.72 2008/10/29 00:10:42 easysw Exp $"
  *
  *   Softweave calculator for Gutenprint.
  *
@@ -1499,9 +1499,9 @@ add_to_row(stp_vars_t *v, stpi_softweave_t *sw, int row, unsigned char *buf,
   size_t count = linecount->v[color];
   if (place + nbytes > sw->virtual_jets * sw->bitwidth * sw->horizontal_width)
     {
-      stp_eprintf(v, "Buffer overflow: limit %d, actual %d, count %d\n",
+      stp_eprintf(v, "Buffer overflow: limit %d, actual %ld, count %ld\n",
 		  sw->virtual_jets * sw->bitwidth * sw->horizontal_width,
-		  place + nbytes, count);
+		  (long)(place + nbytes), (long)count);
       stp_abort();
     }
   memcpy(bufs->v[color] + lineoffs->v[color], buf, nbytes);
diff --git a/src/main/sequence.c b/src/main/sequence.c
index 3f7091c..bb3b7df 100644
--- a/src/main/sequence.c
+++ b/src/main/sequence.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: sequence.c,v 1.26 2008/06/15 16:23:39 rlk Exp $"
+ * "$Id: sequence.c,v 1.27 2008/10/29 00:10:42 easysw Exp $"
  *
  *   Sequence data type.  This type is designed to be derived from by
  *   the curve and dither matrix types.
@@ -383,8 +383,8 @@ stp_sequence_create_from_xmltree(stp_mxml_node_t *da)
     }
 
   stp_deprintf(STP_DBG_XML,
-	       "stp_sequence_create_from_xmltree: stp_sequence_set_size: %d\n",
-	       point_count);
+	       "stp_sequence_create_from_xmltree: stp_sequence_set_size: %ld\n",
+	       (long)point_count);
   stp_sequence_set_size(ret, point_count);
   stp_sequence_set_bounds(ret, low, high);
 
@@ -427,7 +427,7 @@ stp_sequence_create_from_xmltree(stp_mxml_node_t *da)
 	{
 	  stp_erprintf("stp_sequence_create_from_xmltree: "
 		       "read aborted: too little data "
-		       "(n=%d, needed %d)\n", i, point_count);
+		       "(n=%d, needed %ld)\n", i, (long)point_count);
 	  goto error;
 	}
     }
diff --git a/src/testpattern/run-testpattern b/src/testpattern/run-testpattern
index 0462c0b..09dd5e7 100755
--- a/src/testpattern/run-testpattern
+++ b/src/testpattern/run-testpattern
@@ -2,13 +2,21 @@
 
 retval=0;
 
+if [ -z "$srcdir" -o "$srcdir" = "." ] ; then
+    sdir=`pwd`
+elif [ -n "`echo $srcdir |grep '^/'`" ] ; then
+    sdir="$srcdir"
+else
+    sdir="`pwd`/$srcdir"
+fi
+
 if [ -z "$STP_DATA_PATH" ] ; then
-    STP_DATA_PATH=`pwd`/../xml
+    STP_DATA_PATH="$sdir/../xml"
     export STP_DATA_PATH
 fi
 
 if [ -z "$STP_MODULE_PATH" ] ; then
-    STP_MODULE_PATH=`pwd`/../main:`pwd`/../main/.libs
+    STP_MODULE_PATH="$sdir/../main:$sdir/../main/.libs"
     export STP_MODULE_PATH
 fi
 
diff --git a/src/testpattern/run-testpattern-1 b/src/testpattern/run-testpattern-1
index aceff8d..e27e448 100755
--- a/src/testpattern/run-testpattern-1
+++ b/src/testpattern/run-testpattern-1
@@ -2,13 +2,21 @@
 
 retval=0
 
+if [ -z "$srcdir" -o "$srcdir" = "." ] ; then
+    sdir=`pwd`
+elif [ -n "`echo $srcdir |grep '^/'`" ] ; then
+    sdir="$srcdir"
+else
+    sdir="`pwd`/$srcdir"
+fi
+
 if [ -z "$STP_DATA_PATH" ] ; then
-    STP_DATA_PATH=`pwd`/../xml
+    STP_DATA_PATH="$sdir/../xml"
     export STP_DATA_PATH
 fi
 
 if [ -z "$STP_MODULE_PATH" ] ; then
-    STP_MODULE_PATH=`pwd`/../main:`pwd`/../main/.libs
+    STP_MODULE_PATH="$sdir/../main:$sdir/../main/.libs"
     export STP_MODULE_PATH
 fi
 
diff --git a/src/testpattern/run-testpattern-2.in b/src/testpattern/run-testpattern-2.in
index b35bf90..3e5b7d9 100644
--- a/src/testpattern/run-testpattern-2.in
+++ b/src/testpattern/run-testpattern-2.in
@@ -80,12 +80,23 @@ foreach my $opt (@default_options) {
 my $pwd = `pwd`;
 chomp $pwd;
 
+my $srcdir = $ENV{"srcdir"};
+my $sdir;
+
+if ("$srcdir" eq "" || "$srcdir" eq ".") {
+    $sdir = $pwd;
+} elsif ($srcdir =~ /^\//) {
+    $sdir = "$srcdir";
+} else {
+    $sdir = "$pwd/$srcdir";
+}
+
 if (! $run_installed && ! defined $ENV{"STP_DATA_PATH"}) {
-    $ENV{"STP_DATA_PATH"} = "${pwd}/../xml";
+    $ENV{"STP_DATA_PATH"} = "${sdir}/../xml";
 }
 
 if (! defined $ENV{"STP_MODULE_PATH"}) {
-    $ENV{"STP_MODULE_PATH"} = "${pwd}/../main:${pwd}/../main/.libs";
+    $ENV{"STP_MODULE_PATH"} = "${sdir}/../main:${sdir}/../main/.libs";
 }
 
 sub set_opt($$$) {
diff --git a/src/xml/Makefile.am b/src/xml/Makefile.am
index 65d76f5..d202566 100644
--- a/src/xml/Makefile.am
+++ b/src/xml/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.2 2008/06/10 13:10:22 rlk Exp $
+## $Id: Makefile.am,v 1.4 2008/11/01 18:42:11 rleigh Exp $
 ## Copyright (C) 2008 Robert Krawitz
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -42,16 +42,18 @@ extract_strings_SOURCES = extract-strings.c
 extract_strings_LDADD = $(GUTENPRINT_LIBS)
 
 xml-stamp: $(pkgxmldata_DATA) escp2/xml-stamp Makefile.am
-	-rm -f xml-stamp
-	touch xml-stamp
-	sed 's;^;escp2/;' escp2/xml-stamp >> xml-stamp
-	for f in $(pkgxmldata_DATA) ; do echo $$f >> xml-stamp; done
+	-rm -f $@ $@.tmp
+	touch $@.tmp
+	sed 's;^;escp2/;' escp2/xml-stamp >> $@.tmp
+	for f in $(pkgxmldata_DATA) ; do echo $$f >> $@.tmp; done
+	mv $@.tmp $@
 
 all-local: xmli18n-tmp.h xml-stamp
 
 
-xmli18n-tmp.h:  xml-stamp extract-strings
-	./extract-strings `cat xml-stamp` > xmli18n-tmp.h
+xmli18n-tmp.h: xml-stamp extract-strings
+	./extract-strings `cat xml-stamp | sed -e 's;^;$(srcdir)/;'` > $@.tmp
+	mv $@.tmp $@
 
 
 dist-hook: xmli18n-tmp.h
@@ -59,7 +61,7 @@ dist-hook: xmli18n-tmp.h
 
 ## Clean
 
-CLEANFILES = xmli18n-tmp.h xml-stamp
+CLEANFILES = xmli18n-tmp.h xmli18n-tmp.h.tmp xml-stamp xml-stamp.tmp
 
 EXTRA_DIST = $(pkgxmldata_DATA)
 
diff --git a/src/xml/Makefile.in b/src/xml/Makefile.in
index 5f49e85..1fbed1d 100644
--- a/src/xml/Makefile.in
+++ b/src/xml/Makefile.in
@@ -314,7 +314,7 @@ pkgxmldata_DATA = \
 extract_strings_SOURCES = extract-strings.c
 extract_strings_LDADD = $(GUTENPRINT_LIBS)
 # xmli18n-tmp.h is needed by po/POTFILES.in at dist time
-CLEANFILES = xmli18n-tmp.h xml-stamp
+CLEANFILES = xmli18n-tmp.h xmli18n-tmp.h.tmp xml-stamp xml-stamp.tmp
 EXTRA_DIST = $(pkgxmldata_DATA)
 MAINTAINERCLEANFILES = Makefile.in
 all: all-recursive
@@ -719,15 +719,17 @@ $(top_builddir)/src/gutenprintui2/libgutenprintui2.la:
 	$(MAKE)
 
 xml-stamp: $(pkgxmldata_DATA) escp2/xml-stamp Makefile.am
-	-rm -f xml-stamp
-	touch xml-stamp
-	sed 's;^;escp2/;' escp2/xml-stamp >> xml-stamp
-	for f in $(pkgxmldata_DATA) ; do echo $$f >> xml-stamp; done
+	-rm -f $@ $@.tmp
+	touch $@.tmp
+	sed 's;^;escp2/;' escp2/xml-stamp >> $@.tmp
+	for f in $(pkgxmldata_DATA) ; do echo $$f >> $@.tmp; done
+	mv $@.tmp $@
 
 all-local: xmli18n-tmp.h xml-stamp
 
-xmli18n-tmp.h:  xml-stamp extract-strings
-	./extract-strings `cat xml-stamp` > xmli18n-tmp.h
+xmli18n-tmp.h: xml-stamp extract-strings
+	./extract-strings `cat xml-stamp | sed -e 's;^;$(srcdir)/;'` > $@.tmp
+	mv $@.tmp $@
 
 dist-hook: xmli18n-tmp.h
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/src/xml/escp2/Makefile.am b/src/xml/escp2/Makefile.am
index 987c5b7..4673658 100644
--- a/src/xml/escp2/Makefile.am
+++ b/src/xml/escp2/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.7 2008/07/03 12:34:39 rlk Exp $
+## $Id: Makefile.am,v 1.8 2008/10/24 00:37:14 rleigh Exp $
 ## Copyright (C) 2008 Robert Krawitz
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -38,15 +38,16 @@ xml-stamp: media/xml-stamp			\
 	   qualitypresets/Makefile.am		\
 	   weaves/Makefile.am			\
 	   Makefile.am
-	-rm -f xml-stamp
-	touch xml-stamp
-	sed 's;^;media/;' media/xml-stamp >> xml-stamp
-	sed 's;^;model/;' model/xml-stamp >> xml-stamp
-	sed 's;^;inputslots/;' inputslots/xml-stamp >> xml-stamp
-	sed 's;^;inks/;' inks/xml-stamp >> xml-stamp
-	sed 's;^;mediasizes/;' mediasizes/xml-stamp >> xml-stamp
-	sed 's;^;weaves/;' weaves/xml-stamp >> xml-stamp
-	sed 's;^;qualitypresets/;' qualitypresets/xml-stamp >> xml-stamp
+	-rm -f $@ $@.tmp
+	touch $@.tmp
+	sed 's;^;media/;' media/xml-stamp >> $@.tmp
+	sed 's;^;model/;' model/xml-stamp >> $@.tmp
+	sed 's;^;inputslots/;' inputslots/xml-stamp >> $@.tmp
+	sed 's;^;inks/;' inks/xml-stamp >> $@.tmp
+	sed 's;^;mediasizes/;' mediasizes/xml-stamp >> $@.tmp
+	sed 's;^;weaves/;' weaves/xml-stamp >> $@.tmp
+	sed 's;^;qualitypresets/;' qualitypresets/xml-stamp >> $@.tmp
+	mv $@.tmp $@
 
 all-local: xml-stamp
 ## Clean
diff --git a/src/xml/escp2/Makefile.in b/src/xml/escp2/Makefile.in
index e70c983..17852a1 100644
--- a/src/xml/escp2/Makefile.in
+++ b/src/xml/escp2/Makefile.in
@@ -624,15 +624,16 @@ xml-stamp: media/xml-stamp			\
 	   qualitypresets/Makefile.am		\
 	   weaves/Makefile.am			\
 	   Makefile.am
-	-rm -f xml-stamp
-	touch xml-stamp
-	sed 's;^;media/;' media/xml-stamp >> xml-stamp
-	sed 's;^;model/;' model/xml-stamp >> xml-stamp
-	sed 's;^;inputslots/;' inputslots/xml-stamp >> xml-stamp
-	sed 's;^;inks/;' inks/xml-stamp >> xml-stamp
-	sed 's;^;mediasizes/;' mediasizes/xml-stamp >> xml-stamp
-	sed 's;^;weaves/;' weaves/xml-stamp >> xml-stamp
-	sed 's;^;qualitypresets/;' qualitypresets/xml-stamp >> xml-stamp
+	-rm -f $@ $@.tmp
+	touch $@.tmp
+	sed 's;^;media/;' media/xml-stamp >> $@.tmp
+	sed 's;^;model/;' model/xml-stamp >> $@.tmp
+	sed 's;^;inputslots/;' inputslots/xml-stamp >> $@.tmp
+	sed 's;^;inks/;' inks/xml-stamp >> $@.tmp
+	sed 's;^;mediasizes/;' mediasizes/xml-stamp >> $@.tmp
+	sed 's;^;weaves/;' weaves/xml-stamp >> $@.tmp
+	sed 's;^;qualitypresets/;' qualitypresets/xml-stamp >> $@.tmp
+	mv $@.tmp $@
 
 all-local: xml-stamp
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/src/xml/escp2/inks/Makefile.am b/src/xml/escp2/inks/Makefile.am
index 73cdec5..cbf259d 100644
--- a/src/xml/escp2/inks/Makefile.am
+++ b/src/xml/escp2/inks/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.5 2008/10/19 13:57:27 rlk Exp $
+## $Id: Makefile.am,v 1.6 2008/10/24 00:37:14 rleigh Exp $
 ## Copyright (C) 2008 Robert Krawitz
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -65,12 +65,13 @@ pkgxmldata_DATA =				\
 	x80.xml
 
 xml-stamp: $(pkgxmldata_DATA) Makefile.am
-	-rm -f xml-stamp
-	touch xml-stamp
-	for f in $(pkgxmldata_DATA) ; do echo $$f >> xml-stamp; done
+	-rm -f $@ $@.tmp
+	touch $@.tmp
+	for f in $(pkgxmldata_DATA) ; do echo $$f >> $@.tmp; done
+	mv $@.tmp $@
 
 all-local: xml-stamp
 
-CLEANFILES = xmli18n-tmp.h xml-stamp
+CLEANFILES = xmli18n-tmp.h xml-stamp xml-stamp.tmp
 
 EXTRA_DIST = $(pkgxmldata_DATA)
diff --git a/src/xml/escp2/inks/Makefile.in b/src/xml/escp2/inks/Makefile.in
index 768e57d..a6b3a94 100644
--- a/src/xml/escp2/inks/Makefile.in
+++ b/src/xml/escp2/inks/Makefile.in
@@ -312,7 +312,7 @@ pkgxmldata_DATA = \
 	wf500.xml				\
 	x80.xml
 
-CLEANFILES = xmli18n-tmp.h xml-stamp
+CLEANFILES = xmli18n-tmp.h xml-stamp xml-stamp.tmp
 EXTRA_DIST = $(pkgxmldata_DATA)
 all: all-am
 
@@ -520,9 +520,10 @@ $(top_builddir)/src/gutenprintui2/libgutenprintui2.la:
 	$(MAKE)
 
 xml-stamp: $(pkgxmldata_DATA) Makefile.am
-	-rm -f xml-stamp
-	touch xml-stamp
-	for f in $(pkgxmldata_DATA) ; do echo $$f >> xml-stamp; done
+	-rm -f $@ $@.tmp
+	touch $@.tmp
+	for f in $(pkgxmldata_DATA) ; do echo $$f >> $@.tmp; done
+	mv $@.tmp $@
 
 all-local: xml-stamp
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/src/xml/escp2/inputslots/Makefile.am b/src/xml/escp2/inputslots/Makefile.am
index 942922a..2b5d35e 100644
--- a/src/xml/escp2/inputslots/Makefile.am
+++ b/src/xml/escp2/inputslots/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.2 2008/06/10 13:10:25 rlk Exp $
+## $Id: Makefile.am,v 1.3 2008/10/24 00:37:14 rleigh Exp $
 ## Copyright (C) 2008 Robert Krawitz
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -39,12 +39,13 @@ pkgxmldata_DATA =				\
 	standard_roll_feed.xml
 
 xml-stamp: $(pkgxmldata_DATA) Makefile.am
-	-rm -f xml-stamp
-	touch xml-stamp
-	for f in $(pkgxmldata_DATA) ; do echo $$f >> xml-stamp; done
+	-rm -f $@ $@.tmp
+	touch $@.tmp
+	for f in $(pkgxmldata_DATA) ; do echo $$f >> $@.tmp; done
+	mv $@.tmp $@
 
 all-local: xml-stamp
 
-CLEANFILES = xmli18n-tmp.h xml-stamp
+CLEANFILES = xmli18n-tmp.h xml-stamp xml-stamp.tmp
 
 EXTRA_DIST = $(pkgxmldata_DATA)
diff --git a/src/xml/escp2/inputslots/Makefile.in b/src/xml/escp2/inputslots/Makefile.in
index 8f0043f..6663e4f 100644
--- a/src/xml/escp2/inputslots/Makefile.in
+++ b/src/xml/escp2/inputslots/Makefile.in
@@ -286,7 +286,7 @@ pkgxmldata_DATA = \
 	spro5000.xml				\
 	standard_roll_feed.xml
 
-CLEANFILES = xmli18n-tmp.h xml-stamp
+CLEANFILES = xmli18n-tmp.h xml-stamp xml-stamp.tmp
 EXTRA_DIST = $(pkgxmldata_DATA)
 all: all-am
 
@@ -494,9 +494,10 @@ $(top_builddir)/src/gutenprintui2/libgutenprintui2.la:
 	$(MAKE)
 
 xml-stamp: $(pkgxmldata_DATA) Makefile.am
-	-rm -f xml-stamp
-	touch xml-stamp
-	for f in $(pkgxmldata_DATA) ; do echo $$f >> xml-stamp; done
+	-rm -f $@ $@.tmp
+	touch $@.tmp
+	for f in $(pkgxmldata_DATA) ; do echo $$f >> $@.tmp; done
+	mv $@.tmp $@
 
 all-local: xml-stamp
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/src/xml/escp2/media/Makefile.am b/src/xml/escp2/media/Makefile.am
index 759b709..245751f 100644
--- a/src/xml/escp2/media/Makefile.am
+++ b/src/xml/escp2/media/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.8 2008/10/19 13:57:27 rlk Exp $
+## $Id: Makefile.am,v 1.9 2008/10/24 00:37:14 rleigh Exp $
 ## Copyright (C) 2008 Robert Krawitz
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -64,12 +64,13 @@ pkgxmldata_DATA =				\
 	x80.xml
 
 xml-stamp: $(pkgxmldata_DATA) Makefile.am
-	-rm -f xml-stamp
-	touch xml-stamp
-	for f in $(pkgxmldata_DATA) ; do echo $$f >> xml-stamp; done
+	-rm -f $@ $@.tmp
+	touch $@.tmp
+	for f in $(pkgxmldata_DATA) ; do echo $$f >> $@.tmp; done
+	mv $@.tmp $@
 
 all-local: xml-stamp
 
-CLEANFILES = xmli18n-tmp.h xml-stamp
+CLEANFILES = xmli18n-tmp.h xml-stamp xml-stamp.tmp
 
 EXTRA_DIST = $(pkgxmldata_DATA)
diff --git a/src/xml/escp2/media/Makefile.in b/src/xml/escp2/media/Makefile.in
index 085fb09..85487c4 100644
--- a/src/xml/escp2/media/Makefile.in
+++ b/src/xml/escp2/media/Makefile.in
@@ -311,7 +311,7 @@ pkgxmldata_DATA = \
 	wf500.xml				\
 	x80.xml
 
-CLEANFILES = xmli18n-tmp.h xml-stamp
+CLEANFILES = xmli18n-tmp.h xml-stamp xml-stamp.tmp
 EXTRA_DIST = $(pkgxmldata_DATA)
 all: all-am
 
@@ -519,9 +519,10 @@ $(top_builddir)/src/gutenprintui2/libgutenprintui2.la:
 	$(MAKE)
 
 xml-stamp: $(pkgxmldata_DATA) Makefile.am
-	-rm -f xml-stamp
-	touch xml-stamp
-	for f in $(pkgxmldata_DATA) ; do echo $$f >> xml-stamp; done
+	-rm -f $@ $@.tmp
+	touch $@.tmp
+	for f in $(pkgxmldata_DATA) ; do echo $$f >> $@.tmp; done
+	mv $@.tmp $@
 
 all-local: xml-stamp
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/src/xml/escp2/mediasizes/Makefile.am b/src/xml/escp2/mediasizes/Makefile.am
index f458520..588be38 100644
--- a/src/xml/escp2/mediasizes/Makefile.am
+++ b/src/xml/escp2/mediasizes/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.2 2008/06/10 13:10:51 rlk Exp $
+## $Id: Makefile.am,v 1.3 2008/10/24 00:37:14 rleigh Exp $
 ## Copyright (C) 2008 Robert Krawitz
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -29,12 +29,13 @@ pkgxmldata_DATA =				\
 	standard.xml
 
 xml-stamp: $(pkgxmldata_DATA) Makefile.am
-	-rm -f xml-stamp
-	touch xml-stamp
-	for f in $(pkgxmldata_DATA) ; do echo $$f >> xml-stamp; done
+	-rm -f $@ $@.tmp
+	touch $@.tmp
+	for f in $(pkgxmldata_DATA) ; do echo $$f >> $@.tmp; done
+	mv $@.tmp $@
 
 all-local: xml-stamp
 
-CLEANFILES = xmli18n-tmp.h xml-stamp
+CLEANFILES = xmli18n-tmp.h xml-stamp xml-stamp.tmp
 
 EXTRA_DIST = $(pkgxmldata_DATA)
diff --git a/src/xml/escp2/mediasizes/Makefile.in b/src/xml/escp2/mediasizes/Makefile.in
index 5b7c459..017b1c5 100644
--- a/src/xml/escp2/mediasizes/Makefile.in
+++ b/src/xml/escp2/mediasizes/Makefile.in
@@ -276,7 +276,7 @@ pkgxmldatadir = $(pkgdatadir)/@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSI
 pkgxmldata_DATA = \
 	standard.xml
 
-CLEANFILES = xmli18n-tmp.h xml-stamp
+CLEANFILES = xmli18n-tmp.h xml-stamp xml-stamp.tmp
 EXTRA_DIST = $(pkgxmldata_DATA)
 all: all-am
 
@@ -484,9 +484,10 @@ $(top_builddir)/src/gutenprintui2/libgutenprintui2.la:
 	$(MAKE)
 
 xml-stamp: $(pkgxmldata_DATA) Makefile.am
-	-rm -f xml-stamp
-	touch xml-stamp
-	for f in $(pkgxmldata_DATA) ; do echo $$f >> xml-stamp; done
+	-rm -f $@ $@.tmp
+	touch $@.tmp
+	for f in $(pkgxmldata_DATA) ; do echo $$f >> $@.tmp; done
+	mv $@.tmp $@
 
 all-local: xml-stamp
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/src/xml/escp2/model/Makefile.am b/src/xml/escp2/model/Makefile.am
index 9a2c2d0..f8780ee 100644
--- a/src/xml/escp2/model/Makefile.am
+++ b/src/xml/escp2/model/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.9 2008/10/19 13:57:27 rlk Exp $
+## $Id: Makefile.am,v 1.13 2008/11/15 00:41:48 rlk Exp $
 ## Copyright (C) 2008 Robert Krawitz
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -120,15 +120,18 @@ pkgxmldata_DATA =				\
 	model_91.xml				\
 	model_92.xml				\
 	model_93.xml				\
-	model_94.xml
+	model_94.xml				\
+	model_95.xml				\
+	model_96.xml
 
 xml-stamp: $(pkgxmldata_DATA) Makefile.am
-	-rm -f xml-stamp
-	touch xml-stamp
-	for f in $(pkgxmldata_DATA) ; do echo $$f >> xml-stamp; done
+	-rm -f $@ $@.tmp
+	touch $@.tmp
+	for f in $(pkgxmldata_DATA) ; do echo $$f >> $@.tmp; done
+	mv $@.tmp $@
 
 all-local: xml-stamp
 
-CLEANFILES = xmli18n-tmp.h xml-stamp
+CLEANFILES = xmli18n-tmp.h xml-stamp xml-stamp.tmp
 
 EXTRA_DIST = $(pkgxmldata_DATA)
diff --git a/src/xml/escp2/model/Makefile.in b/src/xml/escp2/model/Makefile.in
index 2dc9783..1fb6be9 100644
--- a/src/xml/escp2/model/Makefile.in
+++ b/src/xml/escp2/model/Makefile.in
@@ -368,9 +368,11 @@ pkgxmldata_DATA = \
 	model_91.xml				\
 	model_92.xml				\
 	model_93.xml				\
-	model_94.xml
+	model_94.xml				\
+	model_95.xml				\
+	model_96.xml
 
-CLEANFILES = xmli18n-tmp.h xml-stamp
+CLEANFILES = xmli18n-tmp.h xml-stamp xml-stamp.tmp
 EXTRA_DIST = $(pkgxmldata_DATA)
 all: all-am
 
@@ -578,9 +580,10 @@ $(top_builddir)/src/gutenprintui2/libgutenprintui2.la:
 	$(MAKE)
 
 xml-stamp: $(pkgxmldata_DATA) Makefile.am
-	-rm -f xml-stamp
-	touch xml-stamp
-	for f in $(pkgxmldata_DATA) ; do echo $$f >> xml-stamp; done
+	-rm -f $@ $@.tmp
+	touch $@.tmp
+	for f in $(pkgxmldata_DATA) ; do echo $$f >> $@.tmp; done
+	mv $@.tmp $@
 
 all-local: xml-stamp
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/src/xml/escp2/model/model_65.xml b/src/xml/escp2/model/model_65.xml
index fd373be..812355a 100644
--- a/src/xml/escp2/model/model_65.xml
+++ b/src/xml/escp2/model/model_65.xml
@@ -75,7 +75,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    <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>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
   </resolution>
   <resolution translate="text" name="360x240sw" text="360 x 240 DPI Draft">
    <physicalResolution>360 240</physicalResolution>
@@ -83,7 +83,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    <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>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
   </resolution>
   <resolution translate="text" name="360sw" text="360 DPI">
    <physicalResolution>360 360</physicalResolution>
@@ -91,7 +91,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    <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>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
   </resolution>
   <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
    <physicalResolution>720 360</physicalResolution>
@@ -99,7 +99,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    <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>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
   </resolution>
   <resolution translate="text" name="720sw" text="720 DPI">
    <physicalResolution>720 720</physicalResolution>
diff --git a/src/xml/escp2/model/model_91.xml b/src/xml/escp2/model/model_91.xml
index 7cd7a2e..e55cc0b 100644
--- a/src/xml/escp2/model/model_91.xml
+++ b/src/xml/escp2/model/model_91.xml
@@ -79,8 +79,8 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <resolutions>
   <resolution translate="text" name="360x180sw" text="360 x 180 DPI Draft">
    <physicalResolution>360 180</physicalResolution>
-   <parameter type="float" name="escp2_density">2.800000</parameter>
-   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="float" name="escp2_density">8.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
    <parameter type="integer" name="escp2_base_res">360</parameter>
    <parameter type="integer" name="escp2_bits">2</parameter>
    <parameter type="float" name="DropSize1">0.380000</parameter>
@@ -89,8 +89,8 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   </resolution>
   <resolution translate="text" name="360sw" text="360 DPI">
    <physicalResolution>360 360</physicalResolution>
-   <parameter type="float" name="escp2_density">1.400000</parameter>
-   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="float" name="escp2_density">4.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
    <parameter type="integer" name="escp2_base_res">360</parameter>
    <parameter type="integer" name="escp2_bits">2</parameter>
    <parameter type="float" name="DropSize1">0.380000</parameter>
@@ -99,8 +99,8 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   </resolution>
   <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
    <physicalResolution>720 360</physicalResolution>
-   <parameter type="float" name="escp2_density">1.000000</parameter>
-   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="float" name="escp2_density">2.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
    <parameter type="integer" name="escp2_base_res">720</parameter>
    <parameter type="integer" name="escp2_bits">2</parameter>
    <parameter type="float" name="DropSize1">0.380000</parameter>
diff --git a/src/xml/escp2/model/model_95.xml b/src/xml/escp2/model/model_95.xml
new file mode 100644
index 0000000..9d3545c
--- /dev/null
+++ b/src/xml/escp2/model/model_95.xml
@@ -0,0 +1,160 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:model id="95">
+ <media src="escp2/media/cx3650.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/cx3650.xml"/>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <preinitRemoteSequence>PM\002\000\000\000</preinitRemoteSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>2000</commandSet>
+ <borderless>Yes</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Portrait</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>90</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>360 120</minimumResolution>
+ <maximumResolution>5760 1440</maximumResolution>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>180</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>2073600</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>612 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 0</margins>
+ <margins interleave="printer" media="sheet">9 9 0 0</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <CDOffset>204 191</CDOffset>
+ <CDMediaSize>595 842</CDMediaSize>
+ <AlignmentChoices>4 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+  <ChannelName translate="name" name="Black"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x120sw" text="360 x 120 DPI Economy">
+   <physicalResolution>360 120</physicalResolution>
+   <parameter type="float" name="escp2_density">4.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.150000</parameter>
+   <parameter type="float" name="DropSize2">0.300000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x240sw" text="360 x 240 DPI Draft">
+   <physicalResolution>360 240</physicalResolution>
+   <parameter type="float" name="escp2_density">4.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.150000</parameter>
+   <parameter type="float" name="DropSize2">0.300000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">2.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.150000</parameter>
+   <parameter type="float" name="DropSize2">0.300000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.150000</parameter>
+   <parameter type="float" name="DropSize2">0.300000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.679000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.150000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720sw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.657000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.290000</parameter>
+   <parameter type="float" name="DropSize2">0.480000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x1440ov" text="1440 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <printedResolution>1440 1440</printedResolution>
+   <parameter type="float" name="escp2_density">0.684000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.604000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x1440sw" text="2880 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.566000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="5760x1440sw" text="5760 x 1440 DPI">
+   <physicalResolution>5760 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.283000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_96.xml b/src/xml/escp2/model/model_96.xml
new file mode 100644
index 0000000..469a82f
--- /dev/null
+++ b/src/xml/escp2/model/model_96.xml
@@ -0,0 +1,187 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:model id="96">
+ <media src="escp2/media/claria.xml"/>
+ <inputSlots src="escp2/inputslots/cd_roll_feed.xml"/>
+ <qualityPresets src="escp2/qualitypresets/v2880.xml"/>
+ <inkGroup src="escp2/inks/claria.xml"/>
+ <mediaSizes src="escp2/mediasizes/standard.xml"/>
+ <verticalBorderlessSequence>US\003\000\000\000\002</verticalBorderlessSequence>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <preinitRemoteSequence>SN\001\000\000</preinitRemoteSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>2000</commandSet>
+ <borderless>Yes</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Portrait</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>180</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>2</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>6</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>360 180</minimumResolution>
+ <maximumResolution>5760 2880</maximumResolution>
+ <extraVerticalFeed>10</extraVerticalFeed>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>16588800</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>612 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 9</margins>
+ <margins interleave="printer" media="sheet">9 9 0 9</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <CDOffset>204 189</CDOffset>
+ <CDMediaSize>595 842</CDMediaSize>
+ <extraBottom>24</extraBottom>
+ <AlignmentChoices>4 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Yellow"/>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Light Cyan"/>
+  <ChannelName translate="name" name="Light Magenta"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Cyan"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x90sw" text="360 x 90 DPI Fast Economy">
+   <physicalResolution>360 90</physicalResolution>
+   <parameter type="float" name="escp2_density">4.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">51</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.125000</parameter>
+   <parameter type="float" name="DropSize2">0.420000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x180sw" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <parameter type="float" name="escp2_density">4.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">51</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.125000</parameter>
+   <parameter type="float" name="DropSize2">0.420000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">4.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">51</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.125000</parameter>
+   <parameter type="float" name="DropSize2">0.420000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">3.520000</parameter>
+   <parameter type="integer" name="escp2_ink_type">36</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.125000</parameter>
+   <parameter type="float" name="DropSize2">0.420000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">1.760000</parameter>
+   <parameter type="integer" name="escp2_ink_type">36</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.125000</parameter>
+   <parameter type="float" name="DropSize2">0.420000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720sw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.880000</parameter>
+   <parameter type="integer" name="escp2_ink_type">36</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.125000</parameter>
+   <parameter type="float" name="DropSize2">0.420000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x1440ov" text="1440 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <printedResolution>1440 1440</printedResolution>
+   <parameter type="float" name="escp2_density">0.440000</parameter>
+   <parameter type="integer" name="escp2_ink_type">36</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.125000</parameter>
+   <parameter type="float" name="DropSize2">0.420000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x1440sw" text="2880 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.586000</parameter>
+   <parameter type="integer" name="escp2_ink_type">37</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.338000</parameter>
+   <parameter type="float" name="DropSize2">0.400000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="5760x1440sw" text="5760 x 1440 DPI">
+   <physicalResolution>5760 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.733000</parameter>
+   <parameter type="integer" name="escp2_ink_type">37</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.833000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x2880sw" text="2880 x 2880 DPI">
+   <physicalResolution>2880 2880</physicalResolution>
+   <parameter type="float" name="escp2_density">0.733000</parameter>
+   <parameter type="integer" name="escp2_ink_type">37</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.833000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="5760x2880sw" text="5760 x 2880 DPI">
+   <physicalResolution>5760 2880</physicalResolution>
+   <parameter type="float" name="escp2_density">0.440000</parameter>
+   <parameter type="integer" name="escp2_ink_type">37</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/qualitypresets/Makefile.am b/src/xml/escp2/qualitypresets/Makefile.am
index 50ba65a..3c73802 100644
--- a/src/xml/escp2/qualitypresets/Makefile.am
+++ b/src/xml/escp2/qualitypresets/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.2 2008/10/19 13:57:27 rlk Exp $
+## $Id: Makefile.am,v 1.3 2008/10/24 00:37:14 rleigh Exp $
 ## Copyright (C) 2008 Robert Krawitz
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -33,12 +33,13 @@ pkgxmldata_DATA =				\
 	wf40.xml
 
 xml-stamp: $(pkgxmldata_DATA) Makefile.am
-	-rm -f xml-stamp
-	touch xml-stamp
-	for f in $(pkgxmldata_DATA) ; do echo $$f >> xml-stamp; done
+	-rm -f $@ $@.tmp
+	touch $@.tmp
+	for f in $(pkgxmldata_DATA) ; do echo $$f >> $@.tmp; done
+	mv $@.tmp $@
 
 all-local: xml-stamp
 
-CLEANFILES = xmli18n-tmp.h xml-stamp
+CLEANFILES = xmli18n-tmp.h xml-stamp xml-stamp.tmp
 
 EXTRA_DIST = $(pkgxmldata_DATA)
diff --git a/src/xml/escp2/qualitypresets/Makefile.in b/src/xml/escp2/qualitypresets/Makefile.in
index 88ed90f..79a910a 100644
--- a/src/xml/escp2/qualitypresets/Makefile.in
+++ b/src/xml/escp2/qualitypresets/Makefile.in
@@ -280,7 +280,7 @@ pkgxmldata_DATA = \
 	v2880.xml				\
 	wf40.xml
 
-CLEANFILES = xmli18n-tmp.h xml-stamp
+CLEANFILES = xmli18n-tmp.h xml-stamp xml-stamp.tmp
 EXTRA_DIST = $(pkgxmldata_DATA)
 all: all-am
 
@@ -488,9 +488,10 @@ $(top_builddir)/src/gutenprintui2/libgutenprintui2.la:
 	$(MAKE)
 
 xml-stamp: $(pkgxmldata_DATA) Makefile.am
-	-rm -f xml-stamp
-	touch xml-stamp
-	for f in $(pkgxmldata_DATA) ; do echo $$f >> xml-stamp; done
+	-rm -f $@ $@.tmp
+	touch $@.tmp
+	for f in $(pkgxmldata_DATA) ; do echo $$f >> $@.tmp; done
+	mv $@.tmp $@
 
 all-local: xml-stamp
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/src/xml/escp2/weaves/Makefile.am b/src/xml/escp2/weaves/Makefile.am
index 030f976..f114e9a 100644
--- a/src/xml/escp2/weaves/Makefile.am
+++ b/src/xml/escp2/weaves/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.1 2008/06/20 00:11:29 rlk Exp $
+## $Id: Makefile.am,v 1.2 2008/10/24 00:37:14 rleigh Exp $
 ## Copyright (C) 2008 Robert Krawitz
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -32,12 +32,13 @@ pkgxmldata_DATA =				\
 	standard.xml
 
 xml-stamp: $(pkgxmldata_DATA) Makefile.am
-	-rm -f xml-stamp
-	touch xml-stamp
-	for f in $(pkgxmldata_DATA) ; do echo $$f >> xml-stamp; done
+	-rm -f $@ $@.tmp
+	touch $@.tmp
+	for f in $(pkgxmldata_DATA) ; do echo $$f >> $@.tmp; done
+	mv $@.tmp $@
 
 all-local: xml-stamp
 
-CLEANFILES = xmli18n-tmp.h xml-stamp
+CLEANFILES = xmli18n-tmp.h xml-stamp xml-stamp.tmp
 
 EXTRA_DIST = $(pkgxmldata_DATA)
diff --git a/src/xml/escp2/weaves/Makefile.in b/src/xml/escp2/weaves/Makefile.in
index 2f5a0c4..86a9dbd 100644
--- a/src/xml/escp2/weaves/Makefile.in
+++ b/src/xml/escp2/weaves/Makefile.in
@@ -279,7 +279,7 @@ pkgxmldata_DATA = \
 	pro7600.xml				\
 	standard.xml
 
-CLEANFILES = xmli18n-tmp.h xml-stamp
+CLEANFILES = xmli18n-tmp.h xml-stamp xml-stamp.tmp
 EXTRA_DIST = $(pkgxmldata_DATA)
 all: all-am
 
@@ -487,9 +487,10 @@ $(top_builddir)/src/gutenprintui2/libgutenprintui2.la:
 	$(MAKE)
 
 xml-stamp: $(pkgxmldata_DATA) Makefile.am
-	-rm -f xml-stamp
-	touch xml-stamp
-	for f in $(pkgxmldata_DATA) ; do echo $$f >> xml-stamp; done
+	-rm -f $@ $@.tmp
+	touch $@.tmp
+	for f in $(pkgxmldata_DATA) ; do echo $$f >> $@.tmp; done
+	mv $@.tmp $@
 
 all-local: xml-stamp
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/src/xml/printers.xml b/src/xml/printers.xml
index f3b211a..f75ce13 100644
--- a/src/xml/printers.xml
+++ b/src/xml/printers.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <!--
-   "$Id: printers.xml,v 1.19 2008/10/19 13:57:27 rlk Exp $"
+   "$Id: printers.xml,v 1.22 2008/11/15 00:41:48 rlk Exp $"
 
    XML description of printers known to libgutenprint
    You can add additional printers here, but the underlying driver has
@@ -190,8 +190,8 @@
         <parameter type="float" name="Gamma">0.470</parameter>
         <parameter type="float" name="BlackDensity">0.8</parameter>
       </parameters>
-      <printer translate="name" name="Epson Artisan 700" driver="escp2-artisan700" manufacturer="Epson" model="81" parameters="claria_params" />
-      <printer translate="name" name="Epson Artisan 800" driver="escp2-artisan800" manufacturer="Epson" model="81" parameters="claria_params" />
+      <printer translate="name" name="Epson Artisan 700" driver="escp2-artisan700" manufacturer="Epson" model="96" parameters="claria_params" />
+      <printer translate="name" name="Epson Artisan 800" driver="escp2-artisan800" manufacturer="Epson" model="96" parameters="claria_params" />
       <printer translate="name" name="Epson B-300" driver="escp2-b300" manufacturer="Epson" model="87" parameters="standard_params" />
       <printer translate="name" name="Epson B-308" driver="escp2-b308" manufacturer="Epson" model="87" parameters="standard_params" />
       <printer translate="name" name="Epson B-500DN" driver="escp2-b500dn" manufacturer="Epson" model="87" parameters="standard_params" />
@@ -361,8 +361,8 @@
       <printer translate="name" name="Epson Stylus Photo RX685" driver="escp2-rx685" manufacturer="Epson" model="81" parameters="claria_params" />
       <printer translate="name" name="Epson Stylus Photo RX690" driver="escp2-rx690" manufacturer="Epson" model="81" parameters="claria_params" />
       <printer translate="name" name="Epson Stylus Photo RX700" driver="escp2-rx700" manufacturer="Epson" model="70" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus Photo TX700W" driver="escp2-tx700w" manufacturer="Epson" model="81" parameters="claria_params" />
-      <printer translate="name" name="Epson Stylus Photo TX800W" driver="escp2-tx800w" manufacturer="Epson" model="81" parameters="claria_params" />
+      <printer translate="name" name="Epson Stylus Photo TX700W" driver="escp2-tx700w" manufacturer="Epson" model="96" parameters="claria_params" />
+      <printer translate="name" name="Epson Stylus Photo TX800W" driver="escp2-tx800w" manufacturer="Epson" model="96" parameters="claria_params" />
       <printer translate="name" name="Epson Stylus Pro 5000" driver="escp2-5000" manufacturer="Epson" model="27" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Pro 5500" driver="escp2-5500" manufacturer="Epson" model="40" parameters="pro_5500_params" />
       <printer translate="name" name="Epson Stylus Pro 7000" driver="escp2-7000" manufacturer="Epson" model="28" parameters="standard_params" />
@@ -389,13 +389,13 @@
       <printer translate="name" name="Epson Stylus CX3800" driver="escp2-cx3800" manufacturer="Epson" model="72" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus CX3805" driver="escp2-cx3805" manufacturer="Epson" model="72" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus CX3810" driver="escp2-cx3810" manufacturer="Epson" model="72" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus CX4100" driver="escp2-cx4100" manufacturer="Epson" model="65" parameters="cx3500_params" />
-      <printer translate="name" name="Epson Stylus CX4200" driver="escp2-cx4200" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX4100" driver="escp2-cx4100" manufacturer="Epson" model="95" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX4200" driver="escp2-cx4200" manufacturer="Epson" model="95" parameters="cx3500_params" />
       <printer translate="name" name="Epson Stylus CX4400" driver="escp2-cx4400" manufacturer="Epson" model="72" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus CX4500" driver="escp2-cx4500" manufacturer="Epson" model="65" parameters="cx3500_params" />
       <printer translate="name" name="Epson Stylus CX4600" driver="escp2-cx4600" manufacturer="Epson" model="65" parameters="cx3500_params" />
-      <printer translate="name" name="Epson Stylus CX4700" driver="escp2-cx4700" manufacturer="Epson" model="65" parameters="cx3500_params" />
-      <printer translate="name" name="Epson Stylus CX4800" driver="escp2-cx4800" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX4700" driver="escp2-cx4700" manufacturer="Epson" model="95" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX4800" driver="escp2-cx4800" manufacturer="Epson" model="95" parameters="cx3500_params" />
       <printer translate="name" name="Epson Stylus CX4900" driver="escp2-cx4900" manufacturer="Epson" model="65" parameters="cx3500_params" />
       <printer translate="name" name="Epson Stylus CX5000" driver="escp2-cx5000" manufacturer="Epson" model="65" parameters="cx3500_params" />
       <printer translate="name" name="Epson Stylus CX5000F" driver="escp2-cx5000f" manufacturer="Epson" model="65" parameters="cx3500_params" />
@@ -405,8 +405,8 @@
       <printer translate="name" name="Epson Stylus CX5400" driver="escp2-cx5400" manufacturer="Epson" model="55" parameters="cx3500_params" />
       <printer translate="name" name="Epson Stylus CX5500" driver="escp2-cx5500" manufacturer="Epson" model="72" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus CX5600" driver="escp2-cx5600" manufacturer="Epson" model="72" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus CX5700" driver="escp2-cx5700" manufacturer="Epson" model="65" parameters="cx3500_params" />
-      <printer translate="name" name="Epson Stylus CX5800" driver="escp2-cx5800" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX5700" driver="escp2-cx5700" manufacturer="Epson" model="95" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX5800" driver="escp2-cx5800" manufacturer="Epson" model="95" parameters="cx3500_params" />
       <printer translate="name" name="Epson Stylus CX6000" driver="escp2-cx6000" manufacturer="Epson" model="65" parameters="cx3500_params" />
       <printer translate="name" name="Epson Stylus CX6300" driver="escp2-cx6300" manufacturer="Epson" model="79" parameters="cx3500_params" />
       <printer translate="name" name="Epson Stylus CX6400" driver="escp2-cx6400" manufacturer="Epson" model="79" parameters="cx3500_params" />
@@ -414,8 +414,8 @@
       <printer translate="name" name="Epson Stylus CX6600" driver="escp2-cx6600" manufacturer="Epson" model="80" parameters="cx3500_params" />
       <printer translate="name" name="Epson Stylus CX7000F" driver="escp2-cx7000f" manufacturer="Epson" model="65" parameters="cx3500_params" />
       <printer translate="name" name="Epson Stylus CX7400" driver="escp2-cx7400" manufacturer="Epson" model="65" parameters="cx3500_params" />
-      <printer translate="name" name="Epson Stylus CX7700" driver="escp2-cx7700" manufacturer="Epson" model="80" parameters="cx3500_params" />
-      <printer translate="name" name="Epson Stylus CX7800" driver="escp2-cx7800" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX7700" driver="escp2-cx7700" manufacturer="Epson" model="95" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX7800" driver="escp2-cx7800" manufacturer="Epson" model="95" parameters="cx3500_params" />
       <printer translate="name" name="Epson Stylus CX8300" driver="escp2-cx8300" manufacturer="Epson" model="65" parameters="cx3500_params" />
       <printer translate="name" name="Epson Stylus CX8400" driver="escp2-cx8400" manufacturer="Epson" model="65" parameters="cx3500_params" />
       <printer translate="name" name="Epson Stylus CX9300F" driver="escp2-cx9300f" manufacturer="Epson" model="65" parameters="cx3500_params" />
@@ -429,11 +429,12 @@
       <printer translate="name" name="Epson Stylus DX3800" driver="escp2-dx3800" manufacturer="Epson" model="72" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus DX3850" driver="escp2-dx3850" manufacturer="Epson" model="72" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus DX4050" driver="escp2-dx4050" manufacturer="Epson" model="72" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus DX4200" driver="escp2-dx4200" manufacturer="Epson" model="65" parameters="cx3500_params" />
-      <printer translate="name" name="Epson Stylus DX4250" driver="escp2-dx4250" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus DX4200" driver="escp2-dx4200" manufacturer="Epson" model="95" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus DX4250" driver="escp2-dx4250" manufacturer="Epson" model="95" parameters="cx3500_params" />
       <printer translate="name" name="Epson Stylus DX4400" driver="escp2-dx4400" manufacturer="Epson" model="72" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus DX4450" driver="escp2-dx4450" manufacturer="Epson" model="72" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus DX4800" driver="escp2-dx4800" manufacturer="Epson" model="65" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus DX4800" driver="escp2-dx4800" manufacturer="Epson" model="95" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus DX4850" driver="escp2-dx4850" manufacturer="Epson" model="95" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus DX7000F" driver="escp2-dx7000f" manufacturer="Epson" model="65" parameters="cx3500_params" />
       <printer translate="name" name="Epson Stylus DX7400" driver="escp2-dx7400" manufacturer="Epson" model="65" parameters="cx3500_params" />
       <printer translate="name" name="Epson Stylus DX7450" driver="escp2-dx7450" manufacturer="Epson" model="65" parameters="cx3500_params" />
@@ -444,8 +445,8 @@
       <printer translate="name" name="Epson Stylus NX200" driver="escp2-nx200" manufacturer="Epson" model="93" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus NX300" driver="escp2-nx300" manufacturer="Epson" model="94" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus NX400" driver="escp2-nx400" manufacturer="Epson" model="93" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus PX700FW" driver="escp2-px700fw" manufacturer="Epson" model="81" parameters="claria_params" />
-      <printer translate="name" name="Epson Stylus PX800FW" driver="escp2-px800fw" manufacturer="Epson" model="81" parameters="claria_params" />
+      <printer translate="name" name="Epson Stylus PX700FW" driver="escp2-px700fw" manufacturer="Epson" model="96" parameters="claria_params" />
+      <printer translate="name" name="Epson Stylus PX800FW" driver="escp2-px800fw" manufacturer="Epson" model="96" parameters="claria_params" />
       <printer translate="name" name="Epson Stylus S20" driver="escp2-s20" manufacturer="Epson" model="94" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus SX100" driver="escp2-sx100" manufacturer="Epson" model="94" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus SX105" driver="escp2-sx105" manufacturer="Epson" model="94" parameters="standard_params" />
@@ -457,7 +458,6 @@
       <printer translate="name" name="Epson Stylus TX100" driver="escp2-tx100" manufacturer="Epson" model="94" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus TX200" driver="escp2-tx200" manufacturer="Epson" model="93" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus TX400" driver="escp2-tx400" manufacturer="Epson" model="93" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus PX800FW" driver="escp2-px800fw" manufacturer="Epson" model="81" parameters="claria_params" />
       <printer translate="name" name="Epson PictureMate" driver="escp2-picmate" manufacturer="Epson" model="73" parameters="standard_params" />
       <printer translate="name" name="Epson PictureMate Dash" driver="escp2-picmatedash" manufacturer="Epson" model="86" parameters="standard_params" />
       <printer translate="name" name="Epson PictureMate Deluxe" driver="escp2-picmated" manufacturer="Epson" model="73" parameters="standard_params" />
@@ -493,6 +493,9 @@
       <printer translate="name" name="Epson E 720" driver="escp2-e720" manufacturer="Epson" model="86" parameters="standard_params" />
       <printer translate="name" name="Epson EM 900C" driver="escp2-em900c" manufacturer="Epson" model="13" parameters="standard_params" />
       <printer translate="name" name="Epson EM 930C" driver="escp2-em930c" manufacturer="Epson" model="34" parameters="standard_params" />
+      <printer translate="name" name="Epson EP 801A" driver="escp2-ep801a" manufacturer="Epson" model="96" parameters="standard_params" />
+      <printer translate="name" name="Epson EP 901A" driver="escp2-ep901a" manufacturer="Epson" model="96" parameters="standard_params" />
+      <printer translate="name" name="Epson EP 901F" driver="escp2-ep901f" manufacturer="Epson" model="96" parameters="standard_params" />
       <printer translate="name" name="Epson MC 2000" driver="escp2-mc2000" manufacturer="Epson" model="26" parameters="standard_params" />
       <printer translate="name" name="Epson MC 5000" driver="escp2-mc5000" manufacturer="Epson" model="40" parameters="pro_5500_params" />
       <printer translate="name" name="Epson MC 7000" driver="escp2-mc7000" manufacturer="Epson" model="29" parameters="pro_5500_params" />
@@ -553,7 +556,7 @@
       <printer translate="name" name="Epson PM G820" driver="escp2-pmg820" manufacturer="Epson" model="68" parameters="standard_params" />
       <printer translate="name" name="Epson PM G850" driver="escp2-pmg850" manufacturer="Epson" model="81" parameters="claria_params" />
       <printer translate="name" name="Epson PM G4500" driver="escp2-pmg4500" manufacturer="Epson" model="82" parameters="standard_params" />
-      <printer translate="name" name="Epson PX A650" driver="escp2-pxa650" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson PX A650" driver="escp2-pxa650" manufacturer="Epson" model="95" parameters="cx3500_params" />
       <printer translate="name" name="Epson Offirio PX B300" driver="escp2-pxb300" manufacturer="Epson" model="87" parameters="standard_params" />
       <printer translate="name" name="Epson Offirio PX B500" driver="escp2-pxb500" manufacturer="Epson" model="87" parameters="standard_params" />
       <printer translate="name" name="Epson PX 101" driver="escp2-px101" manufacturer="Epson" model="85" parameters="standard_params" />