diff options
Diffstat (limited to 'src/xml')
23 files changed, 503 insertions, 129 deletions
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" /> |